From b9c9b5aab9981b3b58549754c4bd37a4fac9e622 Mon Sep 17 00:00:00 2001 From: duandongmei Date: Fri, 18 Jan 2019 15:15:06 +0600 Subject: [PATCH] =?UTF-8?q?asn=20ip=E5=8E=BB=E6=8E=89=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=B8=AD=E7=9A=84cfgDesc=20=EF=BC=9B=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=BB=E8=A1=A8=E4=B8=AD=E6=9C=AA=E5=AD=98?= =?UTF-8?q?=E5=82=A8commonGroupIds=E7=9A=84bug=EF=BC=9B=20asn=20ip?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=97=B6=EF=BC=8Casn=5Fgroup=5Finfo=E7=9A=84?= =?UTF-8?q?regionid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configuration/template/AsnIpTemplate.java | 8 ++++---- .../java/com/nis/web/service/BaseService.java | 16 +++++++++++++--- .../nis/web/service/basics/AsnIpCfgService.java | 2 ++ 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/nis/domain/configuration/template/AsnIpTemplate.java b/src/main/java/com/nis/domain/configuration/template/AsnIpTemplate.java index fc4d27ca3..9608bae09 100644 --- a/src/main/java/com/nis/domain/configuration/template/AsnIpTemplate.java +++ b/src/main/java/com/nis/domain/configuration/template/AsnIpTemplate.java @@ -13,7 +13,7 @@ public class AsnIpTemplate extends BasicTemplate{ * @since 1.0.0 */ - private String cfgDesc; + /*private String cfgDesc;*/ private String userRegion1; private String destIpAddress; private String organization; @@ -21,12 +21,12 @@ public class AsnIpTemplate extends BasicTemplate{ private String detail; // @ExcelField(title="config_describe",align=2,sort=1) - public String getCfgDesc() { + /*public String getCfgDesc() { return cfgDesc; } public void setCfgDesc(String cfgDesc) { this.cfgDesc = cfgDesc; - } + }*/ @ExcelField(title="asn_no",align=2,sort=11) public String getUserRegion1() { return userRegion1; @@ -42,7 +42,7 @@ public class AsnIpTemplate extends BasicTemplate{ public void setDestIpAddress(String destIpAddress) { this.destIpAddress = destIpAddress; } - @ExcelField(title="asn_name",align=2,sort=1) + @ExcelField(title="organization",align=2,sort=1) public String getOrganization() { return organization; } diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java index 3395276b9..e3f58962c 100644 --- a/src/main/java/com/nis/web/service/BaseService.java +++ b/src/main/java/com/nis/web/service/BaseService.java @@ -2982,7 +2982,7 @@ public abstract class BaseService { if(!StringUtil.isEmpty(commonGroupIds)){ commonGroupIds=commonGroupIds.substring(0, commonGroupIds.length()-1); } - entity.setCommonGroupIds(commonGroupIds); + /*entity.setCommonGroupIds(commonGroupIds);*/ //return entity; } /** @@ -3031,6 +3031,12 @@ public abstract class BaseService { AsnKeywordCfg asnCfg=new AsnKeywordCfg(); BeanUtils.copyProperties(entity, asnCfg,new String[]{"cfgId","userReigon1","userReigon2","userReigon3","userReigon4","userReigon5"}); asnCfg.setTableName(AsnKeywordCfg.getTablename()); + asnCfg.setCfgId(asnKeywordCfg.getCfgId()); + asnCfg.setUserRegion1(asnKeywordCfg.getUserRegion1()); + asnCfg.setUserRegion2(asnKeywordCfg.getUserRegion2()); + asnCfg.setUserRegion3(asnKeywordCfg.getUserRegion3()); + asnCfg.setUserRegion4(asnKeywordCfg.getUserRegion4()); + asnCfg.setUserRegion5(asnKeywordCfg.getUserRegion5()); stringCfgDao.updateAsnKeyword(asnCfg); } //3、//根据asnGroupIdList查询所有下发过的ASN NO @@ -3083,9 +3089,13 @@ public abstract class BaseService { asnGroupInfoDao.updateIsUsedAndIsValid(notAuditGroupIdList,1,null); } //6、标记组已被策略标记为全部下发 - configGroupInfoDao.updateIsAuditAll(4, 1,signAuditAllGroupList ); + if(!StringUtil.isEmpty(signAuditAllGroupList)){ + configGroupInfoDao.updateIsAuditAll(4, 1,signAuditAllGroupList ); + } //7、标记组已被策略引用 - configGroupInfoDao.updateIsUsed(4, 1, isUsedGroupIdList); + if(!StringUtil.isEmpty(isUsedGroupIdList)){ + configGroupInfoDao.updateIsUsed(4, 1, isUsedGroupIdList); + } //8、maat配置转换 if(!StringUtil.isEmpty(newAsnList)){ Map map = cfgConvert(strRegionList,newAsnList,7,entity,groupRelationList); diff --git a/src/main/java/com/nis/web/service/basics/AsnIpCfgService.java b/src/main/java/com/nis/web/service/basics/AsnIpCfgService.java index 60db7f240..1a899e984 100644 --- a/src/main/java/com/nis/web/service/basics/AsnIpCfgService.java +++ b/src/main/java/com/nis/web/service/basics/AsnIpCfgService.java @@ -181,6 +181,7 @@ public class AsnIpCfgService extends CrudService, AsnIpCfg> { if(!asnNoMap.isEmpty()) { List compileIds=ConfigServiceUtil.getId(1, asnNoMap.size()); List groupIds=ConfigServiceUtil.getId(2, asnNoMap.size()); + List regionIds=ConfigServiceUtil.getId(3, asnNoMap.size()); for(Entry e:asnNoMap.entrySet()) { AsnGroupInfo info=e.getValue(); info.setAsnId(e.getKey()); @@ -189,6 +190,7 @@ public class AsnIpCfgService extends CrudService, AsnIpCfg> { info.setCreateTime(createTime); info.setGroupId(groupIds.get(index)); info.setCompileId(compileIds.get(index)); + info.setRegionId(regionIds.get(index)); if(!groupSet.contains(info.getOrganization())) { groupSet.add(info.getOrganization()); }