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

修改配置导出多媒体、高级功能模块排序以及添加日志总量

Browse Source
This commit is contained in:
wangwei
2019-01-15 21:56:56 +08:00
parent b080a3fdbb
commit 5197a63855
18 changed files with 240 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/nis/domain/basics/AsnIpCfg.java
View File

@@ -17,13 +17,13 @@ public class AsnIpCfg extends BaseCfg<AsnIpCfg> {
@Expose
private String ratelimit;
@Expose
@ExcelField(title="ip_type",dictType="IP_TYPE",sort=3)
@ExcelField(title="ip_type",dictType="IP_TYPE",sort=6)
@SerializedName("ipType")
private Integer ipType;
@ExcelField(title="ip_pattern",dictType="IP_PATTERN",sort=6)
@ExcelField(title="ip_pattern",dictType="IP_PATTERN",sort=8)
private Integer ipPattern;
private String srcIpAddress;
@ExcelField(title="server_ip",sort=5)
@ExcelField(title="ip",sort=7)
private String destIpAddress;
private Integer portPattern;
private String srcPort;
@@ -45,11 +45,11 @@ public class AsnIpCfg extends BaseCfg<AsnIpCfg> {
private Integer protocol ;
private Integer protocolId;
@ExcelField(title="organization",sort=91)
@ExcelField(title="organization",sort=2)
private String organization;
@ExcelField(title="country",sort=92)
@ExcelField(title="country",sort=3)
private String country;
@ExcelField(title="detail",sort=93)
@ExcelField(title="detail",sort=3)
private String detail;
private String userregion1;

12
src/main/java/com/nis/domain/configuration/AvFileSampleCfg.java
View File

@@ -28,13 +28,23 @@ public class AvFileSampleCfg extends BaseCfg<AvFileSampleCfg> {
@ExcelField(title="harm_level",sort=21)
private Integer level;
@Expose
@ExcelField(title="cfg_id",sort=0)
@SerializedName("cfgId")
private Integer compileId;
private String srcPath;
private String samplePath;
private Integer isSampleCreated;
private String resultPath;
@ExcelField(title="log_total",sort=40)
private Long totalLogs;
public Long getTotalLogs() {
return totalLogs;
}
public void setTotalLogs(Long totalLogs) {
this.totalLogs = totalLogs;
}
public String getSrcPath() {
return srcPath;
}

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

@@ -119,13 +119,13 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
/**
* 有效标识
*/
@ExcelField(title="valid_identifier",dictType="VALID_IDENTIFIER",sort=26)
@ExcelField(title="valid_identifier",dictType="VALID_IDENTIFIER",sort=109)
@Expose
protected Integer isValid;
/**
* 是否审核
*/
@ExcelField(title="is_audit",dictType="AUDIT_STATUS",sort=25)
@ExcelField(title="is_audit",dictType="AUDIT_STATUS",sort=37)
protected Integer isAudit;
/**
* 创建人员

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

@@ -45,11 +45,11 @@ public class BaseIpCfg extends BaseCfg<BaseIpCfg> {
@SerializedName("ipType")
@ExcelField(title="ip_type",dictType="IP_TYPE",sort=44)
protected Integer ipType;
@ExcelField(title="ip_pattern",dictType="IP_PATTERN",sort=45)
@ExcelField(title="ip_pattern",dictType="IP_PATTERN",sort=46)
protected Integer ipPattern;
@ExcelField(title="client_ip",sort=47)
protected String srcIpAddress;
@ExcelField(title="server_ip",sort=46)
@ExcelField(title="ip",sort=45)
protected String destIpAddress;
@ExcelField(title="port_pattern",dictType="PORT_PATTERN",sort=48)
protected Integer portPattern;

9
src/main/java/com/nis/domain/configuration/FileDigestCfg.java
View File

@@ -37,6 +37,8 @@ public class FileDigestCfg extends BaseCfg<FileDigestCfg> {
private Integer cfdsLevel;
@ExcelField(title="file_url",sort=6)
private String fileUrl;
@ExcelField(title="log_total",sort=40)
private Long totalLogs;
private NtcSubscribeIdCfg ntcSubscribeIdCfg;
private List<NtcSubscribeIdCfg> ntcSubscribeIdCfgList;
@@ -89,5 +91,10 @@ public class FileDigestCfg extends BaseCfg<FileDigestCfg> {
public void setIndexTable(String indexTable) {
this.indexTable = indexTable;
}
public Long getTotalLogs() {
return totalLogs;
}
public void setTotalLogs(Long totalLogs) {
this.totalLogs = totalLogs;
}
}