From 82f56d4ce6d094e5432ac344f665f0b7df9b9003 Mon Sep 17 00:00:00 2001
From: yangb <397447182@qq.com>
Date: Wed, 31 May 2023 12:28:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E6=8F=92=E4=BB=B6--=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=BF=AE=E6=94=B9=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controllers/tp_protocol_plugin.go      |  2 +-
 services/tp_protocol_plugin_service.go | 26 ++++++++++++++++++++++++--
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/controllers/tp_protocol_plugin.go b/controllers/tp_protocol_plugin.go
index dd83408..9c9bb3f 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 2818918..2803d72 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)
 }
 
 // 删除数据
-- 
Gitee