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 | 87 +++++++++++++++++++++++++------------------
1 files changed, 51 insertions(+), 36 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 1ebe053..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
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -57,7 +58,7 @@
@ApiModelProperty(value = "浜嬩欢绫诲瀷")
@ExcelColumn(name="浜嬩欢绫诲瀷")
- private String eventType;
+ private Integer eventType;
@ApiModelProperty(value = "浜嬩欢婧愮被鍨嬶紝濡傗�渁csDevice鈥�")
@ExcelColumn(name="浜嬩欢婧愮被鍨嬶紝濡傗�渁csDevice鈥�")
@@ -67,26 +68,19 @@
@ExcelColumn(name="浜嬩欢鍙戠敓鏃堕棿锛堣澶囨椂闂�")
private String happenTime;
- @ApiModelProperty(value = "闂ㄧ鐐瑰敮涓�鎺ュ叆缂栫爜
- ")
- @ExcelColumn(name="闂ㄧ鐐瑰敮涓�鎺ュ叆缂栫爜
- ")
+ @ApiModelProperty(value = "闂ㄧ鐐瑰敮涓�鎺ュ叆缂栫爜")
+ @ExcelColumn(name="闂ㄧ鐐瑰敮涓�鎺ュ叆缂栫爜")
private String srcIndex;
+ @ApiModelProperty(value = "鎺у埗鍣ㄨ澶囧敮涓�鎺ュ叆缂栫爜")
+ @ExcelColumn(name="鎺у埗鍣ㄨ澶囧敮涓�鎺ュ叆缂栫爜")
+ private String srcParentIndex;
@ApiModelProperty(value = "闂ㄧ鍚嶇О")
@ExcelColumn(name="闂ㄧ鍚嶇О")
private String srcName;
- @ApiModelProperty(value = "浜嬩欢鐘舵��,0-鐬椂
- 1-寮�濮�
- 2-鍋滄
- 4-浜嬩欢鑱斿姩缁撴灉鏇存柊
- 5-浜嬩欢鍥剧墖寮傛涓婁紶", example = "1")
- @ExcelColumn(name="浜嬩欢鐘舵��,0-鐬椂
- 1-寮�濮�
- 2-鍋滄
- 4-浜嬩欢鑱斿姩缁撴灉鏇存柊
- 5-浜嬩欢鍥剧墖寮傛涓婁紶")
+ @ApiModelProperty(value = "浜嬩欢鐘舵��,0-鐬椂1-寮�濮�2-鍋滄4-浜嬩欢鑱斿姩缁撴灉鏇存柊5-浜嬩欢鍥剧墖寮傛涓婁紶", example = "1")
+ @ExcelColumn(name="浜嬩欢鐘舵��,0-鐬椂1-寮�濮�2-鍋滄4-浜嬩欢鑱斿姩缁撴灉鏇存柊5-浜嬩欢鍥剧墖寮傛涓婁紶")
private Integer status;
@ApiModelProperty(value = "鑴夊啿瓒呮椂鏃堕棿锛屽崟浣嶏細绉掞紝鐬椂浜嬩欢姝ゅ瓧娈靛～0", example = "1")
@@ -99,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 = "鍗″彿")
@@ -111,6 +107,7 @@
@ApiModelProperty(value = "浜嬩欢杈撳叆閫氶亾", example = "1")
@ExcelColumn(name="浜嬩欢杈撳叆閫氶亾")
+ @TableField("ext_event_case_id")
private Integer extEventCaseID;
@ApiModelProperty(value = "浜嬩欢绫诲瀷浠ｇ爜", example = "1")
@@ -119,73 +116,68 @@
@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 = "浜哄憳缂栧彿")
@ExcelColumn(name="浜哄憳缂栧彿")
private String extEventPersonNo;
- @ApiModelProperty(value = "璇诲崱鍣ㄧ被鍒�0-鏃犳晥
- 1-IC璇诲崱鍣�
- 2-韬唤璇佽鍗″櫒
- 3-浜岀淮鐮佽鍗″櫒
- 4-鎸囩汗澶�", example = "1")
- @ExcelColumn(name="璇诲崱鍣ㄧ被鍒�0-鏃犳晥
- 1-IC璇诲崱鍣�
- 2-韬唤璇佽鍗″櫒
- 3-浜岀淮鐮佽鍗″櫒
- 4-鎸囩汗澶�")
+ @ApiModelProperty(value = "璇诲崱鍣ㄧ被鍒�0-鏃犳晥1-IC璇诲崱鍣�2-韬唤璇佽鍗″櫒3-浜岀淮鐮佽鍗″櫒4-鎸囩汗澶�", example = "1")
+ @ExcelColumn(name="璇诲崱鍣ㄧ被鍒�0-鏃犳晥1-IC璇诲崱鍣�2-韬唤璇佽鍗″櫒3-浜岀淮鐮佽鍗″櫒4-鎸囩汗澶�")
private Integer extEventReaderKind;
@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 = "鍥剧墖瀛樺偍鏈嶅姟鍣ㄥ敮涓�鏍囪瘑")
@ExcelColumn(name="鍥剧墖瀛樺偍鏈嶅姟鍣ㄥ敮涓�鏍囪瘑")
private String svrIndexCode;
- @ApiModelProperty(value = "鎶ュ憡涓婁紶閫氶亾,1-甯冮槻int涓婁紶
- 2-涓績缁�1涓婁紶
- 3-涓績缁�2涓婁紶
- 0-鏃犳晥", example = "1")
- @ExcelColumn(name="鎶ュ憡涓婁紶閫氶亾,1-甯冮槻int涓婁紶
- 2-涓績缁�1涓婁紶
- 3-涓績缁�2涓婁紶
- 0-鏃犳晥")
+ @ApiModelProperty(value = "鎶ュ憡涓婁紶閫氶亾,1-甯冮槻int涓婁紶2-涓績缁�1涓婁紶3-涓績缁�2涓婁紶0-鏃犳晥", example = "1")
+ @ExcelColumn(name="鎶ュ憡涓婁紶閫氶亾,1-甯冮槻int涓婁紶2-涓績缁�1涓婁紶3-涓績缁�2涓婁紶0-鏃犳晥")
private Integer extEventReportChannel;
@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="闂ㄧ浜嬩欢绫诲瀷")
@@ -193,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="浜嬩欢涓婃姤椹卞姩鐨勬椂闂�")
@@ -226,6 +220,10 @@
@ApiModelProperty(value = "韬唤璇乮d")
@ExcelColumn(name="韬唤璇乮d")
private String idNum;
+
+ @ApiModelProperty(value = "璇佷欢鏄剧ず淇℃伅")
+ @ExcelColumn(name="璇佷欢鏄剧ず淇℃伅")
+ private String idcardDecode;
@ApiModelProperty(value = "韬唤璇佺鍙戞満鍏�")
@ExcelColumn(name="韬唤璇佺鍙戞満鍏�")
@@ -263,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