From 89e48b09796791f751b6feeccd67b0b271c09a54 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Thu, 1 Jul 2021 11:20:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E7=A9=BA=E6=89=93=E5=8D=B0=E9=98=9F?=
 =?UTF-8?q?=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/print.go   | 20 ++++++++++++++++++++
 business/model/dao/dao_print.go | 17 +++++++++++++++++
 controllers/api_controller.go   | 24 ++++++++++++++++++++++++
 3 files changed, 61 insertions(+)

diff --git a/business/jxstore/cms/print.go b/business/jxstore/cms/print.go
index 41df7eaa7..f5ac907d6 100644
--- a/business/jxstore/cms/print.go
+++ b/business/jxstore/cms/print.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/model/dao"
+	"time"
 )
 
 func AddPrinter(appID int, printNo, printKey, name string) (err error) {
@@ -58,3 +59,22 @@ func UpdatePrinter(appID int, printNo, name string) (err error) {
 	}
 	return err
 }
+
+func DelPrinterSeq(appID int, printNo string) (err error) {
+	var (
+		db = dao.GetDB()
+	)
+	//看有没有
+	if printers, _ := dao.GetPrinters(db, appID, printNo); len(printers) == 0 {
+		return fmt.Errorf("该应用下未找到该打印机！print_no : %v", printNo)
+	} else {
+		printMsgs, _ := dao.GetPrintMsgs(db, printNo)
+		for _, v := range printMsgs {
+			v.DeletedAt = time.Now()
+			if _, err = dao.UpdateEntity(db, v, "DeletedAt"); err != nil {
+				return err
+			}
+		}
+	}
+	return err
+}
diff --git a/business/model/dao/dao_print.go b/business/model/dao/dao_print.go
index f56ac205b..3ddbf03f6 100644
--- a/business/model/dao/dao_print.go
+++ b/business/model/dao/dao_print.go
@@ -25,3 +25,20 @@ func GetPrinters(db *DaoDB, appID int, printNo string) (printers []*model.Printe
 	err = GetRows(db, &printers, sql, sqlParams)
 	return printers, err
 }
+
+func GetPrintMsgs(db *DaoDB, printNo string) (printMsgs []*model.PrintMsg, err error) {
+	sql := `
+		SELECT *
+		  FROM print_msg
+         WHERE 1 = 1 AND deleted_at = ? AND status = ?
+	`
+	sqlParams := []interface{}{
+		utils.DefaultTimeValue, model.PrinterStatusNormal,
+	}
+	if printNo != "" {
+		sql += " AND print_no = ?"
+		sqlParams = append(sqlParams, printNo)
+	}
+	err = GetRows(db, &printMsgs, sql, sqlParams)
+	return printMsgs, err
+}
diff --git a/controllers/api_controller.go b/controllers/api_controller.go
index c06995407..dd9904abe 100644
--- a/controllers/api_controller.go
+++ b/controllers/api_controller.go
@@ -173,6 +173,7 @@ success:
 	}
 }
 
+//添加打印机，暂不支持批量
 func (c *ApiController) AddPrinter(dataMap map[string]interface{}) (data, errCode string, err error) {
 	var (
 		printNo, printKey, name string
@@ -200,6 +201,7 @@ func (c *ApiController) AddPrinter(dataMap map[string]interface{}) (data, errCod
 	return "", errCode, err
 }
 
+//删除打印机绑定，暂不支持批量
 func (c *ApiController) DelPrinter(dataMap map[string]interface{}) (data, errCode string, err error) {
 	var (
 		printNo string
@@ -218,6 +220,8 @@ func (c *ApiController) DelPrinter(dataMap map[string]interface{}) (data, errCod
 	}
 	return "", errCode, err
 }
+
+//修改打印机备注名
 func (c *ApiController) UpdatePrinter(dataMap map[string]interface{}) (data, errCode string, err error) {
 	var (
 		printNo, name string
@@ -244,6 +248,26 @@ func (c *ApiController) UpdatePrinter(dataMap map[string]interface{}) (data, err
 	return "", errCode, err
 }
 
+//清空打印机队列
+func (c *ApiController) DelPrinterSeq(dataMap map[string]interface{}) (data, errCode string, err error) {
+	var (
+		printNo string
+		appID   int
+	)
+	if _, ok := dataMap[keyPrintNo].(string); !ok {
+		return buildParamErrCodeAndErr(keyPrintNo)
+	} else {
+		if printNo = dataMap[keyPrintNo].(string); printNo == "" {
+			return buildParamErrCodeAndErr(keyPrintNo)
+		}
+	}
+	appID = dataMap[keyAppID].(int)
+	if err = cms.DelPrinterSeq(appID, printNo); err != nil {
+		return "", model.ErrCodeGeneralFailed, err
+	}
+	return "", errCode, err
+}
+
 func (c *ApiController) DoPrint(dataMap map[string]interface{}) (data, errCode string, err error) {
 	var (
 		content = dataMap["data"].(string)