diff --git a/src/main/java/com/nis/util/ServiceConfigTemplateUtil.java b/src/main/java/com/nis/util/ServiceConfigTemplateUtil.java index d400fb202..ff971ff80 100644 --- a/src/main/java/com/nis/util/ServiceConfigTemplateUtil.java +++ b/src/main/java/com/nis/util/ServiceConfigTemplateUtil.java @@ -61,6 +61,60 @@ public class ServiceConfigTemplateUtil { } return list; } + /** + * + * @param functionId + * @param serviceId + * @return + */ + public List> getServiceList(String functionId,String serviceId){ + List> list =new ArrayList(); + List elements = root.selectNodes("service"); + boolean flag=false; + for(Element element:elements){ + if(!StringUtil.isEmpty(functionId) || !StringUtil.isEmpty(serviceId) ) { + flag=false; + String serviceIdC=element.attributeValue("id"); + String functionIdC=element.attributeValue("functionId"); + + if(!StringUtil.isEmpty(functionId) && !StringUtil.isEmpty(serviceId)) { + if(serviceIdC.equals(serviceId) && functionIdC.equals(functionId)) { + flag=true; + } + }else { + if(!StringUtil.isEmpty(serviceId) && serviceIdC.equals(serviceId) ) { + flag=true; + } + if(!StringUtil.isEmpty(functionId) && functionIdC.equals(functionId) ) { + flag=true; + } + } + + if(flag) { + Map map = new HashMap(); + for(int i=0;i map = new HashMap(); + for(int i=0;i> list = serviceTemplate.getServiceList(); + List> list = serviceTemplate.getServiceList("","128"); for(Map map :list){ System.out.println("业务配置："+map.get("id")+","+map.get("functionId")+","+map.get("serviceType")+","+map.get("tableName")); List> cfgList = (List>) map.get("cfgList"); diff --git a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java index ef837d382..a6cf1f8b5 100644 --- a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java +++ b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java @@ -176,7 +176,6 @@ public class ConfigSynchronizationService extends BaseService{ List digestRegionList; List areaIpRegionList; - List ipList = new ArrayList(); List asnIpList = new ArrayList(); List strList = new ArrayList(); @@ -198,7 +197,9 @@ public class ConfigSynchronizationService extends BaseService{ String tableName = m.get("tableName").toString(); if("1".equals(m.get("cfgType"))){ if(tableName.equals("asn_ip_cfg")){ - asnIpList.addAll(configSynchronizationDao.getAsnIpList(asnGroupIds)); + if(!StringUtil.isEmpty(asnGroupIds)) { + asnIpList.addAll(configSynchronizationDao.getAsnIpList(asnGroupIds)); + } }else{ ipList.addAll(configSynchronizationDao.getIpPortList(tableName, compileIds)); } @@ -287,6 +288,8 @@ public class ConfigSynchronizationService extends BaseService{ ip.setRegionId(regionIds.get(index)); regionIds.remove(index); ip.setGroupId(ipGroupId.get(0)); + ip.setIsValid(entity.getIsValid()); + ip.setAuditTime(StringUtil.isEmpty(ip.getAuditTime()) ? entity.getAuditTime():ip.getAuditTime()); list1.add(ip); } } @@ -294,6 +297,8 @@ public class ConfigSynchronizationService extends BaseService{ for(AsnIpCfg ip:asnIpList){//asn不需要再次获取regionId,groupId if(ip.getAsnIpGroup().toString().equals(cfg.getUserRegion4())){//根据组号对应 + ip.setIsValid(entity.getIsValid()); + ip.setAuditTime(StringUtil.isEmpty(ip.getAuditTime()) ? entity.getAuditTime():ip.getAuditTime()); list1.add(ip); } } @@ -305,6 +310,8 @@ public class ConfigSynchronizationService extends BaseService{ regionIds.remove(index); str.setGroupId(groupIds.get(index)); groupIds.remove(index); + str.setIsValid(entity.getIsValid()); + str.setAuditTime(StringUtil.isEmpty(str.getAuditTime()) ? entity.getAuditTime():str.getAuditTime()); list2.add(str); if(entity.getServiceId().equals(513)||entity.getServiceId().equals(515)){ if(userRegion.equals("")){ @@ -323,6 +330,8 @@ public class ConfigSynchronizationService extends BaseService{ regionIds.remove(index); str.setGroupId(groupIds.get(index)); groupIds.remove(index); + str.setIsValid(entity.getIsValid()); + str.setAuditTime(StringUtil.isEmpty(str.getAuditTime()) ? entity.getAuditTime():str.getAuditTime()); list3.add(str); if(entity.getServiceId().equals(129) && str.getDistrict()!=null){//http监测 String dictValue = DictUtils.getDictCode(Constants.HTTP_HEADER_DICT_MODULE, str.getDistrict()); @@ -344,6 +353,8 @@ public class ConfigSynchronizationService extends BaseService{ regionIds.remove(index); num.setGroupId(groupIds.get(index)); groupIds.remove(index); + num.setIsValid(entity.getIsValid()); + num.setAuditTime(StringUtil.isEmpty(num.getAuditTime()) ? entity.getAuditTime():num.getAuditTime()); list4.add(num); } } @@ -355,6 +366,8 @@ public class ConfigSynchronizationService extends BaseService{ regionIds.remove(index); file.setGroupId(groupIds.get(index)); groupIds.remove(index); + file.setIsValid(entity.getIsValid()); + file.setAuditTime(StringUtil.isEmpty(file.getAuditTime()) ? entity.getAuditTime():file.getAuditTime()); list5.add(file); } } @@ -364,8 +377,8 @@ public class ConfigSynchronizationService extends BaseService{ GroupCfg groupCfg=new GroupCfg(); groupCfg.setCompileId(cfg.getCompileId()); groupCfg.setGroupId(Integer.parseInt(cfg.getUserRegion4())); - groupCfg.setIsValid(cfg.getIsValid()); - groupCfg.setAuditTime(cfg.getAuditTime()); + groupCfg.setIsValid(entity.getIsValid()); + groupCfg.setAuditTime(StringUtil.isEmpty(cfg.getAuditTime()) ? new Date():cfg.getAuditTime()); groupRelationList.add(groupCfg); ipRegionList.addAll(groupReuseCfgAddRemoveConvert(list1,Constants.VALID_YES,null)); }else{ @@ -404,7 +417,7 @@ public class ConfigSynchronizationService extends BaseService{ BeanUtils.copyProperties(cfg, maatCfg); maatCfg.setAction(cfg.getAction()); - maatCfg.setAuditTime(cfg.getAuditTime()); + maatCfg.setAuditTime(StringUtil.isEmpty(cfg.getAuditTime()) ? new Date():cfg.getAuditTime()); maatCfg.setIpRegionList(ipRegionList); maatCfg.setStrRegionList(strRegionList); maatCfg.setNumRegionList(numRegionList); @@ -412,7 +425,8 @@ public class ConfigSynchronizationService extends BaseService{ maatCfg.setGroupRelationList(groupRelationList); maatCfg.setGroupNum(groupRelationList.size()); maatCfg.setAreaIpRegionList(areaIpRegionList); - maatCfg.setIsValid(cfg.getIsValid()); + maatCfg.setIsValid(entity.getIsValid()); + maatCfg.setAuditTime(new Date()); if(!StringUtil.isEmpty(userRegion)){ maatCfg.setUserRegion(userRegion); } @@ -424,6 +438,7 @@ public class ConfigSynchronizationService extends BaseService{ } if(!StringUtil.isEmpty(configCompileList.size())){ maatBean.setConfigCompileList(configCompileList); + maatBean.setAuditTime(new Date()); maatBean.setCreatorName(UserUtils.getUser().getName()); maatBean.setVersion(Constants.MAAT_VERSION); maatBean.setOpAction(Constants.INSERT_ACTION); @@ -517,6 +532,8 @@ public class ConfigSynchronizationService extends BaseService{ DdosIpCfg cfg=list.get(i); cfg.setRegionId(regionIds.get(i)); cfg.setGroupId(groupIds.get(i)); + cfg.setIsValid(entity.getIsValid()); + cfg.setAuditTime(StringUtil.isEmpty(cfg.getAuditTime()) ? entity.getAuditTime():cfg.getAuditTime()); maatCfg = new MaatCfg(); maatCfg.initDefaultValue(); groupRelationList = new ArrayList(); @@ -569,7 +586,7 @@ public class ConfigSynchronizationService extends BaseService{ } BeanUtils.copyProperties(cfg, maatCfg); maatCfg.setAction(cfg.getAction()); - maatCfg.setAuditTime(cfg.getAuditTime()); + maatCfg.setAuditTime(StringUtil.isEmpty(cfg.getAuditTime()) ? new Date():cfg.getAuditTime()); maatCfg.setIpRegionList(ipRegionList); maatCfg.setStrRegionList(strRegionList); maatCfg.setNumRegionList(numRegionList); @@ -577,7 +594,7 @@ public class ConfigSynchronizationService extends BaseService{ maatCfg.setGroupRelationList(groupRelationList); maatCfg.setGroupNum(groupRelationList.size()); maatCfg.setAreaIpRegionList(areaIpRegionList); - maatCfg.setIsValid(cfg.getIsValid()); + maatCfg.setIsValid(entity.getIsValid()); if(!StringUtil.isEmpty(userRegion)){ maatCfg.setUserRegion(userRegion); }