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

voip界面去掉无用的检索条件

Browse Source 
摘要文件类型增加音视频文件类
ip和http增加配置导出
This commit is contained in:
duandongmei
2018-10-15 10:14:01 +08:00
parent 4e98aa217f
commit 6880363d9a
26 changed files with 1981 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/main/java/com/nis/domain/configuration/BaseCfg.java
View File

@@ -36,19 +36,20 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
protected String showName;//表在界面上展示的名称
protected String seltype;//选中类型,页面搜索用
protected String tableName;
@ExcelField(title="userregion1")
@ExcelField(title="userregion1",sort=1001)
protected String userRegion1;
@ExcelField(title="userregion2")
@ExcelField(title="userregion2",sort=1002)
protected String userRegion2;
@ExcelField(title="userregion3")
@ExcelField(title="userregion3",sort=1003)
protected String userRegion3;
@ExcelField(title="userregion4")
@ExcelField(title="userregion4",sort=1004)
protected String userRegion4;
@ExcelField(title="userregion5")
@ExcelField(title="userregion5",sort=1005)
protected String userRegion5;
/**
* 编译id
*/
@ExcelField(title="cfg_id",sort=0)
protected Integer compileId ;
/**
* @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么）
@@ -64,25 +65,25 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
/**
* 配置描述
*/
@ExcelField(title="config_describe")
@ExcelField(title="config_describe",sort=1)
protected String cfgDesc;
/**
* GK类型
*/
@Expose
@ExcelField(title="action",dictType="SERVICE_ACTION")
@ExcelField(title="action",dictType="SERVICE_ACTION",sort=2)
protected Integer action;
/**
* 有效标识
*/
@ExcelField(title="valid_identifier",dictType="VALID_IDENTIFIER")
@ExcelField(title="valid_identifier",dictType="VALID_IDENTIFIER",sort=9)
@Expose
protected Integer isValid;
/**
* 是否审核
*/
@ExcelField(title="is_audit",dictType="AUDIT_STATUS")
@ExcelField(title="is_audit",dictType="AUDIT_STATUS",sort=10)
protected Integer isAudit;
/**
* 创建人员
@@ -91,12 +92,12 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
/**
* 创建人员
*/
@ExcelField(title="creator")
@ExcelField(title="creator",sort=11)
protected String creatorName;
/**
* 配置时间
*/
@ExcelField(title="config_time")
@ExcelField(title="config_time",sort=12)
protected Date createTime;
/**
* 修改人员
@@ -105,12 +106,12 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
/**
* 创建人员
*/
@ExcelField(title="editor")
@ExcelField(title="editor",sort=13)
protected String editorName;
/**
* 修改时间
*/
@ExcelField(title="edit_time")
@ExcelField(title="edit_time",sort=14)
protected Date editTime;
/**
* 审核人员
@@ -119,13 +120,13 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
/**
* 审核人员
*/
@ExcelField(title="auditor")
@ExcelField(title="auditor",sort=15)
protected String auditorName;
/**
* 审核时间
*/
@Expose
@ExcelField(title="audit_time")
@ExcelField(title="audit_time",sort=16)
@SerializedName("opTime")
protected Date auditTime;
/**
@@ -141,27 +142,27 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
/**
* 来函
*/
@ExcelField(title="letter")
@ExcelField(title="letter",sort=5)
protected String requestName;
/**
* 是否区域gk
*/
@ExcelField(title="whether_area_block",dictType="WHETHER_AREA_BLOCK")
@ExcelField(title="whether_area_block",dictType="WHETHER_AREA_BLOCK",sort=4)
protected Integer isAreaEffective;
/**
* 分类
*/
@ExcelField(title="classification",dictType="type")
@ExcelField(title="classification",dictType="type",sort=6)
protected String classify;
/**
* 性质
*/
@ExcelField(title="attribute",dictType="attribute")
@ExcelField(title="attribute",dictType="attribute",sort=7)
protected String attribute;
/**
* 标签
*/
@ExcelField(title="label",dictType="label")
@ExcelField(title="label",dictType="label",sort=8)
protected String lable;
/**
* 分类
@@ -212,6 +213,7 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
/**
* do_log属性在界面（do_log:0不需要1记录所有日志2只记录结构化日志。默认是2）
*/
@ExcelField(title="do_log",dictType="DO_LOG",sort=3)
protected Integer doLog = Constants.MAAT_CFG_DOLOG_DEFAULT;

20
src/main/java/com/nis/domain/configuration/BaseIpCfg.java
View File

