From 0c639a2d3079122f451d3d66e0ee541b0c7f3042 Mon Sep 17 00:00:00 2001 From: wangxin Date: Thu, 25 Jul 2019 09:07:46 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E7=A8=8B=E7=B1=BB=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=8D=95=E8=8E=B7=EF=BC=8C=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configuration/ObjGroupCfgConvert.java | 134 +++++++++--------- 1 file changed, 70 insertions(+), 64 deletions(-) diff --git a/src/main/java/com/nis/web/service/configuration/ObjGroupCfgConvert.java b/src/main/java/com/nis/web/service/configuration/ObjGroupCfgConvert.java index b8a318cd1..f6e0168ab 100644 --- a/src/main/java/com/nis/web/service/configuration/ObjGroupCfgConvert.java +++ b/src/main/java/com/nis/web/service/configuration/ObjGroupCfgConvert.java @@ -7,6 +7,7 @@ import com.nis.domain.configuration.IpPortCfg; import com.nis.domain.maat.MaatCfg; import com.nis.util.ConfigConvertUtil; import org.apache.commons.collections.CollectionUtils; +import org.apache.log4j.Logger; import org.springframework.beans.BeanUtils; import java.util.Date; @@ -15,6 +16,7 @@ import java.util.Map; import java.util.Set; public class ObjGroupCfgConvert implements Runnable{ + private static final Logger logger= Logger.getLogger(ObjGroupCfgConvert.class); private CfgIndexInfo cfgIndexInfo; private Integer isAudit; private Map serviceDictMap; @@ -37,75 +39,79 @@ public class ObjGroupCfgConvert implements Runnable{ } @Override public void run() { - //IP公共分组 - if("ipGroup".equalsIgnoreCase(groupName)&& CollectionUtils.isNotEmpty(cfgIndexInfo.getIpCommGroupCfgList())){ - IpPortCfg cfg = new IpPortCfg(); - BeanUtils.copyProperties(cfgIndexInfo, cfg, new String[]{"cfgId","menuNameCode"}); - if(isValid!=null){ - cfg.setIsValid(isValid); - } - cfg.setIsAudit(isAudit); - if(auditTime!=null){ - cfg.setAuditTime(auditTime); - } - if(isAudit==1){ - Map map = ConfigConvertUtil.objGroupCfgConvert(serviceDictMap,ipRegionList,cfgIndexInfo.getIpCommGroupCfgList(),1,cfg,groupRelationList,maatTableMap,groupIdSet); - groupRelationList=map.get("groupList"); - ipRegionList=map.get("dstList"); - if(map.get("numRegionList")!=null){ - numRegionList.addAll(map.get("numRegionList")); + try{ + //IP公共分组 + if("ipGroup".equalsIgnoreCase(groupName)&& CollectionUtils.isNotEmpty(cfgIndexInfo.getIpCommGroupCfgList())){ + IpPortCfg cfg = new IpPortCfg(); + BeanUtils.copyProperties(cfgIndexInfo, cfg, new String[]{"cfgId","menuNameCode"}); + if(isValid!=null){ + cfg.setIsValid(isValid); + } + cfg.setIsAudit(isAudit); + if(auditTime!=null){ + cfg.setAuditTime(auditTime); + } + if(isAudit==1){ + Map map = ConfigConvertUtil.objGroupCfgConvert(serviceDictMap,ipRegionList,cfgIndexInfo.getIpCommGroupCfgList(),1,cfg,groupRelationList,maatTableMap,groupIdSet); + groupRelationList=map.get("groupList"); + ipRegionList=map.get("dstList"); + if(map.get("numRegionList")!=null){ + numRegionList.addAll(map.get("numRegionList")); + } } } - } - if("urlGroup".equalsIgnoreCase(groupName)&&CollectionUtils.isNotEmpty(cfgIndexInfo.getUrlCommGroupList())){ - CommonStringCfg cfg = new CommonStringCfg(); - BeanUtils.copyProperties(cfgIndexInfo, cfg, new String[]{"cfgId","menuNameCode"}); - if(isValid!=null){ - cfg.setIsValid(isValid); + if("urlGroup".equalsIgnoreCase(groupName)&&CollectionUtils.isNotEmpty(cfgIndexInfo.getUrlCommGroupList())){ + CommonStringCfg cfg = new CommonStringCfg(); + BeanUtils.copyProperties(cfgIndexInfo, cfg, new String[]{"cfgId","menuNameCode"}); + if(isValid!=null){ + cfg.setIsValid(isValid); + } + cfg.setIsAudit(isAudit); + if(auditTime!=null){ + cfg.setAuditTime(auditTime); + } + if(isAudit==1){ + Map map =ConfigConvertUtil.objGroupCfgConvert(serviceDictMap,strRegionList,cfgIndexInfo.getUrlCommGroupList(),2,cfg,groupRelationList,maatTableMap,groupIdSet); + groupRelationList=map.get("groupList"); + strRegionList=map.get("dstList"); + } } - cfg.setIsAudit(isAudit); - if(auditTime!=null){ - cfg.setAuditTime(auditTime); + //账号公共分组 + if("subscribeIdGroup".equalsIgnoreCase(groupName)&&CollectionUtils.isNotEmpty(cfgIndexInfo.getScriberIdCommGroupList())){ + CommonStringCfg cfg = new CommonStringCfg(); + BeanUtils.copyProperties(cfgIndexInfo, cfg, new String[]{"cfgId","menuNameCode"}); + if(isValid!=null){ + cfg.setIsValid(isValid); + } + cfg.setIsAudit(isAudit); + if(auditTime!=null){ + cfg.setAuditTime(auditTime); + } + if(isAudit==1){ + Map map =ConfigConvertUtil.objGroupCfgConvert(serviceDictMap,strRegionList,cfgIndexInfo.getScriberIdCommGroupList(),2,cfg,groupRelationList,maatTableMap,groupIdSet); + groupRelationList=map.get("groupList"); + strRegionList=map.get("dstList"); + } } - if(isAudit==1){ - Map map =ConfigConvertUtil.objGroupCfgConvert(serviceDictMap,strRegionList,cfgIndexInfo.getUrlCommGroupList(),2,cfg,groupRelationList,maatTableMap,groupIdSet); - groupRelationList=map.get("groupList"); - strRegionList=map.get("dstList"); - } - } - //账号公共分组 - if("subscribeIdGroup".equalsIgnoreCase(groupName)&&CollectionUtils.isNotEmpty(cfgIndexInfo.getScriberIdCommGroupList())){ - CommonStringCfg cfg = new CommonStringCfg(); - BeanUtils.copyProperties(cfgIndexInfo, cfg, new String[]{"cfgId","menuNameCode"}); - if(isValid!=null){ - cfg.setIsValid(isValid); - } - cfg.setIsAudit(isAudit); - if(auditTime!=null){ - cfg.setAuditTime(auditTime); - } - if(isAudit==1){ - Map map =ConfigConvertUtil.objGroupCfgConvert(serviceDictMap,strRegionList,cfgIndexInfo.getScriberIdCommGroupList(),2,cfg,groupRelationList,maatTableMap,groupIdSet); - groupRelationList=map.get("groupList"); - strRegionList=map.get("dstList"); - } - } - //域名公共分组 - if("domainGroup".equalsIgnoreCase(groupName)&&CollectionUtils.isNotEmpty(cfgIndexInfo.getDomainCommGroupList())){ - CommonStringCfg cfg = new CommonStringCfg(); - BeanUtils.copyProperties(cfgIndexInfo, cfg, new String[]{"cfgId","menuNameCode"}); - if(isValid!=null){ - cfg.setIsValid(isValid); - } - cfg.setIsAudit(isAudit); - if(auditTime!=null){ - cfg.setAuditTime(auditTime); - } - if(isAudit==1){ - Map map =ConfigConvertUtil.objGroupCfgConvert(serviceDictMap,strRegionList,cfgIndexInfo.getDomainCommGroupList(),2,cfg,groupRelationList,maatTableMap,groupIdSet); - groupRelationList=map.get("groupList"); - strRegionList=map.get("dstList"); + //域名公共分组 + if("domainGroup".equalsIgnoreCase(groupName)&&CollectionUtils.isNotEmpty(cfgIndexInfo.getDomainCommGroupList())){ + CommonStringCfg cfg = new CommonStringCfg(); + BeanUtils.copyProperties(cfgIndexInfo, cfg, new String[]{"cfgId","menuNameCode"}); + if(isValid!=null){ + cfg.setIsValid(isValid); + } + cfg.setIsAudit(isAudit); + if(auditTime!=null){ + cfg.setAuditTime(auditTime); + } + if(isAudit==1){ + Map map =ConfigConvertUtil.objGroupCfgConvert(serviceDictMap,strRegionList,cfgIndexInfo.getDomainCommGroupList(),2,cfg,groupRelationList,maatTableMap,groupIdSet); + groupRelationList=map.get("groupList"); + strRegionList=map.get("dstList"); + } } + }catch (Throwable e){ + logger.error("ObjGroupCfgConvert failed",e); } }