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

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Browse Source 
Conflicts:
	src/main/resources/sql/function_region_dict_add_colunm.sql
	所有配置界面修改为使用region表动态属性值
This commit is contained in:
duandongmei
2018-08-19 15:55:27 +08:00
parent 8c7e1d088d 8db613d464
commit 45556b7e05
27 changed files with 1118 additions and 607 deletions
Download Patch File Download Diff File Expand all files Collapse all files

177
src/main/java/com/nis/util/CodeDicUtils.java
View File

@@ -51,105 +51,126 @@ public class CodeDicUtils {
// }
// putCache(CACHE_MENU_LIST, menuList);
// }
//注释码表获取缓存，增加修改清除缓存功能后可以添加缓存
List<CodeResult> result = new ArrayList<>();
if (name.equals(APP_CODE)) {
List<CodeAppDic> codeDicList = (List<CodeAppDic>) CacheUtils.get(APP_CODE);
if(StringUtil.isEmpty(codeDicList)){
codeDicList = codeAppDicDao.getCodeDicList();
CacheUtils.put(APP_CODE,codeDicList);
}
for (int i = 0; i < codeDicList.size(); i++) {
CodeResult codeResult = new CodeResult();
codeResult.setItem(codeDicList.get(i).getAppName());
codeResult.setCode(codeDicList.get(i).getViewCode());
codeResult.setCoreApp(codeDicList.get(i).getCoreApp());
result.add(codeResult);
// List<CodeAppDic> codeDicList = (List<CodeAppDic>) CacheUtils.get(APP_CODE);
List<CodeAppDic> codeDicList = codeAppDicDao.getCodeDicList();
// if(StringUtil.isEmpty(codeDicList)){
// codeDicList = codeAppDicDao.getCodeDicList();
// CacheUtils.put(APP_CODE,codeDicList);
// }
if(codeDicList!=null&&codeDicList.size()>0){
for (int i = 0; i < codeDicList.size(); i++) {
CodeResult codeResult = new CodeResult();
codeResult.setItem(codeDicList.get(i).getAppName());
codeResult.setCode(codeDicList.get(i).getViewCode());
codeResult.setCoreApp(codeDicList.get(i).getCoreApp());
result.add(codeResult);
}
}
return result;
} else if (name.equals(BEHAVIOR_CODE)) {
List<CodeBehaviorTypeDic> codeDicList = (List<CodeBehaviorTypeDic>) CacheUtils.get(BEHAVIOR_CODE);
if(StringUtil.isEmpty(codeDicList)){
codeDicList = codeBehaviorTypeDicDao.getCodeDicList();
CacheUtils.put(BEHAVIOR_CODE,codeDicList);
}
for (int i = 0; i < codeDicList.size(); i++) {
CodeResult codeResult = new CodeResult();
codeResult.setItem(codeDicList.get(i).getBehaviorType());
codeResult.setCode(codeDicList.get(i).getViewCode());
result.add(codeResult);
// List<CodeBehaviorTypeDic> codeDicList = (List<CodeBehaviorTypeDic>) CacheUtils.get(BEHAVIOR_CODE);
// if(StringUtil.isEmpty(codeDicList)){
// codeDicList = codeBehaviorTypeDicDao.getCodeDicList();
// CacheUtils.put(BEHAVIOR_CODE,codeDicList);
// }
List<CodeBehaviorTypeDic> codeDicList = codeBehaviorTypeDicDao.getCodeDicList();
if(codeDicList!=null&&codeDicList.size()>0){
for (int i = 0; i < codeDicList.size(); i++) {
CodeResult codeResult = new CodeResult();
codeResult.setItem(codeDicList.get(i).getBehaviorType());
codeResult.setCode(codeDicList.get(i).getViewCode());
result.add(codeResult);
}
}
return result;
} else if (name.equals(BROWSER_CODE)) {
List<CodeBrowserTypeDic> codeDicList = (List<CodeBrowserTypeDic>) CacheUtils.get(BROWSER_CODE);
if(StringUtil.isEmpty(codeDicList)){
codeDicList = codeBrowserTypeDicDao.getCodeDicList();
CacheUtils.put(BROWSER_CODE, codeDicList);
}
for (int i = 0; i < codeDicList.size(); i++) {
CodeResult codeResult = new CodeResult();
codeResult.setItem(codeDicList.get(i).getBrowserType());
codeResult.setCode(codeDicList.get(i).getViewCode());
result.add(codeResult);
// List<CodeBrowserTypeDic> codeDicList = (List<CodeBrowserTypeDic>) CacheUtils.get(BROWSER_CODE);
// if(StringUtil.isEmpty(codeDicList)){
// codeDicList = codeBrowserTypeDicDao.getCodeDicList();
// CacheUtils.put(BROWSER_CODE, codeDicList);
// }
List<CodeBrowserTypeDic> codeDicList = codeBrowserTypeDicDao.getCodeDicList();
if(codeDicList!=null&&codeDicList.size()>0){
for (int i = 0; i < codeDicList.size(); i++) {
CodeResult codeResult = new CodeResult();
codeResult.setItem(codeDicList.get(i).getBrowserType());
codeResult.setCode(codeDicList.get(i).getViewCode());
result.add(codeResult);
}
}
return result;
} else if (name.equals(OS_CODE)) {
List<CodeOsTypeDic> codeDicList = (List<CodeOsTypeDic>) CacheUtils.get(OS_CODE);
if(StringUtil.isEmpty(codeDicList)){
codeDicList = codeOsTypeDicDao.getCodeDicList();
CacheUtils.put(OS_CODE, codeDicList);
}
for (int i = 0; i < codeDicList.size(); i++) {
CodeResult codeResult = new CodeResult();
codeResult.setItem(codeDicList.get(i).getOsType());
codeResult.setCode(codeDicList.get(i).getViewCode());
result.add(codeResult);
// List<CodeOsTypeDic> codeDicList = (List<CodeOsTypeDic>) CacheUtils.get(OS_CODE);
// if(StringUtil.isEmpty(codeDicList)){
// codeDicList = codeOsTypeDicDao.getCodeDicList();
// CacheUtils.put(OS_CODE, codeDicList);
// }
List<CodeOsTypeDic> codeDicList = codeOsTypeDicDao.getCodeDicList();
if(codeDicList!=null&&codeDicList.size()>0){
for (int i = 0; i < codeDicList.size(); i++) {
CodeResult codeResult = new CodeResult();
codeResult.setItem(codeDicList.get(i).getOsType());
codeResult.setCode(codeDicList.get(i).getViewCode());
result.add(codeResult);
}
}
return result;
} else if (name.equals(PROTOCOL_CODE)) {
List<CodeProtocolTypeDic> codeDicList = (List<CodeProtocolTypeDic>) CacheUtils.get(PROTOCOL_CODE);
if(StringUtil.isEmpty(codeDicList)){
codeDicList = codeProtocolTypeDicDao.getCodeDicList();
CacheUtils.put(PROTOCOL_CODE, codeDicList);
}
for (int i = 0; i < codeDicList.size(); i++) {
CodeResult codeResult = new CodeResult();
codeResult.setItem(codeDicList.get(i).getProtocolType());
codeResult.setCode(codeDicList.get(i).getViewCode());
result.add(codeResult);
// List<CodeProtocolTypeDic> codeDicList = (List<CodeProtocolTypeDic>) CacheUtils.get(PROTOCOL_CODE);
// if(StringUtil.isEmpty(codeDicList)){
// codeDicList = codeProtocolTypeDicDao.getCodeDicList();
// CacheUtils.put(PROTOCOL_CODE, codeDicList);
// }
List<CodeProtocolTypeDic> codeDicList = codeProtocolTypeDicDao.getCodeDicList();
if(codeDicList!=null&&codeDicList.size()>0){
for (int i = 0; i < codeDicList.size(); i++) {
CodeResult codeResult = new CodeResult();
codeResult.setItem(codeDicList.get(i).getProtocolType());
codeResult.setCode(codeDicList.get(i).getViewCode());
result.add(codeResult);
}
}
return result;
} else if (name.equals(SERVICE_CODE)) {
List<CodeServiceTypeDic> codeDicList = (List<CodeServiceTypeDic>) CacheUtils.get(SERVICE_CODE);
if(StringUtil.isEmpty(codeDicList)){
codeDicList = codeServiceTypeDicDao.getCodeDicList();
CacheUtils.put(SERVICE_CODE, codeDicList);
}
for (int i = 0; i < codeDicList.size(); i++) {
CodeResult codeResult = new CodeResult();
codeResult.setItem(codeDicList.get(i).getServiceType());
codeResult.setCode(codeDicList.get(i).getViewCode());
result.add(codeResult);
// List<CodeServiceTypeDic> codeDicList = (List<CodeServiceTypeDic>) CacheUtils.get(SERVICE_CODE);
// if(StringUtil.isEmpty(codeDicList)){
// codeDicList = codeServiceTypeDicDao.getCodeDicList();
// CacheUtils.put(SERVICE_CODE, codeDicList);
// }
List<CodeServiceTypeDic> codeDicList = codeServiceTypeDicDao.getCodeDicList();
if(codeDicList!=null&&codeDicList.size()>0){
for (int i = 0; i < codeDicList.size(); i++) {
CodeResult codeResult = new CodeResult();
codeResult.setItem(codeDicList.get(i).getServiceType());
codeResult.setCode(codeDicList.get(i).getViewCode());
result.add(codeResult);
}
}
return result;
} else if (name.equals(WEB_CODE)) {
List<CodeWebServiceDic> codeDicList = (List<CodeWebServiceDic>) CacheUtils.get(WEB_CODE);
if(StringUtil.isEmpty(codeDicList)){
codeDicList = codeWebServiceDicDao.getCodeDicList();
CacheUtils.put(WEB_CODE, codeDicList);
}
for (int i = 0; i < codeDicList.size(); i++) {
CodeResult codeResult = new CodeResult();
codeResult.setItem(codeDicList.get(i).getWebsite());
codeResult.setCode(codeDicList.get(i).getViewCode());
result.add(codeResult);
// List<CodeWebServiceDic> codeDicList = (List<CodeWebServiceDic>) CacheUtils.get(WEB_CODE);
// if(StringUtil.isEmpty(codeDicList)){
// codeDicList = codeWebServiceDicDao.getCodeDicList();
// CacheUtils.put(WEB_CODE, codeDicList);
// }
List<CodeWebServiceDic> codeDicList = codeWebServiceDicDao.getCodeDicList();
if(codeDicList!=null&&codeDicList.size()>0){
for (int i = 0; i < codeDicList.size(); i++) {
CodeResult codeResult = new CodeResult();
codeResult.setItem(codeDicList.get(i).getWebsite());
codeResult.setCode(codeDicList.get(i).getViewCode());
result.add(codeResult);
}
}
return result;
}

3
src/main/java/com/nis/web/dao/FunctionRegionDictDao.xml
View File

@@ -15,11 +15,12 @@
<result column="config_hex" property="configHex" jdbcType="VARCHAR" />
<result column="config_expr_type" property="configExprType" jdbcType="VARCHAR" />
<result column="config_match_method" property="configMatchMethod" jdbcType="VARCHAR" />
<result column="config_service_type" property="configServiceType" jdbcType="VARCHAR" />
</resultMap>
<sql id="Base_Column_List" >
dict_id, function_id, config_region_value,config_region_code, config_district, config_desc, is_valid,is_maat,region_type
,config_multi_keywords,config_hex,config_expr_type,config_match_method
,config_multi_keywords,config_hex,config_expr_type,config_match_method,config_service_type
</sql>
<select id="getList" resultMap="BaseResultMap" >
select