多媒体、IP复用、增加导出excel和csv

This commit is contained in:
leijun
2018-12-23 00:36:58 +08:00
parent 9080960e95
commit df32c39736
42 changed files with 730 additions and 209 deletions

View File

@@ -12,11 +12,11 @@ public class AvFileSampleCfg extends BaseCfg<AvFileSampleCfg> {
private String indexTable="av_file_sample_cfg";
@Expose
@SerializedName("srcFile")
@ExcelField(title="src_file",sort=2)
@ExcelField(title="src_file",sort=3)
private String srcUrl;
@Expose
@SerializedName("dstFile")
@ExcelField(title="sample_file",sort=3)
@ExcelField(title="sample_file",sort=4)
private String sampleUrl;
@Expose
@SerializedName("srcFileMd5")

View File

@@ -29,13 +29,13 @@ public class FileDigestCfg extends BaseCfg<FileDigestCfg> {
private static final long serialVersionUID = 2796500715438264119L;
private static final String tableName="file_digest_cfg";
private String indexTable="file_digest_cfg";
@ExcelField(title="raw_len",sort=3)
@ExcelField(title="raw_len",sort=4)
private Long rawLen;
@ExcelField(title="digest",sort=2)
@ExcelField(title="digest",sort=3)
private String digest;
@ExcelField(title="cfds_level",sort=4)
@ExcelField(title="harm_level",sort=5)
private Integer cfdsLevel;
@ExcelField(title="file_url",sort=5)
@ExcelField(title="file_url",sort=6)
private String fileUrl;
private NtcSubscribeIdCfg ntcSubscribeIdCfg;

View File

@@ -3,6 +3,7 @@ package com.nis.domain.configuration;
import java.util.List;
import com.google.gson.annotations.SerializedName;
import com.nis.util.excel.ExcelField;
/**
* IP复用地址池实体
@@ -13,15 +14,16 @@ public class IpAddrPoolCfg extends BaseCfg<IpAddrPoolCfg>{
private static final long serialVersionUID = 1392197458744667669L;
private String indexTable="ip_reuse_addr_pool";
@ExcelField(title="address_pool",sort=2)
private String addrPoolName; // 地址池名称
@ExcelField(title="ip_total",sort=3)
private Integer ipTotal; // IP总数
private Integer availableIpTotal; // 可用IP总数
private String description; // 描述信息
private List<BaseIpCfg> ipCfgs; // 地址池IP信息
@SerializedName("cfgId")
@ExcelField(title="address_pool_id",sort=0)
private Integer compileId;
public String getIndexTable() {

View File

@@ -3,6 +3,7 @@ package com.nis.domain.configuration;
import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;
import com.nis.util.Constants;
import com.nis.util.excel.ExcelField;
/**
* IP复用DNAT策略实体
@@ -16,6 +17,7 @@ public class IpReuseDnatPolicyCfg extends IpPortCfg{
@Expose
@SerializedName("configId")
@ExcelField(title="cfg_id",sort=0)
private Integer compileId;
@Expose
@@ -24,22 +26,26 @@ public class IpReuseDnatPolicyCfg extends IpPortCfg{
@Expose
@SerializedName("originalDestIp")
@ExcelField(title="original_dest_ip",sort=4)
private String srcIpAddress;
@Expose
@SerializedName("originalDestPort")
@ExcelField(title="original_dest_port",sort=5)
private String srcPort;
@Expose
@SerializedName("originalProtocol")
@ExcelField(title="protocol",dictType="PROTOCOL",sort=8)
private Integer protocol;
@Expose
@SerializedName("translatedDestIp")
@ExcelField(title="translated_dest_ip",sort=6)
private String destIpAddress;
@Expose
@SerializedName("translatedDestPort")
@ExcelField(title="translated_dest_port",sort=7)
private String destPort;
@Expose

View File

@@ -3,6 +3,7 @@ package com.nis.domain.configuration;
import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;
import com.nis.util.Constants;
import com.nis.util.excel.ExcelField;
/**
* IP复用策略
@@ -20,6 +21,7 @@ public class IpReusePolicyCfg extends BaseCfg<IpReusePolicyCfg>{
private Integer userId; // 用户标识
@Expose
@ExcelField(title="user_type",dictType="USER_TYPE",sort=4)
protected String userType; // 用户类型
@Expose
protected Integer addrPoolId; // 地址池ID
@@ -27,11 +29,14 @@ public class IpReusePolicyCfg extends BaseCfg<IpReusePolicyCfg>{
protected String translateParam; // 地址翻译参数
@Expose
@SerializedName("userId")
@ExcelField(title="user",sort=5)
private String userName;
@ExcelField(title="address_pool",sort=3)
private String addrPoolName; // 仅用于列表条件检索
private Integer ipType;
private Integer ipPattern;
@ExcelField(title="ip",sort=6)
private String srcIpAddress;
private String destIpAddress;
@Expose

View File

@@ -1,7 +1,5 @@
package com.nis.domain.configuration;
import java.util.Date;
import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;
import com.nis.util.excel.ExcelField;
@@ -23,10 +21,13 @@ public class PxyObjSpoofingIpPool extends BaseIpCfg{
private String port;
@Expose
@SerializedName("addrType")
@ExcelField(title="ip_type",dictType="IP_TYPE",sort=4)
private Integer ipType;
@Expose
@SerializedName("ip")
@ExcelField(title="IP",sort=5)
private String ipAddress;
@ExcelField(title="group",sort=3)
private String groupName;//欺骗IP池IP组名称
@Expose
@SerializedName("policyGroup")
@@ -36,6 +37,7 @@ public class PxyObjSpoofingIpPool extends BaseIpCfg{
private Integer location;//位置无意义固定为0
@Expose
@SerializedName("cfgId")
@ExcelField(title="cfg_id",sort=0)
private Integer compileId;
@Expose
@SerializedName("userRegion")

View File

@@ -3,25 +3,33 @@ package com.nis.domain.configuration;
import java.util.Date;
import com.nis.domain.BaseEntity;
import com.nis.util.excel.ExcelField;
public class UserManage extends BaseEntity<UserManage>{
private static final long serialVersionUID = -2749633756272829982L;
private static final String tableName="user_manage";
@ExcelField(title="user_name",sort=1)
private String userName;
private String userPwd;
@ExcelField(title="vpn_ip",sort=2)
private String serverIp;
private String authMethod;
private Integer numLogins;
private String lastLogin;
private String transferBytes;
private String transferPackets;
private Long creatorId;
@ExcelField(title="config_time",sort=5)
private Date createTime;
private Long editorId;
@ExcelField(title="edit_time",sort=7)
private Date editTime;
private Integer isValid;
@ExcelField(title="desc",sort=3)
private String remarks;
private String userType;
@@ -39,8 +47,9 @@ public class UserManage extends BaseEntity<UserManage>{
private String incomingBroadcastPackets;
private String incomingBroadcastTotalSize;
private Integer numberOfLogins;*/
@ExcelField(title="creator",sort=4)
private String creatorName;
@ExcelField(title="editor",sort=6)
private String editorName;
private Date search_create_time_start;
private Date search_create_time_end;