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:
leijun
2019-01-05 21:47:07 +08:00
parent ad0a04872c
commit ff98b2e65f
4 changed files with 344 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/nis/domain/log/BaseLogEntity.java
View File

@@ -33,7 +33,7 @@ public class BaseLogEntity<T> extends BaseEntity<T> {
protected Integer service; //配置表的serviceId
@ExcelField(title="entrance_id",dictType="ENTRANCE",sort=7)
protected Integer entranceId; //出入口编号
@ExcelField(title="deviceid",dictType="DEVICE",sort=45)
@ExcelField(title="deviceid",dictType="DEVICE",sort=50)
protected Integer deviceId; //串联设备编号
@ExcelField(title="direction",dictType="LOG_DIRECTION",sort=55)
protected Integer direction; //传输方向 0：域内->域外，1：域外->域内，从字典LOG_DIRECTION取值
@@ -74,9 +74,9 @@ public class BaseLogEntity<T> extends BaseEntity<T> {
protected String orderBy;//排序参数
//新增字段
@ExcelField(title="encap_type",dictType="ENCAP_TYPE",sort=50)
@ExcelField(title="encap_type",dictType="ENCAP_TYPE",sort=52)
protected Integer encapType;//原始二层封装格式
@ExcelField(title="link_id",dictType="LINK",sort=47)
@ExcelField(title="link_id",dictType="LINK",sort=51)
protected Integer linkId;//串联设备链路号
@ExcelField(title="inner_smac",sort=58)
protected String innerSmac;//MAC_IN_MAC的内层源MAC