1:新增webFocusDb业务

2:修改编译配置对doblacklist,exprType的校验值
3:新增从clickhouse查询流量统计的controller,service,dao等
4:新增对maat类配置支持停启用

src/main/java/com/nis/domain/restful/ConfigCompileStartStop.java

@@ -0,0 +1,89 @@
+/**   
+* @Title: DfConfigCompile.java 
+* @Package com.nis.domain.restful 
+* @Description: TODO(用一句话描述该文件做什么) 
+* @author （darnell）  
+* @date 2016年8月29日 下午9:36:28 
+* @version V1.0   
+*/
+package com.nis.domain.restful;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.nis.util.JsonDateDeserializer;
+import com.wordnik.swagger.annotations.ApiModelProperty;
+
+/**
+ * @ClassName: ConfigCompileStartStop
+ * @Description: TODO(这里用一句话描述这个类的作用)
+ * @author (rkg)
+ * @date 2018年12月22日 下午4:36:28
+ * @version V1.0
+ */
+public class ConfigCompileStartStop implements Serializable {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 546753235262247839L;
+	@ApiModelProperty(value = "配置ID", required = true)
+	private Long compileId;
+	@ApiModelProperty(value = "有效标志", required = true)
+	private Integer isValid;
+	@ApiModelProperty(value = "业务类型", required = true)
+	private Integer service;
+	@ApiModelProperty(value = "操作时间", required = true)
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date opTime;
+
+	public Long getCompileId() {
+		return compileId;
+	}
+
+	public void setCompileId(Long compileId) {
+		this.compileId = compileId;
+	}
+
+	/**
+	 * @return isValid
+	 */
+	public Integer getIsValid() {
+		return isValid;
+	}
+
+	/**
+	 * @param isValid 要设置的 isValid
+	 */
+	public void setIsValid(Integer isValid) {
+		this.isValid = isValid;
+	}
+	
+	
+	public Integer getService() {
+		return service;
+	}
+
+	public void setService(Integer service) {
+		this.service = service;
+	}
+
+	/**
+	 * @return opTime
+	 */
+	@JsonDeserialize(using = JsonDateDeserializer.class)
+	public Date getOpTime() {
+		return opTime;
+	}
+
+	/**
+	 * @param opTime 要设置的 opTime
+	 */
+	@JsonDeserialize(using = JsonDateDeserializer.class)
+	public void setOpTime(Date opTime) {
+		this.opTime = opTime;
+	}
+
+}

src/main/java/com/nis/domain/restful/ConfigSourceStartStop.java

@@ -0,0 +1,114 @@
+/**   
+* @Title: ConfigSource.java 
+* @Package com.nis.domain.restful 
+* @Description: TODO(用一句话描述该文件做什么) 
+* @author （darnell）  
+* @date 2016年8月29日 下午9:31:24 
+* @version V1.0   
+*/
+package com.nis.domain.restful;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.nis.util.JsonDateDeserializer;
+import com.nis.util.JsonDateSerializer;
+
+/**
+ * @ClassName: ConfigSourceStartStop
+ * @Description: TODO(这里用一句话描述这个类的作用)
+ * @author (darnell)
+ * @date 2016年8月31日 下午8:32:43
+ * @version V1.0
+ */
+public class ConfigSourceStartStop extends ConfigCommonSource {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	private static final String DEFAULT_VERSION = "2.0";
+	private List<ConfigCompile> configCompileStartStopList; // 编译配置列表
+
+	/**
+	 * @Title:
+	 * @Description: TODO
+	 * @param
+	 */
+	public ConfigSourceStartStop() {
+		this.version = DEFAULT_VERSION;
+	}
+
+	public ConfigSourceStartStop(String Version) {
+		this.version = Version;
+	}
+
+	/**
+	 * @return version
+	 */
+	public String getVersion() {
+		return version;
+	}
+
+	/**
+	 * @param version 要设置的 version
+	 */
+	public void setVersion(String version) {
+		this.version = version;
+	}
+
+	/**
+	 * @return operator
+	 */
+	public String getOperator() {
+		return operator;
+	}
+
+	/**
+	 * @param operator 要设置的 operator
+	 */
+	public void setOperator(String operator) {
+		this.operator = operator;
+	}
+
+	/**
+	 * @return opTime
+	 */
+	@JsonSerialize(using = JsonDateSerializer.class)
+	public Date getOpTime() {
+		return opTime;
+	}
+
+	/**
+	 * @param opTime 要设置的 opTime
+	 */
+	@JsonDeserialize(using = JsonDateDeserializer.class)
+	public void setOpTime(Date opTime) {
+		this.opTime = opTime;
+	}
+
+	/**
+	 * @return opAction
+	 */
+	public Integer getOpAction() {
+		return opAction;
+	}
+
+	/**
+	 * @param opAction 要设置的 opAction
+	 */
+	public void setOpAction(Integer opAction) {
+		this.opAction = opAction;
+	}
+
+	public List<ConfigCompile> getConfigCompileStartStopList() {
+		return configCompileStartStopList;
+	}
+
+	public void setConfigCompileStartStopList(List<ConfigCompile> configCompileStartStopList) {
+		this.configCompileStartStopList = configCompileStartStopList;
+	}
+
+}

src/main/java/com/nis/domain/restful/NtcRadiusReport.java

@@ -3,14 +3,17 @@ package com.nis.domain.restful;
 import java.io.Serializable;
 import java.util.Date;
 
+import javax.xml.bind.annotation.XmlTransient;
+
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.nis.domain.Page;
 import com.nis.util.JsonDateSerializer;
 import com.wordnik.swagger.annotations.ApiModelProperty;
 
-public class NtcRadiusReport implements Serializable{
+public class NtcRadiusReport<T>  implements Serializable{
 	
 	private static final long serialVersionUID = 7635016645942704971L;
 	@JsonInclude(value = Include.NON_NULL)
@@ -39,6 +42,9 @@ public class NtcRadiusReport implements Serializable{
 	protected String searchAccount;
 	protected String groupType;
 
+	
+	protected Page<T> page;
+	
 	public String getNasIp() {
 		return nasIp;
 	}
@@ -135,5 +141,18 @@ public class NtcRadiusReport implements Serializable{
 	public void setGroupType(String groupType) {
 		this.groupType = groupType;
 	}
+	
+	@JsonIgnore
+	@XmlTransient
+	public Page<T> getPage() {
+		if (page == null) {
+			page = new Page<T>();
+		}
+		return page;
+	}
 
+	public Page<T> setPage(Page<T> page) {
+		this.page = page;
+		return page;
+	}
 }

src/main/java/com/nis/domain/restful/TrafficNetflowPortInfo.java

@@ -15,6 +15,7 @@ public class TrafficNetflowPortInfo implements Serializable {
 	@JsonIgnore
 	private long stat_id;
 	private long port;
+	private long entranceId;
 	private String nodeName;
 	private String nodeIp;
 	private String portDesc;
@@ -44,6 +45,14 @@ public class TrafficNetflowPortInfo implements Serializable {
 	public void setPort(long port) {
 		this.port = port;
 	}
+	
+	public long getEntranceId() {
+		return entranceId;
+	}
+
+	public void setEntranceId(long entranceId) {
+		this.entranceId = entranceId;
+	}
 
 	public String getNodeName() {
 		return nodeName;