diff --git a/src/main/java/com/nis/domain/specific/SpecificServiceCfg.java b/src/main/java/com/nis/domain/specific/SpecificServiceCfg.java index a20649561..fcc2e9811 100644 --- a/src/main/java/com/nis/domain/specific/SpecificServiceCfg.java +++ b/src/main/java/com/nis/domain/specific/SpecificServiceCfg.java @@ -17,7 +17,7 @@ public class SpecificServiceCfg extends BaseEntity{ private static final long serialVersionUID = -1133644323636425766L; private Integer specServiceId; //spec_service_id 协议ID int N 主键,初始化 - //private Integer specServiceCode; //协议编码 int N 暂定,以后可扩展 1000:微信 , 1001:QQ + private Integer specServiceCode; //协议编码 int N 暂定,以后可扩展 1000:微信 , 1001:QQ private String specServiceName; //spec_service_name 协议名称 varchar(64) N private String specServiceDesc; //spec_service_desc 协议描述 varchar2(64) N private Integer isValid; //is_valid 有效标志 int N 1-有效 0-无效 @@ -36,6 +36,12 @@ public class SpecificServiceCfg extends BaseEntity{ public void setSpecServiceId(Integer specServiceId) { this.specServiceId = specServiceId; } + public Integer getSpecServiceCode() { + return specServiceCode; + } + public void setSpecServiceCode(Integer specServiceCode) { + this.specServiceCode = specServiceCode; + } public String getSpecServiceName() { return specServiceName; } diff --git a/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java b/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java index b6d5a5742..6e7003dd9 100644 --- a/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java +++ b/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java @@ -147,9 +147,9 @@ public class SpecificServiceCfgController extends BaseController { @RequiresPermissions(value= {"specific:service:add","specific:service:edit"},logical=Logical.OR) @RequestMapping(value="saveOrUpdate") public String saveOrUpdate(SpecificServiceCfg specificServiceCfg, Model model, - RedirectAttributes redirectAttributes,Integer oldId) { + RedirectAttributes redirectAttributes) { try { - specificServiceCfgService.saveOrUpdate(specificServiceCfg,oldId); + specificServiceCfgService.saveOrUpdate(specificServiceCfg); addMessage(redirectAttributes, "save_success"); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.xml b/src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.xml index b9c4084e6..e9cff258c 100644 --- a/src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.xml +++ b/src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.xml @@ -4,6 +4,7 @@ + @@ -18,6 +19,7 @@ s.spec_service_id AS specServiceId, + s.spec_service_code AS specServiceCode, s.spec_service_name AS specServiceName, s.spec_service_desc AS specServiceDesc, s.is_valid AS isValid, @@ -62,6 +64,9 @@ AND s2.spec_service_id like '%${specServiceId}%' + + AND spec_service_code = #{specServiceCode} + AND s2.spec_service_name like '%${specServiceName}%' @@ -93,7 +98,10 @@