From 9ff1643e30a8ffbecccedfefd4d8b6d184fbfbb1 Mon Sep 17 00:00:00 2001 From: duandongmei Date: Mon, 21 Jan 2019 18:26:22 +0600 Subject: [PATCH] =?UTF-8?q?1=E6=9C=8816=E5=8F=B7=E4=B9=8B=E5=89=8D?= =?UTF-8?q?=E7=9A=84asn=E7=89=88=E6=9C=AC=E4=BF=AE=E6=94=B9=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E8=BE=93=E5=85=A5=E4=B8=BAasn=20=E5=8F=B7=E8=BE=93?= =?UTF-8?q?=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/basics/AsnGroupController.java | 7 ++----- .../web/service/configuration/IpCfgService.java | 16 ++++++++++------ .../webapp/WEB-INF/views/cfg/ipaddr/asnForm.jsp | 7 ++++--- .../webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp | 2 +- .../WEB-INF/views/cfg/ipaddr/ipSubList.jsp | 4 ++-- .../1.11.0/jquery.validate.method.js | 8 +++++--- 6 files changed, 24 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/nis/web/controller/basics/AsnGroupController.java b/src/main/java/com/nis/web/controller/basics/AsnGroupController.java index a00e3d8ef..0122184e4 100644 --- a/src/main/java/com/nis/web/controller/basics/AsnGroupController.java +++ b/src/main/java/com/nis/web/controller/basics/AsnGroupController.java @@ -155,14 +155,11 @@ public class AsnGroupController extends BaseController { */ @ResponseBody @RequestMapping(value = {"/checkAsnNo"}) - public boolean checkIp(AsnGroupInfo cfg, HttpServletRequest request, HttpServletResponse response){ + public AsnGroupInfo checkIp(AsnGroupInfo cfg, HttpServletRequest request, HttpServletResponse response){ AsnGroupInfo policyGroup = asnGroupInfoService.getInfoByAsnNo(cfg); - if(policyGroup == null){ - return true; - } - return false; + return policyGroup; } /** * 校验asn号是否已存在 diff --git a/src/main/java/com/nis/web/service/configuration/IpCfgService.java b/src/main/java/com/nis/web/service/configuration/IpCfgService.java index cc5edd54d..af1ab9204 100644 --- a/src/main/java/com/nis/web/service/configuration/IpCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/IpCfgService.java @@ -165,9 +165,11 @@ public class IpCfgService extends CrudService { } } if(regionDict!=null) { - String org=entity.getUserRegion4(); - List asnGroupInfos=asnGroupInfoDao.getValidConfigGroupInfoByName(org); - for(AsnGroupInfo info:asnGroupInfos) { + AsnGroupInfo asnSearch=new AsnGroupInfo(); + asnSearch.setOrganization(entity.getUserRegion4()); + asnSearch.setAsnId(Long.valueOf(entity.getUserRegion5())); + AsnGroupInfo info=asnGroupInfoDao.getGroupInfo(asnSearch); + if(info != null){ BaseStringCfg asnKeywordCfg=new AsnKeywordCfg(); BeanUtils.copyProperties(entity, asnKeywordCfg,new String[]{"cfgId","cfgDesc","cfgRegionCode","cfgType","userRegion1","userRegion2","userRegion3"}); asnKeywordCfg.setTableName(AsnKeywordCfg.getTablename()); @@ -233,10 +235,12 @@ public class IpCfgService extends CrudService { } if(regionDict!=null) { //先删除asn keyword - String org=entity.getUserRegion4(); stringCfgDao.deleteAsnKeyword(entity); - List asnGroupInfos=asnGroupInfoDao.getValidConfigGroupInfoByName(org); - for(AsnGroupInfo info:asnGroupInfos) { + AsnGroupInfo asnSearch=new AsnGroupInfo(); + asnSearch.setOrganization(entity.getUserRegion4()); + asnSearch.setAsnId(Long.valueOf(entity.getUserRegion5())); + AsnGroupInfo info=asnGroupInfoDao.getGroupInfo(asnSearch); + if(info != null){ BaseStringCfg asnKeywordCfg=new AsnKeywordCfg(); BeanUtils.copyProperties(entity, asnKeywordCfg,new String[]{"cfgId","cfgDesc","cfgRegionCode","cfgType","userRegion1","userRegion2","userRegion3"}); asnKeywordCfg.setTableName(AsnKeywordCfg.getTablename()); diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/asnForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/asnForm.jsp index 267c88485..b68de47c5 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/asnForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/asnForm.jsp @@ -17,16 +17,17 @@
<%-- --%>
- +
<%-- --%> - + +
-
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp index 34343a150..821dbe16d 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp @@ -77,7 +77,7 @@ } }); //处理asn id - $(".asn").find("input[name='userRegion5']").val($(".asn").find("select[name='userRegion4'] option:selected").attr("asnId")); + /* $(".asn").find("input[name='userRegion5']").val($(".asn").find("select[name='userRegion4'] option:selected").attr("asnId")); */ $(".asn").find("select[name='userRegion4']").on("change",function(){ var asnId=$(this).find("option[value='"+$(this).val()+"']").attr("asnId"); $(this).parents(".row").find("input[name='userRegion5']").val(asnId); diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipSubList.jsp index b6d41324f..846b0dfa8 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipSubList.jsp @@ -221,7 +221,7 @@
-
+