1

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"
 )
@@ -404,22 +403,21 @@ 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 // 当两个值都唯一时->在线正常
+		return printers[0].Status + printers[0].IsOnline, nil // 当两个值都唯一时->在线正常
-		server := "print.jxcs.net:8000"
+		//server := "print.jxcs.net:8000"
-		tcpAddr, err := net.ResolveTCPAddr("tcp4", server)
+		//tcpAddr, err := net.ResolveTCPAddr("tcp4", server)
-		if err != nil {
+		//if err != nil {
-			os.Exit(1)
+		//	os.Exit(1)
-			return status, err
+		//	return status, err
-		}
+		//}
-		conn, err := net.DialTCP("tcp", nil, tcpAddr)
+		//conn, err := net.DialTCP("tcp", nil, tcpAddr)
-		if err != nil {
+		//if err != nil {
-			return status, err
+		//	return status, err
-		}
+		//}
-		status = connHandler(conn, &PrintInfo{
+		//status = connHandler(conn, &PrintInfo{
-			PrintNo: printNo,
+		//	PrintNo: printNo,
-			AppID:   appID,
+		//	AppID:   appID,
-		})
+		//})
-		return status, nil
 	}
 }