From 3cb005011c6962ddc31fb9ae6624b808441eeaef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Sat, 8 Feb 2025 09:46:48 +0800
Subject: [PATCH] 1

---
 business/jxstore/cms/api_print.go         | 5 ++++-
 business/jxstore/event/event_tcp.go       | 6 ++++--
 business/jxstore/event/event_tcp_utils.go | 1 +
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/business/jxstore/cms/api_print.go b/business/jxstore/cms/api_print.go
index 6ce84e93b..9f8b7c778 100644
--- a/business/jxstore/cms/api_print.go
+++ b/business/jxstore/cms/api_print.go
@@ -9,6 +9,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/model/dao"
+	"git.rosy.net.cn/jx-callback/globals"
 	"net"
 	"regexp"
 	"time"
@@ -439,7 +440,9 @@ func GetPrinterStatus(appID int, printNo string) (status int, err error) {
 		db = dao.GetDB()
 	)
 	//看有没有
-	if printers, _ := dao.GetPrinters(db, appID, printNo, 0, 0); len(printers) == 0 {
+	printers, _ := dao.GetPrinters(db, appID, printNo, 0, 0)
+	globals.SugarLogger.Debugf("---------printers := %s", utils.Format4Output(printers, false))
+	if len(printers) == 0 {
 		return status, fmt.Errorf("该应用下未找到该打印机！print_no : %v", printNo)
 	} else {
 		return printers[0].Status + printers[0].IsOnline, nil // 当两个值都唯一时->在线正常
diff --git a/business/jxstore/event/event_tcp.go b/business/jxstore/event/event_tcp.go
index c24635c56..e2b34f8a5 100644
--- a/business/jxstore/event/event_tcp.go
+++ b/business/jxstore/event/event_tcp.go
@@ -47,7 +47,6 @@ func ListenTcp() {
 			}()
 
 			if err := handleConn(c); err != nil {
-				globals.SugarLogger.Debugf("=========err := %v", err)
 				c.Close()
 				Poll.Wait()
 				Poll.Stop()
@@ -65,7 +64,7 @@ func handleConn(c net.Conn) error {
 	for {
 		printRemoteAddr := c.RemoteAddr().String()
 		printRemoteAddr = strings.Split(printRemoteAddr, ":")[0]
-		globals.SugarLogger.Debugf("--------printRemoteAddr := %s", printRemoteAddr)
+		printNoByIP, _ := PrintAddrAndIp.GetPrintAddrAndIp(printRemoteAddr)
 		buffer, n, err := ConnRead(c)
 		if err != nil {
 			if err == io.EOF {
@@ -73,10 +72,13 @@ func handleConn(c net.Conn) error {
 			} else {
 				fmt.Println("ReadString err:", err)
 			}
+			globals.SugarLogger.Debugf("--------printRemoteAddr := %s,printNo := %s", printRemoteAddr, printNoByIP)
 			if printNo, ok := PrintAddrAndIp.GetPrintAddrAndIp(printRemoteAddr); ok {
+				globals.SugarLogger.Debugf("--------PrintObject := %s", utils.Format4Output(PrintObject, false))
 				PrintAddrAndIp.DelPrintAddrAndIp(printRemoteAddr)
 				PrintObject.DelPrintObj(printNo)
 				PrintIpAndAddr.DelPrintIpAndAddr(printRemoteAddr)
+				globals.SugarLogger.Debugf("--------PrintObject := %s", utils.Format4Output(PrintObject, false))
 
 				dao.ExecuteSQL(dao.GetDB(), `UPDATE printer SET status = -1,is_online = -1 WHERE print_no = ? `, []interface{}{printNo}...)
 			}
diff --git a/business/jxstore/event/event_tcp_utils.go b/business/jxstore/event/event_tcp_utils.go
index fc3194674..57a779455 100644
--- a/business/jxstore/event/event_tcp_utils.go
+++ b/business/jxstore/event/event_tcp_utils.go
@@ -368,6 +368,7 @@ func getCallbackMsgInfo(data string) (orderNo int64, printNo string) {
 }
 
 func changePrinterStatus(printNo string, status int) {
+	globals.SugarLogger.Debugf("---------changePrinterStatus := %s --- %d", printNo, status)
 	var (
 		db = dao.GetDB()
 	)