gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

全量下发公共方法：isValid从entity中获取；cfg的auditTime为空，则从entity中获取

Browse Source 
getServiceList方法增加根据functionId或serviceId条件获取
This commit is contained in:
DuanDongmei
2018-11-28 15:27:49 +08:00
parent 24483bd0c5
commit 2bb5b06f3a
2 changed files with 80 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/main/java/com/nis/util/ServiceConfigTemplateUtil.java
View File

@@ -61,6 +61,60 @@ public class ServiceConfigTemplateUtil {
} }
return list; return list;
} }
/**
*
* @param functionId
* @param serviceId
* @return
*/
public List<Map<String,Object>> getServiceList(String functionId,String serviceId){
List<Map<String,Object>> list =new ArrayList();
List<Element> 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<String,Object> map = new HashMap();
for(int i=0;i<element.attributes().size();i++){
String attributeName = element.attribute(i).getName();
map.put(attributeName, element.attributeValue(attributeName));
}
map.put("cfgList", getServiceCfgList(element));
map.put("userRegionList",getUserRegionList(element));
list.add(map);
}
}else {
Map<String,Object> map = new HashMap();
for(int i=0;i<element.attributes().size();i++){
String attributeName = element.attribute(i).getName();
map.put(attributeName, element.attributeValue(attributeName));
}
map.put("cfgList", getServiceCfgList(element));
map.put("userRegionList",getUserRegionList(element));
list.add(map);
}
}
return list;
}
/** /**
* 获取业务配置列表 * 获取业务配置列表
@@ -111,7 +165,7 @@ public class ServiceConfigTemplateUtil {
public static void main(String[] args) { public static void main(String[] args) {
try { try {
ServiceConfigTemplateUtil serviceTemplate = new ServiceConfigTemplateUtil(); ServiceConfigTemplateUtil serviceTemplate = new ServiceConfigTemplateUtil();
List<Map<String,Object>> list = serviceTemplate.getServiceList(); List<Map<String,Object>> list = serviceTemplate.getServiceList("","128");
for(Map<String,Object> map :list){ for(Map<String,Object> map :list){
System.out.println("业务配置："+map.get("id")+","+map.get("functionId")+","+map.get("serviceType")+","+map.get("tableName")); System.out.println("业务配置："+map.get("id")+","+map.get("functionId")+","+map.get("serviceType")+","+map.get("tableName"));
List<Map<String,Object>> cfgList = (List<Map<String, Object>>) map.get("cfgList"); List<Map<String,Object>> cfgList = (List<Map<String, Object>>) map.get("cfgList");

33
src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
View File

@@ -176,7 +176,6 @@ public class ConfigSynchronizationService extends BaseService{
List<DigestCfg> digestRegionList; List<DigestCfg> digestRegionList;
List<IpCfg> areaIpRegionList; List<IpCfg> areaIpRegionList;
List<IpPortCfg> ipList = new ArrayList(); List<IpPortCfg> ipList = new ArrayList();
List<AsnIpCfg> asnIpList = new ArrayList(); List<AsnIpCfg> asnIpList = new ArrayList();
List<BaseStringCfg> strList = new ArrayList(); List<BaseStringCfg> strList = new ArrayList();
@@ -198,7 +197,9 @@ public class ConfigSynchronizationService extends BaseService{
String tableName = m.get("tableName").toString(); String tableName = m.get("tableName").toString();
if("1".equals(m.get("cfgType"))){ if("1".equals(m.get("cfgType"))){
if(tableName.equals("asn_ip_cfg")){ if(tableName.equals("asn_ip_cfg")){
asnIpList.addAll(configSynchronizationDao.getAsnIpList(asnGroupIds)); if(!StringUtil.isEmpty(asnGroupIds)) {
asnIpList.addAll(configSynchronizationDao.getAsnIpList(asnGroupIds));
}
}else{ }else{
ipList.addAll(configSynchronizationDao.getIpPortList(tableName, compileIds)); ipList.addAll(configSynchronizationDao.getIpPortList(tableName, compileIds));
} }
@@ -287,6 +288,8 @@ public class ConfigSynchronizationService extends BaseService{
ip.setRegionId(regionIds.get(index)); ip.setRegionId(regionIds.get(index));
regionIds.remove(index); regionIds.remove(index);
ip.setGroupId(ipGroupId.get(0)); ip.setGroupId(ipGroupId.get(0));
ip.setIsValid(entity.getIsValid());
ip.setAuditTime(StringUtil.isEmpty(ip.getAuditTime()) ? entity.getAuditTime():ip.getAuditTime());
list1.add(ip); list1.add(ip);
} }
} }
@@ -294,6 +297,8 @@ public class ConfigSynchronizationService extends BaseService{
for(AsnIpCfg ip:asnIpList){//asn不需要再次获取regionId,groupId for(AsnIpCfg ip:asnIpList){//asn不需要再次获取regionId,groupId
if(ip.getAsnIpGroup().toString().equals(cfg.getUserRegion4())){//根据组号对应 if(ip.getAsnIpGroup().toString().equals(cfg.getUserRegion4())){//根据组号对应
ip.setIsValid(entity.getIsValid());
ip.setAuditTime(StringUtil.isEmpty(ip.getAuditTime()) ? entity.getAuditTime():ip.getAuditTime());
list1.add(ip); list1.add(ip);
} }
} }
@@ -305,6 +310,8 @@ public class ConfigSynchronizationService extends BaseService{
regionIds.remove(index); regionIds.remove(index);
str.setGroupId(groupIds.get(index)); str.setGroupId(groupIds.get(index));
groupIds.remove(index); groupIds.remove(index);
str.setIsValid(entity.getIsValid());
str.setAuditTime(StringUtil.isEmpty(str.getAuditTime()) ? entity.getAuditTime():str.getAuditTime());
list2.add(str); list2.add(str);
if(entity.getServiceId().equals(513)||entity.getServiceId().equals(515)){ if(entity.getServiceId().equals(513)||entity.getServiceId().equals(515)){
if(userRegion.equals("")){ if(userRegion.equals("")){
@@ -323,6 +330,8 @@ public class ConfigSynchronizationService extends BaseService{
regionIds.remove(index); regionIds.remove(index);
str.setGroupId(groupIds.get(index)); str.setGroupId(groupIds.get(index));
groupIds.remove(index); groupIds.remove(index);
str.setIsValid(entity.getIsValid());
str.setAuditTime(StringUtil.isEmpty(str.getAuditTime()) ? entity.getAuditTime():str.getAuditTime());
list3.add(str); list3.add(str);
if(entity.getServiceId().equals(129) && str.getDistrict()!=null){//http监测 if(entity.getServiceId().equals(129) && str.getDistrict()!=null){//http监测
String dictValue = DictUtils.getDictCode(Constants.HTTP_HEADER_DICT_MODULE, str.getDistrict()); String dictValue = DictUtils.getDictCode(Constants.HTTP_HEADER_DICT_MODULE, str.getDistrict());
@@ -344,6 +353,8 @@ public class ConfigSynchronizationService extends BaseService{
regionIds.remove(index); regionIds.remove(index);
num.setGroupId(groupIds.get(index)); num.setGroupId(groupIds.get(index));
groupIds.remove(index); groupIds.remove(index);
num.setIsValid(entity.getIsValid());
num.setAuditTime(StringUtil.isEmpty(num.getAuditTime()) ? entity.getAuditTime():num.getAuditTime());
list4.add(num); list4.add(num);
} }
} }
@@ -355,6 +366,8 @@ public class ConfigSynchronizationService extends BaseService{
regionIds.remove(index); regionIds.remove(index);
file.setGroupId(groupIds.get(index)); file.setGroupId(groupIds.get(index));
groupIds.remove(index); groupIds.remove(index);
file.setIsValid(entity.getIsValid());
file.setAuditTime(StringUtil.isEmpty(file.getAuditTime()) ? entity.getAuditTime():file.getAuditTime());
list5.add(file); list5.add(file);
} }
} }
@@ -364,8 +377,8 @@ public class ConfigSynchronizationService extends BaseService{
GroupCfg groupCfg=new GroupCfg(); GroupCfg groupCfg=new GroupCfg();
groupCfg.setCompileId(cfg.getCompileId()); groupCfg.setCompileId(cfg.getCompileId());
groupCfg.setGroupId(Integer.parseInt(cfg.getUserRegion4())); groupCfg.setGroupId(Integer.parseInt(cfg.getUserRegion4()));
groupCfg.setIsValid(cfg.getIsValid()); groupCfg.setIsValid(entity.getIsValid());
groupCfg.setAuditTime(cfg.getAuditTime()); groupCfg.setAuditTime(StringUtil.isEmpty(cfg.getAuditTime()) ? new Date():cfg.getAuditTime());
groupRelationList.add(groupCfg); groupRelationList.add(groupCfg);
ipRegionList.addAll(groupReuseCfgAddRemoveConvert(list1,Constants.VALID_YES,null)); ipRegionList.addAll(groupReuseCfgAddRemoveConvert(list1,Constants.VALID_YES,null));
}else{ }else{
@@ -404,7 +417,7 @@ public class ConfigSynchronizationService extends BaseService{
BeanUtils.copyProperties(cfg, maatCfg); BeanUtils.copyProperties(cfg, maatCfg);
maatCfg.setAction(cfg.getAction()); maatCfg.setAction(cfg.getAction());
maatCfg.setAuditTime(cfg.getAuditTime()); maatCfg.setAuditTime(StringUtil.isEmpty(cfg.getAuditTime()) ? new Date():cfg.getAuditTime());
maatCfg.setIpRegionList(ipRegionList); maatCfg.setIpRegionList(ipRegionList);
maatCfg.setStrRegionList(strRegionList); maatCfg.setStrRegionList(strRegionList);
maatCfg.setNumRegionList(numRegionList); maatCfg.setNumRegionList(numRegionList);
@@ -412,7 +425,8 @@ public class ConfigSynchronizationService extends BaseService{
maatCfg.setGroupRelationList(groupRelationList); maatCfg.setGroupRelationList(groupRelationList);
maatCfg.setGroupNum(groupRelationList.size()); maatCfg.setGroupNum(groupRelationList.size());
maatCfg.setAreaIpRegionList(areaIpRegionList); maatCfg.setAreaIpRegionList(areaIpRegionList);
maatCfg.setIsValid(cfg.getIsValid()); maatCfg.setIsValid(entity.getIsValid());
maatCfg.setAuditTime(new Date());
if(!StringUtil.isEmpty(userRegion)){ if(!StringUtil.isEmpty(userRegion)){
maatCfg.setUserRegion(userRegion); maatCfg.setUserRegion(userRegion);
} }
@@ -424,6 +438,7 @@ public class ConfigSynchronizationService extends BaseService{
} }
if(!StringUtil.isEmpty(configCompileList.size())){ if(!StringUtil.isEmpty(configCompileList.size())){
maatBean.setConfigCompileList(configCompileList); maatBean.setConfigCompileList(configCompileList);
maatBean.setAuditTime(new Date());
maatBean.setCreatorName(UserUtils.getUser().getName()); maatBean.setCreatorName(UserUtils.getUser().getName());
maatBean.setVersion(Constants.MAAT_VERSION); maatBean.setVersion(Constants.MAAT_VERSION);
maatBean.setOpAction(Constants.INSERT_ACTION); maatBean.setOpAction(Constants.INSERT_ACTION);
@@ -517,6 +532,8 @@ public class ConfigSynchronizationService extends BaseService{
DdosIpCfg cfg=list.get(i); DdosIpCfg cfg=list.get(i);
cfg.setRegionId(regionIds.get(i)); cfg.setRegionId(regionIds.get(i));
cfg.setGroupId(groupIds.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 = new MaatCfg();
maatCfg.initDefaultValue(); maatCfg.initDefaultValue();
groupRelationList = new ArrayList(); groupRelationList = new ArrayList();
@@ -569,7 +586,7 @@ public class ConfigSynchronizationService extends BaseService{
} }
BeanUtils.copyProperties(cfg, maatCfg); BeanUtils.copyProperties(cfg, maatCfg);
maatCfg.setAction(cfg.getAction()); maatCfg.setAction(cfg.getAction());
maatCfg.setAuditTime(cfg.getAuditTime()); maatCfg.setAuditTime(StringUtil.isEmpty(cfg.getAuditTime()) ? new Date():cfg.getAuditTime());
maatCfg.setIpRegionList(ipRegionList); maatCfg.setIpRegionList(ipRegionList);
maatCfg.setStrRegionList(strRegionList); maatCfg.setStrRegionList(strRegionList);
maatCfg.setNumRegionList(numRegionList); maatCfg.setNumRegionList(numRegionList);
@@ -577,7 +594,7 @@ public class ConfigSynchronizationService extends BaseService{
maatCfg.setGroupRelationList(groupRelationList); maatCfg.setGroupRelationList(groupRelationList);
maatCfg.setGroupNum(groupRelationList.size()); maatCfg.setGroupNum(groupRelationList.size());
maatCfg.setAreaIpRegionList(areaIpRegionList); maatCfg.setAreaIpRegionList(areaIpRegionList);
maatCfg.setIsValid(cfg.getIsValid()); maatCfg.setIsValid(entity.getIsValid());
if(!StringUtil.isEmpty(userRegion)){ if(!StringUtil.isEmpty(userRegion)){
maatCfg.setUserRegion(userRegion); maatCfg.setUserRegion(userRegion);
} }