删除userId打印机

controllers/app/wx_print.go

@@ -71,7 +71,7 @@ func (p *Print) GetPrinters(c *gin.Context) {
 	}
 
 	controllers.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
-		retVal, err = printServer.GetPrinters(param.AppID, param.PrintNo, param.Name, param.Status, param.IsOnline, param.Offset, param.PageSize, "")
+		retVal, err = printServer.GetPrinters(param.AppID, param.PrintNo, param.Name, param.Status, param.IsOnline, param.Offset, param.PageSize)
 		return retVal, "", err
 	})
 }

controllers/print_controller.go

@@ -145,9 +145,9 @@ func TestPrint(c *gin.Context) {
 		BuildErrJson(c, err)
 		return
 	}
-	if tokenInfo = CheckToken(c); tokenInfo == nil {
+	//if tokenInfo = CheckToken(c); tokenInfo == nil {
-		return
+	//	return
-	}
+	//}
 	if !CallFunc(c, func() (retVal interface{}, errCode string, err error) {
 		retVal, err = print_server.TestPrint(c, param.AppID, tokenInfo, param.PrintNo, param.OrderNo, param.Content)
 		return retVal, "", err

dao/print_dao.go

@@ -40,7 +40,7 @@ func GetPrinters(db *sqlx.DB, appID int, printNo string, status, statusNeq, flow
 	return printers, err
 }
 
-func GetPrintersPage(db *sqlx.DB, appID int, printNo, name string, status, isOnline, offset, pageSize int, userId string) (page *model.PagedInfo, err error) {
+func GetPrintersPage(db *sqlx.DB, appID int, printNo, name string, status, isOnline, offset, pageSize int) (page *model.PagedInfo, err error) {
 	var (
 		printers []*model.Printer
 		count    int
@@ -68,10 +68,6 @@ func GetPrintersPage(db *sqlx.DB, appID int, printNo, name string, status, isOnl
 		sqlOhter += " AND name LIKE ?"
 		sqlParams = append(sqlParams, "%"+name+"%")
 	}
-	if userId != "" {
-		sqlOhter += " AND user_id = ?"
-		sqlParams = append(sqlParams, userId)
-	}
 	if status != model.StatusAll {
 		sqlOhter += " AND status = ?"
 		sqlParams = append(sqlParams, status)

model/model.go

@@ -188,7 +188,6 @@ type Printer struct {
 	Volume       int        `json:"volume"`                   //音量，1-5 ，对应打印机2-10
 	FlowFlag     int        `json:"flow_flag" db:"flow_flag"` //是否超流量了，1表示超了
 	OfflineCount int        `json:"-" db:"offline_count"`     //掉线次数
-	UserId       string     `json:"user_id" db:"user_id"`     //打印机所属用户
 }
 
 type PrintMsg struct {

services/print_server/app_server/wx_print.go

@@ -45,7 +45,6 @@ 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)
@@ -57,8 +56,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, userId string) (page *model.PagedInfo, err error) {
+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, userId)
+	return dao.GetPrintersPage(globals.GetDB(), appID, printNo, name, status, isOnline, offset, pageSize)
 }
 
 func DelPrinters(appID int, tokenInfo *model.TokenInfo, printNos []string) (err error) {
@@ -84,11 +83,6 @@ func DelPrinters(appID int, tokenInfo *model.TokenInfo, printNos []string) (err
 			continue
 		}
 
-		if printers[0].UserId != tokenInfo.User.UserID {
-			errs = append(errs, fmt.Errorf("该appId不在用户账号下！app_id: %d, print_no: %s", appID, v))
-			continue
-		}
-
 		printer := printers[0]
 		printer.DeletedAt = &now
 		printer.LastOperator = tokenInfo.User.Name
@@ -116,10 +110,6 @@ func UpdatePrinter(appID int, tokenInfo *model.TokenInfo, printNo, name, sound s
 	if len(printers) == 0 {
 		return fmt.Errorf("未在该应用下查到此打印机！app_id: %d, print_no: %s", appID, printNo)
 	}
-	if printers[0].UserId != tokenInfo.User.UserID {
-		return fmt.Errorf("该appId不在用户账号下！app_id: %d, print_no: %s", appID, printers[0].PrintNo)
-	}
-
 	printer := printers[0]
 	printer.UpdatedAt = &now
 	printer.LastOperator = tokenInfo.User.Name
@@ -157,9 +147,6 @@ func TestPrint(appID int, tokenInfo *model.TokenInfo, printNo string, orderNo st
 	if len(printers) == 0 {
 		return "", fmt.Errorf("未在该应用下查到此打印机！app_id: %d, print_no: %s", appID, printNo)
 	}
-	if printers[0].UserId != tokenInfo.User.UserID {
-		return "", fmt.Errorf("该appId不在用户账号下！app_id: %d, print_no: %s", appID, printers[0].PrintNo)
-	}
 
 	printMsg := &model.PrintMsg{
 		CreatedAt:    &now,

services/print_server/print.go

@@ -56,7 +56,6 @@ func AddPrinters(c *gin.Context, tokenInfo *model.TokenInfo, appID int, printInf
 			IsOnline: model.PrinterOffline,
 			Sound:    sounda,
 			Volume:   4,
-			UserId:   tokenInfo.User.UserID,
 		}
 		if err = dao.Insert(db, printer); err != nil {
 			errs = append(errs, err)
@@ -69,7 +68,7 @@ func AddPrinters(c *gin.Context, tokenInfo *model.TokenInfo, appID int, printInf
 }
 
 func GetPrinters(c *gin.Context, 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, "")
+	return dao.GetPrintersPage(globals.GetDB(), appID, printNo, name, status, isOnline, offset, pageSize)
 }
 
 func DelPrinters(c *gin.Context, appID int, tokenInfo *model.TokenInfo, printNos []string) (err error) {