@@ -42,24 +42,24 @@ public class BaseIpCfg extends BaseCfg<BaseIpCfg> {
*/
@Expose
@SerializedName("ipType")
@ExcelField(title="ip_type",dictType="IP_TYPE")
@ExcelField(title="ip_type",dictType="IP_TYPE",sort=101)
protected Integer ipType;
@ExcelField(title="ip_pattern",dictType="IP_PATTERN")
@ExcelField(title="ip_pattern",dictType="IP_PATTERN",sort=102)
protected Integer ipPattern;
@ExcelField(title="client_ip")
@ExcelField(title="client_ip",sort=103)
protected String srcIpAddress;
@ExcelField(title="server_ip")
@ExcelField(title="server_ip",sort=104)
protected String destIpAddress;
@ExcelField(title="port_pattern",dictType="PORT_PATTERN")
@ExcelField(title="port_pattern",dictType="PORT_PATTERN",sort=105)
protected Integer portPattern;
@ExcelField(title="client_port")
@ExcelField(title="client_port",sort=106)
protected String srcPort;
@ExcelField(title="server_port")
@ExcelField(title="server_port",sort=107)
protected String destPort;
protected Integer dnsStrategyId;
@ExcelField(title="ir_type",dictType="IR_TYPE")
@ExcelField(title="ir_type",dictType="IR_TYPE",sort=108)
protected Integer irType;
@ExcelField(title="group_name")
@ExcelField(title="group_name",sort=109)
protected String groupName;
private List<NtcSubscribeIdCfg> ntcSubscribeIdCfgList;
@@ -97,12 +97,14 @@ public class BaseIpCfg extends BaseCfg<BaseIpCfg> {
*/
@Expose
@SerializedName("direction")
@ExcelField(title="direction",dictType="DIRECTION",sort=110)
protected Integer direction ;
/**
* 方向
*/
@Expose
@SerializedName("protocol")
@ExcelField(title="protocol",dictType="PROTOCOL",sort=111)
protected Integer protocol ;
/**
* 协议ID

31
src/main/java/com/nis/domain/configuration/BaseStringCfg.java
View File

@@ -35,7 +35,7 @@ public class BaseStringCfg<T> extends BaseCfg<T> {
*/
@Expose
@SerializedName("keywords")
@ExcelField(title="key_word")
@ExcelField(title="key_word",sort=201)
protected String cfgKeywords;
protected String cfgKeywordsShowName;
@@ -49,21 +49,30 @@ public class BaseStringCfg<T> extends BaseCfg<T> {
* 表达式类型
*/
@Expose
@ExcelField(title="expression_type")
@ExcelField(title="expression_type",dictType="EXPRESSION_TYPE",sort=202)
@SerializedName("exprType")
protected Integer exprType ;
/**
* 匹配方式
*/
@Expose
@ExcelField(title="match_method")
@ExcelField(title="match_method",dictType="MATCH_METHOD",sort=203)
@SerializedName("matchMethod")
protected Integer matchMethod ;
/**
* 是否hex
*/
@ExcelField(title="is_hex",sort=204)
protected Integer isHex;
/**
* 是否hex
*/
@ExcelField(title="is_case_insenstive",sort=205)
protected Integer isCaseInsenstive;
/**
* 是否hex二进制
*/
@Expose
@ExcelField(title="whether_hexbinary")
@SerializedName("isHexbin")
protected Integer isHexbin;
@@ -167,4 +176,18 @@ public class BaseStringCfg<T> extends BaseCfg<T> {
public void setNtcSubscribeIdCfg(NtcSubscribeIdCfg ntcSubscribeIdCfg) {
this.ntcSubscribeIdCfg = ntcSubscribeIdCfg;
}
public Integer getIsHex() {
return isHex=this.isHexbin;
}
public void setIsHex(Integer isHex) {
this.isHex = this.isHexbin;
}
public Integer getIsCaseInsenstive() {
return isCaseInsenstive=this.isHexbin;
}
public void setIsCaseInsenstive(Integer isCaseInsenstive) {
this.isCaseInsenstive =this.isHexbin;;
}
}

29
src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java
View File

@@ -12,6 +12,7 @@ import org.apache.commons.lang3.StringEscapeUtils;
import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;
import com.nis.util.excel.ExcelField;
/**
* @ClassName: BaseEnhancedStringConfig.java
@@ -32,6 +33,7 @@ public class ComplexkeywordCfg extends BaseCfg<ComplexkeywordCfg>{
* 匹配区域
*/
@Expose
@ExcelField(title="district",sort=301)
@SerializedName("district")
protected String district ;
protected String districtShowName;
@@ -40,6 +42,7 @@ public class ComplexkeywordCfg extends BaseCfg<ComplexkeywordCfg>{
*/
@Expose
@SerializedName("keywords")
@ExcelField(title="key_word",sort=302)
protected String cfgKeywords;
protected String keywordsShowName;
/**
@@ -47,13 +50,27 @@ public class ComplexkeywordCfg extends BaseCfg<ComplexkeywordCfg>{
*/
@Expose
@SerializedName("exprType")
@ExcelField(title="expression_type",dictType="EXPRESSION_TYPE",sort=303)
protected Integer exprType ;
/**
* 匹配方式
*/
@Expose
@ExcelField(title="match_method",dictType="MATCH_METHOD",sort=304)
@SerializedName("matchMethod")
protected Integer matchMethod ;
/**
* 是否hex
*/
@ExcelField(title="is_hex",sort=305)
protected Integer isHex;
/**
* 是否hex
*/
@ExcelField(title="is_case_insenstive",sort=306)
protected Integer isCaseInsenstive;
/**
* 是否hex二进制
*/
@@ -131,6 +148,18 @@ public class ComplexkeywordCfg extends BaseCfg<ComplexkeywordCfg>{
public void setIsHexbin(Integer isHexbin) {
this.isHexbin = isHexbin;
}
public Integer getIsHex() {
return isHex= this.isHexbin;
}
public void setIsHex(Integer isHex) {
this.isHex = this.isHexbin;
}
public Integer getIsCaseInsenstive() {
return isCaseInsenstive=this.isHexbin;
}
public void setIsCaseInsenstive(Integer isCaseInsenstive) {
this.isCaseInsenstive =this.isHexbin;;
}
/* (non-Javadoc)
* @see com.nis.domain.configuration.BaseCfg#initDefaultValue()
*/

85
src/main/java/com/nis/domain/configuration/template/IpAllTemplate.java Normal file
View File

@@ -0,0 +1,85 @@
/**
*@Title: BaseStringConfig.java
*@Package com.nis.domain.restful
*@Description TODO
*@author dell
*@date 2018年2月5日 下午5:26:02
*@version 版本号
*/
package com.nis.domain.configuration.template;
import com.nis.util.excel.ExcelField;
/**
* @Description: excel导入IP类配置
*/
public class IpAllTemplate {
/**
* @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么）
*
* @since 1.0.0
*/
private String cfgDesc;
private String srcIpAddress;
private String destIpAddress;
private String srcPort;
private String destPort;
private Integer protocol;
private Integer direction;
@ExcelField(title="config_describe",align=2,sort=1)
public String getCfgDesc() {
return cfgDesc;
}
public void setCfgDesc(String cfgDesc) {
this.cfgDesc = cfgDesc;
}
@ExcelField(title="client_ip",align=2,sort=2)
public String getSrcIpAddress() {
return srcIpAddress;
}
public void setSrcIpAddress(String srcIpAddress) {
this.srcIpAddress = srcIpAddress;
}
@ExcelField(title="server_ip",align=2,sort=3)
public String getDestIpAddress() {
return destIpAddress;
}
public void setDestIpAddress(String destIpAddress) {
this.destIpAddress = destIpAddress;
}
@ExcelField(title="client_port",align=2,sort=4)
public String getSrcPort() {
return srcPort;
}
public void setSrcPort(String srcPort) {
this.srcPort = srcPort;
}
@ExcelField(title="server_port",align=2,sort=5)
public String getDestPort() {
return destPort;
}
public void setDestPort(String destPort) {
this.destPort = destPort;
}
@ExcelField(title="protocol",align=2,sort=6)
public Integer getProtocol() {
return protocol;
}
public void setProtocol(Integer protocol) {
this.protocol = protocol;
}
@ExcelField(title="direction",align=2,sort=7)
public Integer getDirection() {
return direction;
}
public void setDirection(Integer direction) {
this.direction = direction;
}
}

5
src/main/java/com/nis/domain/specific/ConfigGroupInfo.java
View File

@@ -2,14 +2,19 @@ package com.nis.domain.specific;
import java.util.Date;
import com.google.gson.annotations.Expose;
import com.nis.util.excel.ExcelField;
public class ConfigGroupInfo {
private Integer id;
private Integer groupId;
@ExcelField(title="group_name",sort=302)
private String groupName;
private Integer isIssued;
private Date insertTime;
private Date updateTime;
private Integer groupType;
@ExcelField(title="cfg_id",sort=301)
private Integer compileId;
public Integer getCompileId() {