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

线程类增加异常捕获，日志记录

Browse Source
This commit is contained in:
wangxin
2019-07-25 09:07:46 +08:00
parent 7afa89951c
commit 0c639a2d30
1 changed files with 70 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

134
src/main/java/com/nis/web/service/configuration/ObjGroupCfgConvert.java
View File

@@ -7,6 +7,7 @@ import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.maat.MaatCfg; import com.nis.domain.maat.MaatCfg;
import com.nis.util.ConfigConvertUtil; import com.nis.util.ConfigConvertUtil;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.log4j.Logger;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import java.util.Date; import java.util.Date;
@@ -15,6 +16,7 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
public class ObjGroupCfgConvert implements Runnable{ public class ObjGroupCfgConvert implements Runnable{
private static final Logger logger= Logger.getLogger(ObjGroupCfgConvert.class);
private CfgIndexInfo cfgIndexInfo; private CfgIndexInfo cfgIndexInfo;
private Integer isAudit; private Integer isAudit;
private Map<Integer, FunctionServiceDict> serviceDictMap; private Map<Integer, FunctionServiceDict> serviceDictMap;
@@ -37,75 +39,79 @@ public class ObjGroupCfgConvert implements Runnable{
} }
@Override @Override
public void run() { public void run() {
//IP公共分组 try{
if("ipGroup".equalsIgnoreCase(groupName)&& CollectionUtils.isNotEmpty(cfgIndexInfo.getIpCommGroupCfgList())){ //IP公共分组
IpPortCfg cfg = new IpPortCfg(); if("ipGroup".equalsIgnoreCase(groupName)&& CollectionUtils.isNotEmpty(cfgIndexInfo.getIpCommGroupCfgList())){
BeanUtils.copyProperties(cfgIndexInfo, cfg, new String[]{"cfgId","menuNameCode"}); IpPortCfg cfg = new IpPortCfg();
if(isValid!=null){ BeanUtils.copyProperties(cfgIndexInfo, cfg, new String[]{"cfgId","menuNameCode"});
cfg.setIsValid(isValid); if(isValid!=null){
} cfg.setIsValid(isValid);
cfg.setIsAudit(isAudit); }
if(auditTime!=null){ cfg.setIsAudit(isAudit);
cfg.setAuditTime(auditTime); if(auditTime!=null){
} cfg.setAuditTime(auditTime);
if(isAudit==1){ }
Map<String,List> map = ConfigConvertUtil.objGroupCfgConvert(serviceDictMap,ipRegionList,cfgIndexInfo.getIpCommGroupCfgList(),1,cfg,groupRelationList,maatTableMap,groupIdSet); if(isAudit==1){
groupRelationList=map.get("groupList"); Map<String,List> map = ConfigConvertUtil.objGroupCfgConvert(serviceDictMap,ipRegionList,cfgIndexInfo.getIpCommGroupCfgList(),1,cfg,groupRelationList,maatTableMap,groupIdSet);
ipRegionList=map.get("dstList"); groupRelationList=map.get("groupList");
if(map.get("numRegionList")!=null){ ipRegionList=map.get("dstList");
numRegionList.addAll(map.get("numRegionList")); if(map.get("numRegionList")!=null){
numRegionList.addAll(map.get("numRegionList"));
}
} }
} }
} if("urlGroup".equalsIgnoreCase(groupName)&&CollectionUtils.isNotEmpty(cfgIndexInfo.getUrlCommGroupList())){
if("urlGroup".equalsIgnoreCase(groupName)&&CollectionUtils.isNotEmpty(cfgIndexInfo.getUrlCommGroupList())){ CommonStringCfg cfg = new CommonStringCfg();
CommonStringCfg cfg = new CommonStringCfg(); BeanUtils.copyProperties(cfgIndexInfo, cfg, new String[]{"cfgId","menuNameCode"});
BeanUtils.copyProperties(cfgIndexInfo, cfg, new String[]{"cfgId","menuNameCode"}); if(isValid!=null){
if(isValid!=null){ cfg.setIsValid(isValid);
cfg.setIsValid(isValid); }
cfg.setIsAudit(isAudit);
if(auditTime!=null){
cfg.setAuditTime(auditTime);
}
if(isAudit==1){
Map<String,List> 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){ if("subscribeIdGroup".equalsIgnoreCase(groupName)&&CollectionUtils.isNotEmpty(cfgIndexInfo.getScriberIdCommGroupList())){
cfg.setAuditTime(auditTime); 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<String,List> map =ConfigConvertUtil.objGroupCfgConvert(serviceDictMap,strRegionList,cfgIndexInfo.getScriberIdCommGroupList(),2,cfg,groupRelationList,maatTableMap,groupIdSet);
groupRelationList=map.get("groupList");
strRegionList=map.get("dstList");
}
} }
if(isAudit==1){ //域名公共分组
Map<String,List> map =ConfigConvertUtil.objGroupCfgConvert(serviceDictMap,strRegionList,cfgIndexInfo.getUrlCommGroupList(),2,cfg,groupRelationList,maatTableMap,groupIdSet); if("domainGroup".equalsIgnoreCase(groupName)&&CollectionUtils.isNotEmpty(cfgIndexInfo.getDomainCommGroupList())){
groupRelationList=map.get("groupList"); CommonStringCfg cfg = new CommonStringCfg();
strRegionList=map.get("dstList"); BeanUtils.copyProperties(cfgIndexInfo, cfg, new String[]{"cfgId","menuNameCode"});
} if(isValid!=null){
} cfg.setIsValid(isValid);
//账号公共分组 }
if("subscribeIdGroup".equalsIgnoreCase(groupName)&&CollectionUtils.isNotEmpty(cfgIndexInfo.getScriberIdCommGroupList())){ cfg.setIsAudit(isAudit);
CommonStringCfg cfg = new CommonStringCfg(); if(auditTime!=null){
BeanUtils.copyProperties(cfgIndexInfo, cfg, new String[]{"cfgId","menuNameCode"}); cfg.setAuditTime(auditTime);
if(isValid!=null){ }
cfg.setIsValid(isValid); if(isAudit==1){
} Map<String,List> map =ConfigConvertUtil.objGroupCfgConvert(serviceDictMap,strRegionList,cfgIndexInfo.getDomainCommGroupList(),2,cfg,groupRelationList,maatTableMap,groupIdSet);
cfg.setIsAudit(isAudit); groupRelationList=map.get("groupList");
if(auditTime!=null){ strRegionList=map.get("dstList");
cfg.setAuditTime(auditTime); }
}
if(isAudit==1){
Map<String,List> 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<String,List> 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);
} }
} }