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

修改关注网站配置导入 主题、网站大小写不敏感；修改App Ip配置导入模板

Browse Source 
Conflicts:
	src/main/java/com/nis/web/controller/BaseController.java
This commit is contained in:
zhangwenqing
2019-01-21 15:47:32 +08:00
committed by wangxin
parent 4ed438f8aa
commit e412d22569
5 changed files with 79 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/main/java/com/nis/util/excel/thread/CheckTopicWebsiteFormatThread.java
View File

@@ -3,12 +3,14 @@ package com.nis.util.excel.thread;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.Callable;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.commons.collections.map.CaseInsensitiveMap;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.jets3t.service.ServiceException;
@@ -20,6 +22,7 @@ import com.nis.domain.FunctionServiceDict;
import com.nis.domain.configuration.AppTopicDomainCfg;
import com.nis.domain.configuration.WebsiteDomainTopic;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.web.security.UserUtils;
import com.nis.web.service.SpringContextHolder;
import com.nis.web.service.configuration.AppCfgService;
@@ -99,16 +102,36 @@ public class CheckTopicWebsiteFormatThread implements Callable<String>{
}
if (regionDict.getRegionType().equals(2)) {
// 主题、网站校验
Long topicId = baseStringCfg.getTopicId();
Long websiteServiceId = baseStringCfg.getWebsiteServiceId();
if (topicId == null) {
errInfo.append(prop.getProperty("topic") +" "+ prop.getProperty("not_exist") + ";");
// 主题、网站验证
String topic = baseStringCfg.getTopic();
String websiteService = baseStringCfg.getWebsiteService();
if(StringUtils.isBlank(topic)) {
errInfo.append(
String.format(prop.getProperty("can_not_null"), prop.getProperty("topic") + " ") + ";");
}else {
Map<String, String> dictMap = DictUtils.getDictOptionInReversion("TOPIC");
CaseInsensitiveMap topicDictMap = new CaseInsensitiveMap(dictMap);
String topicDictCode = (String)topicDictMap.get(topic);
if(StringUtils.isBlank(topicDictCode)) {
errInfo.append(prop.getProperty("topic") +" "+ prop.getProperty("not_exist") + ";");
}else {
baseStringCfg.setTopicId(Long.parseLong(topicDictCode));
}
}
if (websiteServiceId == null) {
errInfo.append(prop.getProperty("website_server") +" "+ prop.getProperty("not_exist") + ";");
if(StringUtils.isBlank(websiteService)) {
errInfo.append(
String.format(prop.getProperty("can_not_null"), prop.getProperty("website_server") + " ") + ";");
}else {
Map<String, String> dictMap = DictUtils.getDictOptionInReversion("WEBSITE_SERVER");
CaseInsensitiveMap websiteDictMap = new CaseInsensitiveMap(dictMap);
String websiteServiceDictCode = (String)websiteDictMap.get(websiteService);
if(StringUtils.isBlank(websiteServiceDictCode)) {
errInfo.append(prop.getProperty("website_server") +" "+ prop.getProperty("not_exist") + ";");
}else {
baseStringCfg.setWebsiteServiceId(Long.parseLong(websiteServiceDictCode));
}
}
String keyword = baseStringCfg.getCfgKeywords();