From 2e7312cdebd6af62418dad121445ff28cc30e354 Mon Sep 17 00:00:00 2001 From: duandongmei Date: Mon, 4 Jun 2018 15:36:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9contUrl=E5=92=8CpicUrl?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=9A=84keywords=E6=94=AF=E6=8C=81=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E5=85=B3=E9=94=AE=E8=AF=8D=20common.js=E4=B8=ADtagInp?= =?UTF-8?q?ut=E7=9B=B8=E5=85=B3=E7=9A=84name=E5=B1=9E=E6=80=A7=E5=8F=96?= =?UTF-8?q?=E5=80=BC=E5=B0=86.=E5=8E=BB=E6=8E=89=20=E6=9A=82=E6=97=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9F=B3=E8=A7=86=E9=A2=91=E7=B1=BB=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=B8=8B=E5=8F=91=E6=98=AF=E7=9A=84cfgType=E4=B8=BAma?= =?UTF-8?q?at=E5=AF=B9=E5=BA=94=E7=9A=84tableName?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nis/web/dao/FunctionRegionDictDao.xml | 1 + .../configuration/AvContentCfgService.java | 38 +- .../WEB-INF/include/form/stringInfo.jsp | 6 +- .../views/cfg/av/contUrl/contUrlForm.jsp | 1 + .../views/cfg/av/picUrl/picUrlForm.jsp | 1 + .../WEB-INF/views/cfg/av/voip/voipForm.jsp | 528 +++++++++--------- .../WEB-INF/views/cfg/av/voip/voipList.jsp | 197 +++---- .../webapp/static/global/scripts/common.js | 12 +- 8 files changed, 412 insertions(+), 372 deletions(-) diff --git a/src/main/java/com/nis/web/dao/FunctionRegionDictDao.xml b/src/main/java/com/nis/web/dao/FunctionRegionDictDao.xml index 34cc7f18d..02accdb97 100644 --- a/src/main/java/com/nis/web/dao/FunctionRegionDictDao.xml +++ b/src/main/java/com/nis/web/dao/FunctionRegionDictDao.xml @@ -30,6 +30,7 @@ AND config_region_code=#{configRegionCode,jdbcType=VARCHAR} + order by region_type desc \ No newline at end of file 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 588b33877..831c23e56 100644 --- a/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java @@ -3,6 +3,7 @@ package com.nis.web.service.configuration; import java.util.ArrayList; import java.util.Date; +import java.util.Iterator; import java.util.List; import java.util.Map; @@ -351,12 +352,20 @@ public class AvContentCfgService extends BaseService{ if(isAudit==1){ if(!StringUtil.isEmpty(voipIpList)){ + //TODO DELETE后期删除 + for (AvVoipIpCfg ipCfg : voipIpList) { + ipCfg.setCfgType("MM_VOIP_IP"); + } Map ipMap = cfgConvert(ipRegionList,voipIpList,1,entity,groupRelationList); groupRelationList=ipMap.get("groupList"); ipRegionList=ipMap.get("dstList"); } if(!StringUtil.isEmpty(voipAccountList)){ + //TODO DELETE后期删除 + for (AvVoipAccountCfg accountCfg : voipAccountList) { + accountCfg.setCfgType("MM_VOIP_ACCOUNT"); + } Map accountMap = cfgConvert(strRegionList,voipAccountList,2,entity,groupRelationList); groupRelationList=accountMap.get("groupList"); strRegionList=accountMap.get("dstList"); @@ -380,6 +389,8 @@ public class AvContentCfgService extends BaseService{ maatCfg.setDigestRegionList(digestRegionList); maatCfg.setGroupRelationList(groupRelationList); maatCfg.setGroupNum(groupRelationList.size()); + //TODO 后期修改 + maatCfg.setUserRegion(entity.getCompileId()+""); maatCfg.setAreaIpRegionList(areaIpRegionList); maatCfg.setIsValid(entity.getIsValid()); configCompileList.add(maatCfg); @@ -639,6 +650,10 @@ public class AvContentCfgService extends BaseService{ if(isAudit==1){ if(!StringUtil.isEmpty(list)){ + //TODO DELETE后期删除 + for (BaseIpCfg ipCfg : list) { + ipCfg.setCfgType("MM_AV_IP"); + } Map ipMap = cfgConvert(ipRegionList,list,1,entity,groupRelationList); groupRelationList=ipMap.get("groupList"); ipRegionList=ipMap.get("dstList"); @@ -663,6 +678,8 @@ public class AvContentCfgService extends BaseService{ maatCfg.setDigestRegionList(digestRegionList); maatCfg.setGroupRelationList(groupRelationList); maatCfg.setGroupNum(groupRelationList.size()); + //TODO 后期修改 + maatCfg.setUserRegion(entity.getCompileId()+""); maatCfg.setAreaIpRegionList(areaIpRegionList); maatCfg.setIsValid(entity.getIsValid()); configCompileList.add(maatCfg); @@ -880,7 +897,7 @@ public class AvContentCfgService extends BaseService{ entity.setCfgId(Long.parseLong(id)); entity = avContentCfgDao.findIpCfgById(entity); - entity.setTableName("av_cont_ip_cfg"); + entity.setTableName("av_pic_ip_cfg"); entity.setIsAudit(isAudit); entity.setIsValid(isValid); entity.setAuditorId(UserUtils.getUser().getId()); @@ -919,6 +936,11 @@ public class AvContentCfgService extends BaseService{ if(isAudit==1){ if(!StringUtil.isEmpty(list)){ + + //TODO DELETE后期删除 + for (BaseIpCfg ipCfg : list) { + ipCfg.setCfgType("MM_PIC_IP"); + } Map ipMap = cfgConvert(ipRegionList,list,1,entity,groupRelationList); groupRelationList=ipMap.get("groupList"); ipRegionList=ipMap.get("dstList"); @@ -943,6 +965,8 @@ public class AvContentCfgService extends BaseService{ maatCfg.setDigestRegionList(digestRegionList); maatCfg.setGroupRelationList(groupRelationList); maatCfg.setGroupNum(groupRelationList.size()); + //TODO 后期修改 + maatCfg.setUserRegion(entity.getCompileId()+""); maatCfg.setAreaIpRegionList(areaIpRegionList); maatCfg.setIsValid(entity.getIsValid()); configCompileList.add(maatCfg); @@ -1165,6 +1189,10 @@ public class AvContentCfgService extends BaseService{ if(isAudit==1){ if(!StringUtil.isEmpty(list)){ + //TODO DELETE后期删除 + for (BaseStringCfg strCfg : list) { + strCfg.setCfgType("MM_AV_UR"); + } Map strMap = cfgConvert(strRegionList,list,2,entity,groupRelationList); groupRelationList=strMap.get("groupList"); strRegionList=strMap.get("dstList"); @@ -1189,6 +1217,8 @@ public class AvContentCfgService extends BaseService{ maatCfg.setDigestRegionList(digestRegionList); maatCfg.setGroupRelationList(groupRelationList); maatCfg.setGroupNum(groupRelationList.size()); + //TODO 后期修改 + maatCfg.setUserRegion(entity.getCompileId()+""); maatCfg.setAreaIpRegionList(areaIpRegionList); maatCfg.setIsValid(entity.getIsValid()); configCompileList.add(maatCfg); @@ -1410,6 +1440,10 @@ public class AvContentCfgService extends BaseService{ if(isAudit==1){ if(!StringUtil.isEmpty(list)){ + //TODO DELETE后期删除 + for (BaseStringCfg strCfg : list) { + strCfg.setCfgType("MM_PIC_URL"); + } Map strMap = cfgConvert(strRegionList,list,2,entity,groupRelationList); groupRelationList=strMap.get("groupList"); strRegionList=strMap.get("dstList"); @@ -1434,6 +1468,8 @@ public class AvContentCfgService extends BaseService{ maatCfg.setDigestRegionList(digestRegionList); maatCfg.setGroupRelationList(groupRelationList); maatCfg.setGroupNum(groupRelationList.size()); + //TODO 后期修改 + maatCfg.setUserRegion(entity.getCompileId()+""); maatCfg.setAreaIpRegionList(areaIpRegionList); maatCfg.setIsValid(entity.getIsValid()); configCompileList.add(maatCfg); diff --git a/src/main/webapp/WEB-INF/include/form/stringInfo.jsp b/src/main/webapp/WEB-INF/include/form/stringInfo.jsp index ab70700d8..3d81b87b0 100644 --- a/src/main/webapp/WEB-INF/include/form/stringInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/stringInfo.jsp @@ -7,7 +7,7 @@
- +
@@ -52,10 +52,10 @@
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp index d6837f8fa..6702e324d 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp @@ -18,6 +18,7 @@ $(function(){ }, submitHandler: function(form){ //loading('onloading...'); + $("input[name$='exprType']").attr("disabled",false); form.submit(); }, errorContainer: "#messageBox", diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp index 83e618839..230edd471 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp @@ -18,6 +18,7 @@ $(function(){ }, submitHandler: function(form){ //loading('onloading...'); + $("input[name$='exprType']").attr("disabled",false); form.submit(); }, errorContainer: "#messageBox", diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp index fe20c2531..ff3e21fae 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp @@ -140,281 +140,279 @@ var delContent=function(contentClassName,addBtnClassName){ - - -

- - - -

- - - + + + + + +

+ - -