From ff8e97bb97f43bf85f7b639c5ee747f8f28b5b8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Mon, 12 Dec 2022 11:07:39 +0800
Subject: [PATCH] 1

---
 business/jxstore/cms/print.go | 32 +++++++++++++++++---------------
 controllers/api_controller.go |  1 -
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/business/jxstore/cms/print.go b/business/jxstore/cms/print.go
index f1cf98557..af7787b51 100644
--- a/business/jxstore/cms/print.go
+++ b/business/jxstore/cms/print.go
@@ -8,6 +8,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"net"
+	"os"
 	"regexp"
 	"time"
 )
@@ -403,21 +404,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 {
-		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 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, nil
 	}
 }
 
diff --git a/controllers/api_controller.go b/controllers/api_controller.go
index f5678c103..0e3d0bf78 100644
--- a/controllers/api_controller.go
+++ b/controllers/api_controller.go
@@ -430,7 +430,6 @@ func (c *ApiController) GetPrinterStatus(dataMap map[string]interface{}) (data,
 	} else {
 		return utils.Int2Str(status), errCode, err
 	}
-	return data, errCode, err
 }
 
 func getRealRemoteIP(r *http.Request) (ip string) {