This commit is contained in:
suyl
2021-07-09 14:53:33 +08:00
parent a5d4a1c5d1
commit 39e0999481
2 changed files with 14 additions and 4 deletions

View File

@@ -71,7 +71,7 @@ func DelPrinter(appID int, printNos []string) (err error) {
return err return err
} }
func UpdatePrinter(appID int, printNo, name, sim string) (err error) { func UpdatePrinter(appID int, printNo, name, sim, sound string, volume int) (err error) {
var ( var (
db = dao.GetDB() db = dao.GetDB()
fields []string fields []string
@@ -88,6 +88,14 @@ func UpdatePrinter(appID int, printNo, name, sim string) (err error) {
printers[0].SIM = sim printers[0].SIM = sim
fields = append(fields, "sim") fields = append(fields, "sim")
} }
if printers[0].Sound != sound {
printers[0].Sound = sound
fields = append(fields, "sound")
}
if printers[0].Volume != volume {
printers[0].Volume = volume
fields = append(fields, "volume")
}
if _, err = dao.UpdateEntity(db, printers[0], fields...); err != nil { if _, err = dao.UpdateEntity(db, printers[0], fields...); err != nil {
return err return err
} }

View File

@@ -246,8 +246,8 @@ func (c *ApiController) DelPrinter(dataMap map[string]interface{}) (data, errCod
//修改打印机信息 //修改打印机信息
func (c *ApiController) UpdatePrinter(dataMap map[string]interface{}) (data, errCode string, err error) { func (c *ApiController) UpdatePrinter(dataMap map[string]interface{}) (data, errCode string, err error) {
var ( var (
printNo, name, sim string printNo, name, sim, sound string
appID int appID, volume int
) )
globals.SugarLogger.Debugf("Begin API UpdatePrinter data: [%v]", utils.Format4Output(dataMap, false)) globals.SugarLogger.Debugf("Begin API UpdatePrinter data: [%v]", utils.Format4Output(dataMap, false))
if _, ok := dataMap[keyPrintNo].(string); !ok { if _, ok := dataMap[keyPrintNo].(string); !ok {
@@ -259,8 +259,10 @@ func (c *ApiController) UpdatePrinter(dataMap map[string]interface{}) (data, err
} }
name = dataMap[keyName].(string) name = dataMap[keyName].(string)
sim = dataMap["sim"].(string) sim = dataMap["sim"].(string)
sound = dataMap["sound"].(string)
volume = dataMap["volume"].(int)
appID = utils.Str2Int(dataMap[keyAppID].(string)) appID = utils.Str2Int(dataMap[keyAppID].(string))
if err = cms.UpdatePrinter(appID, printNo, name, sim); err != nil { if err = cms.UpdatePrinter(appID, printNo, name, sim, sound, volume); err != nil {
return "", model.ErrCodeGeneralFailed, err return "", model.ErrCodeGeneralFailed, err
} }
return "", errCode, err return "", errCode, err