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

(1)导入验证修正bug,多线程引入service调用时发生异常，将service调用dns响应策略，dns组改为从缓存中获取

Browse Source 
(2)DNS IP导入改为批量导入
This commit is contained in:
wangxin
2018-11-16 17:06:36 +08:00
parent 19be05a25d
commit 0ece4f5729
8 changed files with 98 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/main/java/com/nis/util/DictUtils.java
View File

@@ -12,11 +12,15 @@ import com.nis.domain.FunctionRegionDict;
import com.nis.domain.FunctionServiceDict;
import com.nis.domain.SysDataDictionaryItem;
import com.nis.domain.SysDataDictionaryName;
import com.nis.domain.basics.PolicyGroupInfo;
import com.nis.domain.basics.SysDictInfo;
import com.nis.domain.configuration.DnsResStrategy;
import com.nis.web.dao.FunctionRegionDictDao;
import com.nis.web.dao.FunctionServiceDictDao;
import com.nis.web.dao.SysDictDao;
import com.nis.web.dao.basics.PolicyGroupInfoDao;
import com.nis.web.dao.basics.SysDictInfoDao;
import com.nis.web.dao.configuration.DnsResStrategyDao;
import com.nis.web.service.SpringContextHolder;
@@ -34,6 +38,8 @@ public class DictUtils {
private final static SysDictInfoDao sysDictInfoDao = SpringContextHolder.getBean(SysDictInfoDao.class);
private final static FunctionRegionDictDao functionRegionDictDao = SpringContextHolder.getBean(FunctionRegionDictDao.class);
private final static FunctionServiceDictDao functionServiceDictDao = SpringContextHolder.getBean(FunctionServiceDictDao.class);
private final static DnsResStrategyDao dnsResStrategyDao = SpringContextHolder.getBean(DnsResStrategyDao.class);
private final static PolicyGroupInfoDao policyGroupInfoDao = SpringContextHolder.getBean(PolicyGroupInfoDao.class);
public static Map<String, List<SysDataDictionaryItem>> getDictData() {
@@ -320,4 +326,47 @@ public class DictUtils {
return allDictList;
}
public static List<DnsResStrategy> getDnsResStrategyList(){
List<DnsResStrategy> allDictList = (List<DnsResStrategy>)CacheUtils.get(Constants.CACHE_DNSRESSTRATEGY_DICT);
if(StringUtil.isEmpty(allDictList)){
allDictList = dnsResStrategyDao.findList(null, Constants.VALID_YES, Constants.AUDIT_YES);
CacheUtils.put(Constants.CACHE_DNSRESSTRATEGY_DICT, allDictList);
}
return allDictList;
}
public static List<DnsResStrategy> getDnsResStrategyList(Long cfgId){
List<DnsResStrategy> dnsResStrategies=Lists.newArrayList();
List<DnsResStrategy> allDictList = getDnsResStrategyList();
if(StringUtil.isEmpty(allDictList)){
}else {
for(DnsResStrategy dnsResStrategy:allDictList) {
if(dnsResStrategy.getCfgId().longValue()==cfgId.longValue()) {
dnsResStrategies.add(dnsResStrategy);
}
}
}
return dnsResStrategies;
}
public static List<PolicyGroupInfo> getDnsGroups(){
List<PolicyGroupInfo> allDictList = (List<PolicyGroupInfo>)CacheUtils.get(Constants.CACHE_DNSGROUP_DICT);
if(StringUtil.isEmpty(allDictList)){
allDictList = policyGroupInfoDao.findPolicyGroupInfosByType(1);
CacheUtils.put(Constants.CACHE_DNSGROUP_DICT, allDictList);
}
return allDictList;
}
public static PolicyGroupInfo getDnsGroups(int groupId){
List<PolicyGroupInfo> allDictList = getDnsGroups();
if(StringUtil.isEmpty(allDictList)){
}else {
for(PolicyGroupInfo group:allDictList) {
if(group.getGroupId().intValue()==groupId) {
return group;
}
}
}
return null;
}
}