diff --git a/controllers/tp_protocol_plugin.go b/controllers/tp_protocol_plugin.go index dd834081caae0cc82819779c2a0d595a5dfb6d5a..9c9bb3fa2910f23232403f147f599c8ca759bd33 100644 --- a/controllers/tp_protocol_plugin.go +++ b/controllers/tp_protocol_plugin.go @@ -79,7 +79,7 @@ func (TpProtocolPluginController *TpProtocolPluginController) Edit() { } var TpProtocolPluginService services.TpProtocolPluginService rsp_err := TpProtocolPluginService.EditTpProtocolPlugin(TpProtocolPluginValidate) - if rsp_err != nil { + if rsp_err == nil { d := TpProtocolPluginService.GetTpProtocolPluginDetail(TpProtocolPluginValidate.Id) utils.SuccessWithDetailed(200, "success", d, map[string]string{}, (*context2.Context)(TpProtocolPluginController.Ctx)) } else { diff --git a/services/tp_protocol_plugin_service.go b/services/tp_protocol_plugin_service.go index 2818918745aa061d4843289c33193ff4e4ad72e1..2803d72cd4ad9015d76bb560a784690934f25652 100644 --- a/services/tp_protocol_plugin_service.go +++ b/services/tp_protocol_plugin_service.go @@ -84,12 +84,34 @@ func (*TpProtocolPluginService) AddTpProtocolPlugin(tp_protocol_plugin models.Tp // 修改数据 func (*TpProtocolPluginService) EditTpProtocolPlugin(tp_protocol_plugin valid.TpProtocolPluginValidate) error { - result := psql.Mydb.Model(&models.TpProtocolPlugin{}).Where("id = ?", tp_protocol_plugin.Id).Updates(&tp_protocol_plugin) + tpProtocolPlugin := models.TpProtocolPlugin{} + query := psql.Mydb.Model(tpProtocolPlugin) + query.Where("id = ?", tp_protocol_plugin.Id).First(&tpProtocolPlugin) + result := query.Updates(&tp_protocol_plugin) if result.Error != nil { logs.Error(result.Error.Error(), gorm.ErrRecordNotFound) return result.Error } - return nil + var TpDictService TpDictService + tpDict := models.TpDict{} + var old_dict_code string + if tpProtocolPlugin.DeviceType == "1" { //直连设备 + old_dict_code = "DRIECT_ATTACHED_PROTOCOL" + } else { + old_dict_code = "GATEWAY_PROTOCOL" + } + psql.Mydb.Model(tpDict).Where("dict_value = ? and dict_code = ?", tpProtocolPlugin.ProtocolType, old_dict_code).First(&tpDict) + + var dict_code string + if tp_protocol_plugin.DeviceType == "1" { //直连设备 + dict_code = "DRIECT_ATTACHED_PROTOCOL" + } else { + dict_code = "GATEWAY_PROTOCOL" + } + tpDict.DictCode = dict_code + tpDict.DictValue = tp_protocol_plugin.ProtocolType + tpDict.Describe = tp_protocol_plugin.Name + TpDictService.EditTpDict(tpDict) } // 删除数据