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 | 255 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 210 insertions(+), 45 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 5af3dcd..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;
@@ -13,7 +14,7 @@
/**
* 闂ㄧ浜嬩欢鎺ㄩ�佽褰曡〃
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Data
@ApiModel("闂ㄧ浜嬩欢鎺ㄩ�佽褰曡〃")
@@ -51,66 +52,230 @@
@ExcelColumn(name="澶囨敞")
private String remark;
- @ApiModelProperty(value = "鎵�灞炵粍缁囩紪鐮�(鍏宠仈company琛�)", example = "1")
- @ExcelColumn(name="鎵�灞炵粍缁囩紪鐮�(鍏宠仈company琛�)")
- private Integer companyId;
+ @ApiModelProperty(value = "浜嬩欢鍞竴鏍囪瘑锛屽悓涓�浜嬩欢鑻ヤ笂鎶ュ娆★紝鍒欎笂鎶ヤ簨浠剁殑eventId鐩稿悓")
+ @ExcelColumn(name="浜嬩欢鍞竴鏍囪瘑锛屽悓涓�浜嬩欢鑻ヤ笂鎶ュ娆★紝鍒欎笂鎶ヤ簨浠剁殑eventId鐩稿悓")
+ private String eventId;
- @ApiModelProperty(value = "浜鸿劯鐓х墖")
- @ExcelColumn(name="浜鸿劯鐓х墖")
- private String faceImg;
+ @ApiModelProperty(value = "浜嬩欢绫诲瀷")
+ @ExcelColumn(name="浜嬩欢绫诲瀷")
+ private Integer eventType;
- @ApiModelProperty(value = "鍋ュ悍鐮�")
- @ExcelColumn(name="鍋ュ悍鐮�")
- private String imgurl;
+ @ApiModelProperty(value = "浜嬩欢婧愮被鍨嬶紝濡傗�渁csDevice鈥�")
+ @ExcelColumn(name="浜嬩欢婧愮被鍨嬶紝濡傗�渁csDevice鈥�")
+ private String srcType;
- @ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴鍛樺伐", example = "1")
- @ExcelColumn(name="绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴鍛樺伐")
- private Integer type;
+ @ApiModelProperty(value = "浜嬩欢鍙戠敓鏃堕棿锛堣澶囨椂闂�")
+ @ExcelColumn(name="浜嬩欢鍙戠敓鏃堕棿锛堣澶囨椂闂�")
+ private String happenTime;
- @ApiModelProperty(value = "璁垮鍚嶇О")
- @ExcelColumn(name="璁垮鍚嶇О")
- private String name;
+ @ApiModelProperty(value = "闂ㄧ鐐瑰敮涓�鎺ュ叆缂栫爜")
+ @ExcelColumn(name="闂ㄧ鐐瑰敮涓�鎺ュ叆缂栫爜")
+ private String srcIndex;
+ @ApiModelProperty(value = "鎺у埗鍣ㄨ澶囧敮涓�鎺ュ叆缂栫爜")
+ @ExcelColumn(name="鎺у埗鍣ㄨ澶囧敮涓�鎺ュ叆缂栫爜")
+ private String srcParentIndex;
- @ApiModelProperty(value = "璁垮骞撮緞")
- @ExcelColumn(name="璁垮骞撮緞")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date birthday;
+ @ApiModelProperty(value = "闂ㄧ鍚嶇О")
+ @ExcelColumn(name="闂ㄧ鍚嶇О")
+ private String srcName;
- @ApiModelProperty(value = "鎵嬫満鍙�")
- @ExcelColumn(name="鎵嬫満鍙�")
- private String phone;
+ @ApiModelProperty(value = "浜嬩欢鐘舵��,0-鐬椂1-寮�濮�2-鍋滄4-浜嬩欢鑱斿姩缁撴灉鏇存柊5-浜嬩欢鍥剧墖寮傛涓婁紶", example = "1")
+ @ExcelColumn(name="浜嬩欢鐘舵��,0-鐬椂1-寮�濮�2-鍋滄4-浜嬩欢鑱斿姩缁撴灉鏇存柊5-浜嬩欢鍥剧墖寮傛涓婁紶")
+ private Integer status;
- @ApiModelProperty(value = "韬唤璇佸彿锛圡D4鍔犲瘑锛�")
- @ExcelColumn(name="韬唤璇佸彿锛圡D4鍔犲瘑锛�")
- private String idcardNo;
+ @ApiModelProperty(value = "鑴夊啿瓒呮椂鏃堕棿锛屽崟浣嶏細绉掞紝鐬椂浜嬩欢姝ゅ瓧娈靛～0", example = "1")
+ @ExcelColumn(name="鑴夊啿瓒呮椂鏃堕棿锛屽崟浣嶏細绉掞紝鐬椂浜嬩欢姝ゅ瓧娈靛～0")
+ private Integer timeout;
+
+ @ApiModelProperty(value = "浜哄憳閫氶亾鍙�", example = "1")
+ @ExcelColumn(name="浜哄憳閫氶亾鍙�")
+ private Integer extAccessChannel;
+
+ @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 = "鍗″彿")
+ @ExcelColumn(name="鍗″彿")
+ private String extEventCardNo;
+
+ @ApiModelProperty(value = "浜嬩欢杈撳叆閫氶亾", example = "1")
+ @ExcelColumn(name="浜嬩欢杈撳叆閫氶亾")
+ @TableField("ext_event_case_id")
+ private Integer extEventCaseID;
+
+ @ApiModelProperty(value = "浜嬩欢绫诲瀷浠ｇ爜", example = "1")
+ @ExcelColumn(name="浜嬩欢绫诲瀷浠ｇ爜")
+ private Integer extEventCode;
+
+ @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-鎸囩汗澶�")
+ 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-鏃犳晥")
+ 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")
+ @TableField("ext_event_eub_dev_id")
+ private Integer extEventEubDevID;
+
+ @ApiModelProperty(value = "鍒峰崱娆℃暟", example = "1")
+ @ExcelColumn(name="鍒峰崱娆℃暟")
+ private Integer extEventEwipNum;
+
+ @ApiModelProperty(value = "闂ㄧ浜嬩欢绫诲瀷", example = "1")
+ @ExcelColumn(name="闂ㄧ浜嬩欢绫诲瀷")
+ private Integer extEventType;
+
+ @ApiModelProperty(value = "澶氶噸璁よ瘉搴忓彿", example = "1")
+ @ExcelColumn(name="澶氶噸璁よ瘉搴忓彿")
+ @TableField("ext_event_verify_id")
+ private Long extEventVerifyID;
+
+ @ApiModelProperty(value = "鐧藉悕鍗曞崟鍙�")
+ @ExcelColumn(name="鐧藉悕鍗曞崟鍙�")
+ @TableField("ext_event_white_list_no")
+ private Integer extEventWhiteListNo;
+
+ @ApiModelProperty(value = "浜嬩欢涓婃姤椹卞姩鐨勬椂闂�")
+ @ExcelColumn(name="浜嬩欢涓婃姤椹卞姩鐨勬椂闂�")
+ private String extReceiveTime;
+
+ @ApiModelProperty(value = "浜嬩欢娴佹按鍙凤紝涓�0鏃犳晥", example = "1")
+ @ExcelColumn(name="浜嬩欢娴佹按鍙凤紝涓�0鏃犳晥")
+ private Integer seq;
+
+ @ApiModelProperty(value = "鐢ㄦ埛绫诲瀷锛屼汉鍛樼被鍨嬶細0 鏈煡锛�1 鏅�氾紝2 鏉ュ锛�3 榛戝悕鍗曪紝4 绠＄悊鍛�", example = "1")
+ @ExcelColumn(name="鐢ㄦ埛绫诲瀷锛屼汉鍛樼被鍨嬶細0 鏈煡锛�1 鏅�氾紝2 鏉ュ锛�3 榛戝悕鍗曪紝4 绠＄悊鍛�")
+ private Integer userType;
+
+ @ApiModelProperty(value = "韬唤璇佷綇鍧�")
+ @ExcelColumn(name="韬唤璇佷綇鍧�")
+ private String address;
+
+ @ApiModelProperty(value = "韬唤璇佸嚭鐢熸棩鏈�")
+ @ExcelColumn(name="韬唤璇佸嚭鐢熸棩鏈�")
+ private String birth;
+
+ @ApiModelProperty(value = "韬唤璇佹湁鏁堟棩鏈熺粨鏉熸椂闂�")
+ @ExcelColumn(name="韬唤璇佹湁鏁堟棩鏈熺粨鏉熸椂闂�")
+ private String endDate;
+
+ @ApiModelProperty(value = "韬唤璇乮d")
+ @ExcelColumn(name="韬唤璇乮d")
+ private String idNum;
@ApiModelProperty(value = "璇佷欢鏄剧ず淇℃伅")
@ExcelColumn(name="璇佷欢鏄剧ず淇℃伅")
private String idcardDecode;
- @ApiModelProperty(value = "宸ュ彿")
- @ExcelColumn(name="宸ュ彿")
- private String code;
+ @ApiModelProperty(value = "韬唤璇佺鍙戞満鍏�")
+ @ExcelColumn(name="韬唤璇佺鍙戞満鍏�")
+ private String issuingAuthority;
- @ApiModelProperty(value = "鐝")
- @ExcelColumn(name="鐝")
- private String classes;
+ @ApiModelProperty(value = "韬唤璇佸鍚�")
+ @ExcelColumn(name="韬唤璇佸鍚�")
+ private String name;
- @ApiModelProperty(value = "鍙戠敓鏃堕棿")
- @ExcelColumn(name="鍙戠敓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date eventDate;
+ @ApiModelProperty(value = "韬唤璇佹�у埆 0-鏈煡1-鐢� 2-濂�", example = "1")
+ @ExcelColumn(name="韬唤璇佹�у埆 0-鏈煡1-鐢� 2-濂�")
+ private Integer sex;
- @ApiModelProperty(value = "璁垮ID(鍏宠仈member)", example = "1")
- @ExcelColumn(name="璁垮ID(鍏宠仈member)")
- private Integer memberId;
+ @ApiModelProperty(value = "韬唤璇佹湁鏁堟棩鏈熷紑濮嬫椂闂�")
+ @ExcelColumn(name="韬唤璇佹湁鏁堟棩鏈熷紑濮嬫椂闂�")
+ private String startDate;
- @ApiModelProperty(value = "浜嬩欢绫诲瀷鐮�")
- @ExcelColumn(name="浜嬩欢绫诲瀷鐮�")
- private String eventCode;
+ @ApiModelProperty(value = "鏄惁闀挎湡鏈夋晥,0-鍚︼紙鏈夋晥鎴鏃ユ湡鏈夋晥锛�1-鏄紙鏈夋晥鎴鏃ユ湡鏃犳晥锛�", example = "1")
+ @ExcelColumn(name="鏄惁闀挎湡鏈夋晥,0-鍚︼紙鏈夋晥鎴鏃ユ湡鏈夋晥锛�1-鏄紙鏈夋晥鎴鏃ユ湡鏃犳晥锛�")
+ private Integer termOfValidity;
- @ApiModelProperty(value = "鍔ㄤ綔绫诲瀷 0鍑� 1杩�", example = "1")
- @ExcelColumn(name="鍔ㄤ綔绫诲瀷 0鍑� 1杩�")
- private Integer inoutType;
+ @ApiModelProperty(value = "閫氶亾鍙�", example = "1")
+ @ExcelColumn(name="閫氶亾鍙�")
+ private Integer accessChannel;
+ @ApiModelProperty(value = "閫氶亾杩涗汉鏁�", example = "1")
+ @ExcelColumn(name="閫氶亾杩涗汉鏁�")
+ private Integer entryTimes;
+
+ @ApiModelProperty(value = "閫氶亾鍑轰汉鏁�", example = "1")
+ @ExcelColumn(name="閫氶亾鍑轰汉鏁�")
+ private Integer exitTimes;
+
+ @ApiModelProperty(value = "閫氶亾鎬婚�氳浜烘暟", example = "1")
+ @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