diff --git a/src/main/java/com/nis/domain/configuration/AppTopicDomainCfg.java b/src/main/java/com/nis/domain/configuration/AppTopicDomainCfg.java index 6b8fb6523..add066cd4 100644 --- a/src/main/java/com/nis/domain/configuration/AppTopicDomainCfg.java +++ b/src/main/java/com/nis/domain/configuration/AppTopicDomainCfg.java @@ -39,6 +39,9 @@ public class AppTopicDomainCfg extends BaseCfg { @ExcelField(title="topic",dictType="TOPIC",sort=2) private Long topicId; + private String topic; + private String websiteService; + /** * 表达式类型 */ @@ -180,4 +183,20 @@ public class AppTopicDomainCfg extends BaseCfg { this.websiteServiceId = websiteServiceId; } + public String getTopic() { + return topic; + } + + public void setTopic(String topic) { + this.topic = topic; + } + + public String getWebsiteService() { + return websiteService; + } + + public void setWebsiteService(String websiteService) { + this.websiteService = websiteService; + } + } diff --git a/src/main/java/com/nis/domain/configuration/template/TopicWebsiteTemplate.java b/src/main/java/com/nis/domain/configuration/template/TopicWebsiteTemplate.java index c738de66e..0a8e71344 100644 --- a/src/main/java/com/nis/domain/configuration/template/TopicWebsiteTemplate.java +++ b/src/main/java/com/nis/domain/configuration/template/TopicWebsiteTemplate.java @@ -9,26 +9,10 @@ import com.nis.util.excel.ExcelField; */ public class TopicWebsiteTemplate extends StringAllNotDoLogTemplate{ - private Long topicId; // 主题 - private Long websiteServiceId; // 网站 + private String topic; // 主题 + private String websiteService; // 网站 private String cfgKeywords; // 域名 - @ExcelField(title="topic",dictType="TOPIC",sort=2) - public Long getTopicId() { - return topicId; - } - public void setTopicId(Long topicId) { - this.topicId = topicId; - } - - @ExcelField(title="website_server",dictType="WEBSITE_SERVER",sort=3) - public Long getWebsiteServiceId() { - return websiteServiceId; - } - public void setWebsiteServiceId(Long websiteServiceId) { - this.websiteServiceId = websiteServiceId; - } - @ExcelField(title="domain_name",sort=4) public String getCfgKeywords() { return cfgKeywords; @@ -36,5 +20,21 @@ public class TopicWebsiteTemplate extends StringAllNotDoLogTemplate{ public void setCfgKeywords(String cfgKeywords) { this.cfgKeywords = cfgKeywords; } + + @ExcelField(title="topic",sort=2) + public String getTopic() { + return topic; + } + public void setTopic(String topic) { + this.topic = topic; + } + + @ExcelField(title="website_server",sort=3) + public String getWebsiteService() { + return websiteService; + } + public void setWebsiteService(String websiteService) { + this.websiteService = websiteService; + } } diff --git a/src/main/java/com/nis/util/excel/thread/CheckTopicWebsiteFormatThread.java b/src/main/java/com/nis/util/excel/thread/CheckTopicWebsiteFormatThread.java index 13dad284a..34b8165a6 100644 --- a/src/main/java/com/nis/util/excel/thread/CheckTopicWebsiteFormatThread.java +++ b/src/main/java/com/nis/util/excel/thread/CheckTopicWebsiteFormatThread.java @@ -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{ } 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 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 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(); diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index ac186ccd0..f0ab92c1c 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -1437,6 +1437,9 @@ public class BaseController { }else if(regionDict.getFunctionId().equals(214)) { // IpSpoofing BlockingQueue list = ei.getDataList(IpSpoofingTemplate.class ); ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict,null,asnGroupInfos, list); + }else if(regionDict.getFunctionId().equals(405)) { // APP IP + BlockingQueue list = ei.getDataList(IpAllNotDoLogTemplate.class ); + ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict,null,asnGroupInfos, list); }else { BlockingQueue list = ei.getDataList(IpAllTemplate.class ); ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict, null,asnGroupInfos, list); @@ -2376,7 +2379,9 @@ public class BaseController { ei.loadInitParams(IpWhitelistTemplate.class, msgProp, regionDict, serviceDict); } else if(regionDict.getFunctionId().equals(214)) { // IpSpoofing ei.loadInitParams(IpSpoofingTemplate.class, msgProp, regionDict, serviceDict); - } else { + } else if(regionDict.getFunctionId().equals(405)) { // APP IP + ei.loadInitParams(IpAllNotDoLogTemplate.class, msgProp, regionDict, serviceDict); + } else { ei.loadInitParams(IpAllTemplate.class, msgProp, regionDict, serviceDict); } } else if (regionDict.getRegionType().equals(2)) {// 字符串类 diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java b/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java index 364f2b472..ffa9f17c5 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java @@ -423,6 +423,11 @@ public class IpController extends BaseController{ ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, IpSpoofingTemplate.class, 2); excel.setDataList(pro,classList,null). write(request,response, fileName).dispose(); + }else if(regionDict.getFunctionId().equals(405)) { // APP IP + List classList=new ArrayList(); + ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, IpAllNotDoLogTemplate.class, 2); + excel.setDataList(pro,classList,null). + write(request,response, fileName).dispose(); }else{ List classList=new ArrayList(); ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, IpAllTemplate.class, 2);