From 6c5d0a4a9264b7508c7ffe81b45ba239cabf2244 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期三, 10 四月 2024 17:59:08 +0800
Subject: [PATCH] 最新版本
---
server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/DeviceEventDTO.java | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/DeviceEventDTO.java b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/DeviceEventDTO.java
index 262cccf..7e8614d 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/DeviceEventDTO.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/DeviceEventDTO.java
@@ -1,6 +1,7 @@
package com.doumee.dao.admin.response;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -12,8 +13,6 @@
@Data
@ApiModel("闂ㄧ浜嬩欢鎺ㄩ�佽褰曡〃")
public class DeviceEventDTO {
-
-
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
private Integer creator;
@@ -36,21 +35,30 @@
@ApiModelProperty(value = "浜嬩欢鍞竴鏍囪瘑锛屽悓涓�浜嬩欢鑻ヤ笂鎶ュ娆★紝鍒欎笂鎶ヤ簨浠剁殑eventId鐩稿悓")
private String eventId;
- @ApiModelProperty(value = "浜嬩欢绫诲瀷")
- private String eventType;
+ @ApiModelProperty(value = "浜嬩欢绫诲瀷 -- 197163,浜鸿劯璁よ瘉澶辫触 ; 196893,浜鸿劯璁よ瘉閫氳繃")
+ @ExcelColumn(name="浜嬩欢绫诲瀷",index = 7,width = 16,valueMapping = "197163=浜鸿劯璁よ瘉澶辫触;196893=浜鸿劯璁よ瘉閫氳繃;")
+ private Integer eventType;
+ @ApiModelProperty(value = "浜嬩欢绫诲瀷鍚嶇О")
+ private String eventTypeName;
@ApiModelProperty(value = "浜嬩欢婧愮被鍨嬶紝濡傗�渁csDevice鈥�")
private String srcType;
@ApiModelProperty(value = "浜嬩欢鍙戠敓鏃堕棿锛堣澶囨椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ExcelColumn(name="浜嬩欢鏃堕棿",index = 9,width = 16,dateFormat = "yyyy-MM-dd HH:mm:ss")
private String happenTime;
@ApiModelProperty(value = "闂ㄧ鐐瑰敮涓�鎺ュ叆缂栫爜")
private String srcIndex;
- @ApiModelProperty(value = "闂ㄧ鍚嶇О")
- @ExcelColumn(name="闂ㄧ鍚嶇О")
+ @ApiModelProperty(value = "闂ㄧ鐐瑰悕绉�")
+ @ExcelColumn(name="闂ㄧ鐐�",index = 6,width = 16)
private String srcName;
+
+ @ApiModelProperty(value = "闂ㄧ鍚嶇О")
+ @ExcelColumn(name="闂ㄧ鍚嶇О",index = 5,width = 16)
+ private String devName;
@ApiModelProperty(value = "浜嬩欢鐘舵��,0-鐬椂1-寮�濮�2-鍋滄4-浜嬩欢鑱斿姩缁撴灉鏇存柊5-浜嬩欢鍥剧墖寮傛涓婁紶")
private Integer status;
@@ -80,10 +88,10 @@
private Integer extEventDoorID;
@ApiModelProperty(value = "韬唤璇佸浘鐗嘦RL")
- @ExcelColumn(name="韬唤璇佸浘鐗嘦RL")
private String extEventIDCardPictureURL;
@ApiModelProperty(value = "杩涘嚭鏂瑰悜 1-杩� 0-鍑� -1:鏈煡 瑕佹眰锛氳繘闂ㄨ鍗″櫒鎷ㄧ爜璁剧疆涓�1锛屽嚭闂ㄨ鍗″櫒鎷ㄧ爜璁剧疆涓�2")
+ @ExcelColumn(name="鍑哄叆绫诲瀷",index = 8,width = 8,valueMapping = "1=杩�;-1=鍑�;")
private Integer extEventInOut;
@ApiModelProperty(value = "灏卞湴鎺у埗鍣╥d")
@@ -96,20 +104,25 @@
private String extEventPersonNo;
@ApiModelProperty(value = "鍏徃/缁勭粐")
+ @ExcelColumn(name="鍏徃/缁勭粐",index = 4,width = 16)
private String personCompanyName;
@ApiModelProperty(value = "鎵嬫満鍙�")
+ @ExcelColumn(name="鎵嬫満鍙�",index = 3,width = 10)
private String personPhone;
@ApiModelProperty(value = "浜哄憳绫诲瀷")
- private String personType;
+ @ExcelColumn(name="浜哄憳绫诲瀷",valueMapping = "0=鍔冲姟璁垮;1=鏅�氳瀹�;2=鍐呴儴浜哄憳;",index = 1,width = 10)
+ private Integer personType;
@ApiModelProperty(value = "浜哄憳韬唤璇佸彿")
private String personIdcardDecode;
@ApiModelProperty(value = "浜哄憳鍚嶇О")
+ @ExcelColumn(name="濮撳悕",index = 2,width = 10)
private String personName;
-
+ @ApiModelProperty(value = "浜哄憳缂栫爜")
+ private String memberId;
@ApiModelProperty(value = "璇诲崱鍣ㄧ被鍒�0-鏃犳晥1-IC璇诲崱鍣�2-韬唤璇佽鍗″櫒3-浜岀淮鐮佽鍗″櫒4-鎸囩汗澶�")
private Integer extEventReaderKind;
@@ -191,4 +204,6 @@
@ApiModelProperty(value = "閫氶亾鎬婚�氳浜烘暟")
private Integer totalTimes;
+ @ApiModelProperty(value = "鎺у埗鍣ㄨ澶囧敮涓�鎺ュ叆缂栫爜")
+ private String srcParentIndex;
}
--
Gitblit v1.9.3