From 4c37716fb18bcbc4751fc87145d6ac3710752d3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Wed, 24 Aug 2022 16:34:09 +0800
Subject: [PATCH] 1

---
 business/jxstore/cms/print.go | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/business/jxstore/cms/print.go b/business/jxstore/cms/print.go
index 1c0ec6e27..8e8834a01 100644
--- a/business/jxstore/cms/print.go
+++ b/business/jxstore/cms/print.go
@@ -8,7 +8,6 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"net"
-	"os"
 	"regexp"
 	"time"
 )
@@ -443,22 +442,22 @@ func GetPrinterStatus(appID int, printNo string) (status int, err error) {
 	if printers, _ := dao.GetPrinters(db, appID, printNo, 0, 0); len(printers) == 0 {
 		return status, fmt.Errorf("该应用下未找到该打印机！print_no : %v", printNo)
 	} else {
-		server := "print.jxcs.net:8000"
-		tcpAddr, err := net.ResolveTCPAddr("tcp4", server)
-		if err != nil {
-			os.Exit(1)
-			return status, err
-		}
-		conn, err := net.DialTCP("tcp", nil, tcpAddr)
-		if err != nil {
-			return status, err
-		}
-		status = connHandler(conn, &PrintInfo{
-			PrintNo: printNo,
-			AppID:   appID,
-		})
+		return printers[0].Status + printers[0].IsOnline, nil // 当两个值都唯一时->在线正常
+		//server := "print.jxcs.net:8000"
+		//tcpAddr, err := net.ResolveTCPAddr("tcp4", server)
+		//if err != nil {
+		//	os.Exit(1)
+		//	return status, err
+		//}
+		//conn, err := net.DialTCP("tcp", nil, tcpAddr)
+		//if err != nil {
+		//	return status, err
+		//}
+		//status = connHandler(conn, &PrintInfo{
+		//	PrintNo: printNo,
+		//	AppID:   appID,
+		//})
 	}
-	return status, err
 }
 
 func connHandler(c net.Conn, printInfo *PrintInfo) (status int) {