From 70577a6d6cf2bded29e71dcad11a0c2605193d20 Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期二, 26 十二月 2023 10:32:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java | 46 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 42 insertions(+), 4 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
index 587fae6..7bfc9df 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
@@ -58,7 +58,7 @@
@ApiModelProperty(value = "浜嬩欢绫诲瀷")
@ExcelColumn(name="浜嬩欢绫诲瀷")
- private String eventType;
+ private Integer eventType;
@ApiModelProperty(value = "浜嬩欢婧愮被鍨嬶紝濡傗�渁csDevice鈥�")
@ExcelColumn(name="浜嬩欢婧愮被鍨嬶紝濡傗�渁csDevice鈥�")
@@ -71,6 +71,9 @@
@ApiModelProperty(value = "闂ㄧ鐐瑰敮涓�鎺ュ叆缂栫爜")
@ExcelColumn(name="闂ㄧ鐐瑰敮涓�鎺ュ叆缂栫爜")
private String srcIndex;
+ @ApiModelProperty(value = "鎺у埗鍣ㄨ澶囧敮涓�鎺ュ叆缂栫爜")
+ @ExcelColumn(name="鎺у埗鍣ㄨ澶囧敮涓�鎺ュ叆缂栫爜")
+ private String srcParentIndex;
@ApiModelProperty(value = "闂ㄧ鍚嶇О")
@ExcelColumn(name="闂ㄧ鍚嶇О")
@@ -90,10 +93,12 @@
@ApiModelProperty(value = "鎶ヨ杈撳叆/闃插尯閫氶亾", example = "1")
@ExcelColumn(name="鎶ヨ杈撳叆/闃插尯閫氶亾")
+ @TableField("ext_event_alarm_in_id")
private Integer extEventAlarmInID;
@ApiModelProperty(value = "鎶ヨ杈撳嚭閫氶亾", example = "1")
@ExcelColumn(name="鎶ヨ杈撳嚭閫氶亾")
+ @TableField("ext_event_alarm_out_id")
private Integer extEventAlarmOutID;
@ApiModelProperty(value = "鍗″彿")
@@ -102,6 +107,7 @@
@ApiModelProperty(value = "浜嬩欢杈撳叆閫氶亾", example = "1")
@ExcelColumn(name="浜嬩欢杈撳叆閫氶亾")
+ @TableField("ext_event_case_id")
private Integer extEventCaseID;
@ApiModelProperty(value = "浜嬩欢绫诲瀷浠ｇ爜", example = "1")
@@ -110,22 +116,27 @@
@ApiModelProperty(value = "闂ㄧ紪鍙�", example = "1")
@ExcelColumn(name="闂ㄧ紪鍙�")
+ @TableField("ext_event_door_id")
private Integer extEventDoorID;
@ApiModelProperty(value = "韬唤璇佸浘鐗嘦RL")
@ExcelColumn(name="韬唤璇佸浘鐗嘦RL")
+ @TableField("ext_event_idcard_picture_url")
private String extEventIDCardPictureURL;
@ApiModelProperty(value = "杩涘嚭鏂瑰悜 1-杩� 0-鍑� -1:鏈煡 瑕佹眰锛氳繘闂ㄨ鍗″櫒鎷ㄧ爜璁剧疆涓�1锛屽嚭闂ㄨ鍗″櫒鎷ㄧ爜璁剧疆涓�2", example = "1")
@ExcelColumn(name="杩涘嚭鏂瑰悜 1-杩� 0-鍑� -1:鏈煡 瑕佹眰锛氳繘闂ㄨ鍗″櫒鎷ㄧ爜璁剧疆涓�1锛屽嚭闂ㄨ鍗″櫒鎷ㄧ爜璁剧疆涓�2")
+ @TableField("ext_event_in_out")
private Integer extEventInOut;
@ApiModelProperty(value = "灏卞湴鎺у埗鍣╥d", example = "1")
@ExcelColumn(name="灏卞湴鎺у埗鍣╥d")
+ @TableField("ext_event_local_controller_id")
private Integer extEventLocalControllerID;
@ApiModelProperty(value = "涓昏澶囨嫧鐮�", example = "1")
@ExcelColumn(name="涓昏澶囨嫧鐮�")
+ @TableField("ext_event_main_dev_id")
private Integer extEventMainDevID;
@ApiModelProperty(value = "浜哄憳缂栧彿")
@@ -138,10 +149,12 @@
@ApiModelProperty(value = "璇诲崱鍣╥d", example = "1")
@ExcelColumn(name="璇诲崱鍣╥d")
+ @TableField("ext_event_reader_id")
private Integer extEventReaderID;
@ApiModelProperty(value = "鍥剧墖鐨剈rl")
@ExcelColumn(name="鍥剧墖鐨剈rl")
+ @TableField("ext_event_picture_url")
private String extEventPictureURL;
@ApiModelProperty(value = "鍥剧墖瀛樺偍鏈嶅姟鍣ㄥ敮涓�鏍囪瘑")
@@ -154,15 +167,17 @@
@ApiModelProperty(value = "缇ょ粍缂栧彿", example = "1")
@ExcelColumn(name="缇ょ粍缂栧彿")
+ @TableField("ext_event_role_id")
private Integer extEventRoleID;
@ApiModelProperty(value = "鍒嗘帶鍒跺櫒纭欢ID", example = "1")
@ExcelColumn(name="鍒嗘帶鍒跺櫒纭欢ID")
- private Integer extEventSubDevID;
+ @TableField("ext_event_eub_dev_id")
+ private Integer extEventEubDevID;
@ApiModelProperty(value = "鍒峰崱娆℃暟", example = "1")
@ExcelColumn(name="鍒峰崱娆℃暟")
- private Integer extEventSwipNum;
+ private Integer extEventEwipNum;
@ApiModelProperty(value = "闂ㄧ浜嬩欢绫诲瀷", example = "1")
@ExcelColumn(name="闂ㄧ浜嬩欢绫诲瀷")
@@ -170,11 +185,13 @@
@ApiModelProperty(value = "澶氶噸璁よ瘉搴忓彿", example = "1")
@ExcelColumn(name="澶氶噸璁よ瘉搴忓彿")
+ @TableField("ext_event_verify_id")
private Long extEventVerifyID;
@ApiModelProperty(value = "鐧藉悕鍗曞崟鍙�")
@ExcelColumn(name="鐧藉悕鍗曞崟鍙�")
- private String extEventWhiteListNo;
+ @TableField("ext_event_white_list_no")
+ private Integer extEventWhiteListNo;
@ApiModelProperty(value = "浜嬩欢涓婃姤椹卞姩鐨勬椂闂�")
@ExcelColumn(name="浜嬩欢涓婃姤椹卞姩鐨勬椂闂�")
@@ -203,6 +220,10 @@
@ApiModelProperty(value = "韬唤璇乮d")
@ExcelColumn(name="韬唤璇乮d")
private String idNum;
+
+ @ApiModelProperty(value = "璇佷欢鏄剧ず淇℃伅")
+ @ExcelColumn(name="璇佷欢鏄剧ず淇℃伅")
+ private String idcardDecode;
@ApiModelProperty(value = "韬唤璇佺鍙戞満鍏�")
@ExcelColumn(name="韬唤璇佺鍙戞満鍏�")
@@ -240,4 +261,21 @@
@ExcelColumn(name="閫氶亾鎬婚�氳浜烘暟")
private Integer totalTimes;
+
+ // 鏉′欢鏌ヨ鍙傛暟
+ @ApiModelProperty(value = "鍏抽敭瀛�,濮撳悕/鎵嬫満鍙�")
+ @TableField(exist = false)
+ private String keyWords;
+
+ @ApiModelProperty(value = "浜哄憳绫诲瀷")
+ @TableField(exist = false)
+ private String personType;
+
+ @ApiModelProperty(value = "寮�濮嬫椂闂�")
+ @TableField(exist = false)
+ private Date startTime;
+
+ @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ @TableField(exist = false)
+ private Date endTime;
}
--
Gitblit v1.9.3