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

修改打印机

Browse Source
This commit is contained in:
邹宗楠
2022-07-28 16:46:20 +08:00
parent dbfafb7077
commit 102ab32266
6 changed files with 146 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,8 +28,8 @@ func AddPrinters(tokenInfo *model.TokenInfo, appID int, printInfo []*model.Print
continue
}
printers, _ := dao.GetPrinters(db, appID, v.PrintNo, 0, 0, 0)
if len(printers) > 0 {
errs = append(errs, fmt.Errorf("此打印机已被其他应用绑定！print_no :%s 。", v.PrintNo))
if len(printers) != 0 && printers[0].UserId != "system" {
errs = append(errs, fmt.Errorf("打印机已经被绑定！print_no :%s 。", v.PrintNo))
continue
}
printer := &model.Printer{
@@ -45,9 +45,16 @@ func AddPrinters(tokenInfo *model.TokenInfo, appID int, printInfo []*model.Print
IsOnline: model.PrinterOffline,
Sound: "sounda",
Volume: 4,
UserId: tokenInfo.User.UserID,
}
if err = dao.Insert(db, printer); err != nil {
errs = append(errs, err)
if len(printers) > 0 {
if err = dao.Update(db, printer, "UserId"); err != nil {
errs = append(errs, err)
}
} else {
if err = dao.Insert(db, printer); err != nil {
errs = append(errs, err)
}
}
}
if len(errs) > 0 {
@@ -56,8 +63,8 @@ func AddPrinters(tokenInfo *model.TokenInfo, appID int, printInfo []*model.Print
return err
}
func GetPrinters(appID int, printNo, name string, status, isOnline, offset, pageSize int) (page *model.PagedInfo, err error) {
return dao.GetPrintersPage(globals.GetDB(), appID, printNo, name, status, isOnline, offset, pageSize)
func GetPrinters(appID int, printNo, name string, status, isOnline, offset, pageSize int, userId string) (page *model.PagedInfo, err error) {
return dao.GetPrintersPage(globals.GetDB(), appID, printNo, name, status, isOnline, offset, pageSize, userId)
}
func DelPrinters(appID int, tokenInfo *model.TokenInfo, printNos []string) (err error) {
@@ -82,6 +89,10 @@ func DelPrinters(appID int, tokenInfo *model.TokenInfo, printNos []string) (err
errs = append(errs, fmt.Errorf("未在该应用下查到此打印机！app_id: %d, print_no: %s", appID, v))
continue
}
if printers[0].UserId != tokenInfo.User.UserID {
errs = append(errs, fmt.Errorf("该打印机不属于此用户 :%s 。", v))
continue
}
printer := printers[0]
printer.DeletedAt = &now