diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java index 2cb2462a5..fa7389a9a 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java @@ -154,7 +154,7 @@ public class AvContentController extends BaseController { @RequiresPermissions(value={"avContIp:config"}) public String contIpForm(Model model,HttpServletRequest request,HttpServletResponse response,String ids,@ModelAttribute("cfg")BaseIpCfg cfg){ if(!StringUtil.isEmpty(ids)){ - cfg.setCfgId(Long.parseLong(ids)); + cfg.setCompileId(Integer.parseInt(ids)); cfg = avContentCfgService.getContIpCfgById(cfg); initUpdateFormCondition(model, cfg); }else{ @@ -218,7 +218,7 @@ public class AvContentController extends BaseController { @RequiresPermissions(value={"avPicIp:config"}) public String picIpForm(Model model,HttpServletRequest request,HttpServletResponse response,String ids,@ModelAttribute("cfg")BaseIpCfg cfg){ if(!StringUtil.isEmpty(ids)){ - cfg.setCfgId(Long.parseLong(ids)); + cfg.setCompileId(Integer.parseInt(ids)); cfg = avContentCfgService.getPicIpCfgById(cfg); initUpdateFormCondition(model, cfg); }else{ @@ -283,7 +283,7 @@ public class AvContentController extends BaseController { @RequiresPermissions(value={"avContUrl:config"}) public String contUrlForm(Model model,HttpServletRequest request,HttpServletResponse response,String ids,@ModelAttribute("cfg")BaseStringCfg cfg){ if(!StringUtil.isEmpty(ids)){ - cfg.setCfgId(Long.parseLong(ids)); + cfg.setCompileId(Integer.parseInt(ids)); cfg = avContentCfgService.getContUrlCfgById(cfg); initUpdateFormCondition(model, cfg); }else{ @@ -348,7 +348,7 @@ public class AvContentController extends BaseController { @RequiresPermissions(value={"avPicUrl:config"}) public String picUrlForm(Model model,HttpServletRequest request,HttpServletResponse response,String ids,@ModelAttribute("cfg")BaseStringCfg cfg){ if(!StringUtil.isEmpty(ids)){ - cfg.setCfgId(Long.parseLong(ids)); + cfg.setCompileId(Integer.parseInt(ids)); cfg = avContentCfgService.getPicUrlCfgById(cfg); initUpdateFormCondition(model, cfg); }else{ diff --git a/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml index afaf05ed3..5d7bb7ad0 100644 --- a/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml @@ -957,6 +957,9 @@ and r.cfg_id=#{cfgId,jdbcType=INTEGER} + + and r.compile_id=#{compileId,jdbcType=INTEGER} + and r.is_valid=#{isValid,jdbcType=INTEGER} @@ -1134,6 +1137,9 @@ and cfg_id = #{cfgId,jdbcType=INTEGER} + + and compile_id = #{compileId,jdbcType=INTEGER} + and function_id = #{functionId,jdbcType=INTEGER} @@ -1255,6 +1261,9 @@ and r.cfg_id=#{cfgId,jdbcType=INTEGER} + + and r.compile_id=#{compileId,jdbcType=INTEGER} + and r.is_valid=#{isValid,jdbcType=INTEGER} @@ -1405,6 +1414,9 @@ and cfg_id = #{cfgId,jdbcType=INTEGER} + + and compile_id = #{compileId,jdbcType=INTEGER} + and function_id = #{functionId,jdbcType=INTEGER} diff --git a/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java b/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java index 270139e37..49911f966 100644 --- a/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java @@ -353,6 +353,7 @@ public class AvContentCfgService extends BaseService{ if(isAudit==1){ if(!StringUtil.isEmpty(voipIpList)){ //TODO DELETE后期删除 + entity.setAreaEffectiveIds(StringUtils.isEmpty(entity.getAreaEffectiveIds()) ? "0":entity.getAreaEffectiveIds()); for (AvVoipIpCfg ipCfg : voipIpList) { ipCfg.setCfgType("MM_VOIP_IP"); } @@ -363,6 +364,7 @@ public class AvContentCfgService extends BaseService{ if(!StringUtil.isEmpty(voipAccountList)){ //TODO DELETE后期删除 + entity.setAreaEffectiveIds(StringUtils.isEmpty(entity.getAreaEffectiveIds()) ? "0":entity.getAreaEffectiveIds()); for (AvVoipAccountCfg accountCfg : voipAccountList) { accountCfg.setCfgType("MM_VOIP_ACCOUNT"); } @@ -582,7 +584,7 @@ public class AvContentCfgService extends BaseService{ entity.setTableName("av_cont_ip_cfg"); String[] idArray = ids.split(","); for(String id :idArray){ - entity.setCfgId(Long.parseLong(id)); + entity.setCompileId(Integer.parseInt(id)); entity.setFunctionId(functionId); entity.setIsAudit(isAudit); entity.setIsValid(isValid); @@ -609,7 +611,7 @@ public class AvContentCfgService extends BaseService{ List list = new ArrayList(); List areaIpCfgList = new ArrayList(); - entity.setCfgId(Long.parseLong(id)); + entity.setCompileId(Integer.parseInt(id)); entity = avContentCfgDao.findIpCfgById(entity); entity.setTableName("av_cont_ip_cfg"); entity.setIsAudit(isAudit); @@ -651,6 +653,7 @@ public class AvContentCfgService extends BaseService{ if(isAudit==1){ if(!StringUtil.isEmpty(list)){ //TODO DELETE后期删除 + entity.setAreaEffectiveIds(StringUtils.isEmpty(entity.getAreaEffectiveIds()) ? "0":entity.getAreaEffectiveIds()); for (BaseIpCfg ipCfg : list) { ipCfg.setCfgType("MM_AV_IP"); } @@ -869,7 +872,7 @@ public class AvContentCfgService extends BaseService{ entity.setTableName("av_pic_ip_cfg"); String[] idArray = ids.split(","); for(String id :idArray){ - entity.setCfgId(Long.parseLong(id)); + entity.setCompileId(Integer.parseInt(id)); entity.setFunctionId(functionId); entity.setIsAudit(isAudit); entity.setIsValid(isValid); @@ -895,7 +898,7 @@ public class AvContentCfgService extends BaseService{ List list = new ArrayList(); List areaIpCfgList = new ArrayList(); - entity.setCfgId(Long.parseLong(id)); + entity.setCompileId(Integer.parseInt(id)); entity = avContentCfgDao.findIpCfgById(entity); entity.setTableName("av_pic_ip_cfg"); entity.setIsAudit(isAudit); @@ -938,6 +941,7 @@ public class AvContentCfgService extends BaseService{ if(!StringUtil.isEmpty(list)){ //TODO DELETE后期删除 + entity.setAreaEffectiveIds(StringUtils.isEmpty(entity.getAreaEffectiveIds()) ? "0":entity.getAreaEffectiveIds()); for (BaseIpCfg ipCfg : list) { ipCfg.setCfgType("MM_PIC_IP"); } @@ -1131,7 +1135,7 @@ public class AvContentCfgService extends BaseService{ entity.setTableName("av_cont_url_cfg"); String[] idArray = ids.split(","); for(String id :idArray){ - entity.setCfgId(Long.parseLong(id)); + entity.setCompileId(Integer.parseInt(id)); entity.setFunctionId(functionId); entity.setIsAudit(isAudit); entity.setIsValid(isValid); @@ -1157,7 +1161,7 @@ public class AvContentCfgService extends BaseService{ List list = new ArrayList(); List areaIpCfgList = new ArrayList(); - entity.setCfgId(Long.parseLong(id)); + entity.setCompileId(Integer.parseInt(id)); entity = avContentCfgDao.findStringCfgById(entity); entity.setTableName("av_cont_url_cfg"); entity.setIsAudit(isAudit); @@ -1190,6 +1194,7 @@ public class AvContentCfgService extends BaseService{ if(isAudit==1){ if(!StringUtil.isEmpty(list)){ //TODO DELETE后期删除 + entity.setAreaEffectiveIds(StringUtils.isEmpty(entity.getAreaEffectiveIds()) ? "0":entity.getAreaEffectiveIds()); for (BaseStringCfg strCfg : list) { strCfg.setCfgType("MM_AV_URL"); } @@ -1382,7 +1387,7 @@ public class AvContentCfgService extends BaseService{ entity.setTableName("av_pic_url_cfg"); String[] idArray = ids.split(","); for(String id :idArray){ - entity.setCfgId(Long.parseLong(id)); + entity.setCompileId(Integer.parseInt(id)); entity.setFunctionId(functionId); entity.setIsAudit(isAudit); entity.setIsValid(isValid); @@ -1408,7 +1413,7 @@ public class AvContentCfgService extends BaseService{ List list = new ArrayList(); List areaIpCfgList = new ArrayList(); - entity.setCfgId(Long.parseLong(id)); + entity.setCompileId(Integer.parseInt(id)); entity = avContentCfgDao.findStringCfgById(entity); entity.setTableName("av_pic_url_cfg"); entity.setIsAudit(isAudit); @@ -1441,6 +1446,7 @@ public class AvContentCfgService extends BaseService{ if(isAudit==1){ if(!StringUtil.isEmpty(list)){ //TODO DELETE后期删除 + entity.setAreaEffectiveIds(StringUtils.isEmpty(entity.getAreaEffectiveIds()) ? "0":entity.getAreaEffectiveIds()); for (BaseStringCfg strCfg : list) { strCfg.setCfgType("MM_PIC_URL"); } diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp index a3a2e7d06..8679dce4f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp @@ -303,7 +303,7 @@ - + ${cfg.cfgDesc } diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp index bca8bc2dd..562ef370f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp @@ -295,7 +295,7 @@ - + ${cfg.cfgDesc } ${cfg.cfgKeywords } diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp index fbe6b88bd..124aac2fc 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp @@ -303,7 +303,7 @@ - + ${cfg.cfgDesc } diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp index d6006ffa8..8bb9a32a0 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp @@ -295,7 +295,7 @@ - + ${cfg.cfgDesc } ${cfg.cfgKeywords }