liulei/jx-print
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2022-12-16 10:20:28 +08:00
parent 49e926e9cf
commit 65ce12074a
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
routers/v2_router.go
View File

@@ -22,7 +22,7 @@ func InitV2System(v2 *gin.RouterGroup) {
//print //print
print := v2.Group("/print") print := v2.Group("/print")
print.POST("/addPrinters", controllers.AddPrinters) print.POST("/addPrinters", controllers.AddPrinters)
print.GET("/getPrinters", controllers.GetPrinters) print.GET("/getSysPrinters", controllers.GetPrinters)
print.POST("/delPrinters", controllers.DelPrinters) print.POST("/delPrinters", controllers.DelPrinters)
print.POST("/updatePrinter", controllers.UpdatePrinter) print.POST("/updatePrinter", controllers.UpdatePrinter)
print.POST("/testPrint", controllers.TestPrint) print.POST("/testPrint", controllers.TestPrint)

9
services/print_server/app_server/temp.go
View File

@@ -202,7 +202,7 @@ func (t *TempServer) DeleteTemp(id int, userId string) error {
} }
// QueryTempList 查询用户模板 // QueryTempList 查询用户模板
func (t *TempServer) QueryTempList(userId, printSn string) ([]*tempModel.SystemTemp, error) { func (t *TempServer) QueryTempList(userId, printSn string) (map[string][]*tempModel.SystemTemp, error) {
userList, err := dao.SelectUserTemp(userId, printSn) userList, err := dao.SelectUserTemp(userId, printSn)
if err != nil { if err != nil {
return nil, err return nil, err
@@ -213,8 +213,11 @@ func (t *TempServer) QueryTempList(userId, printSn string) ([]*tempModel.SystemT
if err != nil { if err != nil {
return nil, err return nil, err
} }
userList = append(userList, systemTemp...)
return userList, nil tempMap := make(map[string][]*tempModel.SystemTemp, 0)
tempMap["user_temp"] = userList
tempMap["system_temp"] = systemTemp
return tempMap, nil
} }
// QueryPrintTempByPrintNo 根据打印机id查询打印机 // QueryPrintTempByPrintNo 根据打印机id查询打印机

4
services/print_server/app_server/wx_print.go
View File

@@ -126,10 +126,6 @@ func GetPrinters(appID int, printNo, name string, status, isOnline, offset, page
if err != nil { if err != nil {
return nil, err return nil, err
} }
page, err = dao.GetPrintersPage(globals.GetDB(), appID, printNo, name, status, isOnline, offset, pageSize, "")
if err != nil {
return nil, err
}
print2 := page.Data.([]model.Printer) print2 := page.Data.([]model.Printer)
// make([]model.Printer, 0, 0) // make([]model.Printer, 0, 0)
//if err := json.Unmarshal([]byte(utils.Interface2String(page.Data)), &print2); err != nil { //if err := json.Unmarshal([]byte(utils.Interface2String(page.Data)), &print2); err != nil {