1、增加SubscribeId分组配置功能 2、增加公共分组相关国际化代码及相关sql文件修改

This commit is contained in:
zhangwenqing
2019-06-10 18:31:52 +08:00
parent 66b3673bce
commit bf03ca1cc0
59 changed files with 4394 additions and 257 deletions

View File

@@ -14,12 +14,14 @@ 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.CommonGroupInfo;
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.CommonGroupManageDao;
import com.nis.web.dao.basics.PolicyGroupInfoDao;
import com.nis.web.dao.basics.SysDictInfoDao;
import com.nis.web.dao.configuration.DnsResStrategyDao;
@@ -42,6 +44,7 @@ public class DictUtils {
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);
private final static CommonGroupManageDao commonGroupManageDao = SpringContextHolder.getBean(CommonGroupManageDao.class);
public static Map<String, List<SysDataDictionaryItem>> getDictData() {
@@ -401,4 +404,38 @@ public class DictUtils {
}
return null;
}
/**
* 获取公共组字典缓存
*/
public static List<CommonGroupInfo> getCommonGroups(Integer groupType){
String dictKey = Constants.CACHE_IPGROUP_DICT;
if(groupType.equals(7)) {
dictKey = Constants.CACHE_URLGROUP_DICT;
}else if(groupType.equals(8)) {
dictKey = Constants.CACHE_DOMAINGROUP_DICT;
}else if(groupType.equals(9)) {
dictKey = Constants.CACHE_SCRIBERGROUP_DICT;
}
List<CommonGroupInfo> allDictList = (List<CommonGroupInfo>)CacheUtils.get(dictKey);
if(StringUtil.isEmpty(allDictList)){
allDictList = commonGroupManageDao.findCommonGroupInfosByType(groupType);
CacheUtils.put(dictKey, allDictList);
}
return allDictList;
}
public static CommonGroupInfo getCommonGroups(Integer groupId, Integer groupType){
List<CommonGroupInfo> allDictList = getCommonGroups(groupType);
if(StringUtil.isEmpty(allDictList)){
}else {
for(CommonGroupInfo group:allDictList) {
if(group.getServiceGroupId().equals(groupId)) {
return group;
}
}
}
return null;
}
}