From 30a14783481d100a6503a56c902b47182e542c93 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 08 十二月 2023 15:42:09 +0800
Subject: [PATCH] #组织树 和企业下的人员信息 人员卡信息
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 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 8ca8250..0a97010 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;
@@ -89,10 +90,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 = "鍗″彿")
@@ -101,6 +104,7 @@
@ApiModelProperty(value = "浜嬩欢杈撳叆閫氶亾", example = "1")
@ExcelColumn(name="浜嬩欢杈撳叆閫氶亾")
+ @TableField("ext_event_case_id")
private Integer extEventCaseID;
@ApiModelProperty(value = "浜嬩欢绫诲瀷浠ｇ爜", example = "1")
@@ -109,22 +113,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 = "浜哄憳缂栧彿")
@@ -137,10 +146,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 = "鍥剧墖瀛樺偍鏈嶅姟鍣ㄥ敮涓�鏍囪瘑")
@@ -153,15 +164,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="闂ㄧ浜嬩欢绫诲瀷")
@@ -169,10 +182,12 @@
@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 String extEventWhiteListNo;
@ApiModelProperty(value = "浜嬩欢涓婃姤椹卞姩鐨勬椂闂�")
@@ -203,6 +218,10 @@
@ExcelColumn(name="韬唤璇乮d")
private String idNum;
+ @ApiModelProperty(value = "璇佷欢鏄剧ず淇℃伅")
+ @ExcelColumn(name="璇佷欢鏄剧ず淇℃伅")
+ private String idcardDecode;
+
@ApiModelProperty(value = "韬唤璇佺鍙戞満鍏�")
@ExcelColumn(name="韬唤璇佺鍙戞満鍏�")
private String issuingAuthority;
--
Gitblit v1.9.3