From 649f2395f80c6e435b18cf6857b66ab7a8e95506 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 27 二月 2024 14:18:42 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/DeviceEventDTO.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 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..35b60fb 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;
@@ -36,21 +37,26 @@
@ApiModelProperty(value = "浜嬩欢鍞竴鏍囪瘑锛屽悓涓�浜嬩欢鑻ヤ笂鎶ュ娆★紝鍒欎笂鎶ヤ簨浠剁殑eventId鐩稿悓")
private String eventId;
- @ApiModelProperty(value = "浜嬩欢绫诲瀷")
- private String eventType;
+ @ApiModelProperty(value = "浜嬩欢绫诲瀷 -- 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")
private String happenTime;
@ApiModelProperty(value = "闂ㄧ鐐瑰敮涓�鎺ュ叆缂栫爜")
private String srcIndex;
- @ApiModelProperty(value = "闂ㄧ鍚嶇О")
- @ExcelColumn(name="闂ㄧ鍚嶇О")
+ @ApiModelProperty(value = "闂ㄧ鐐瑰悕绉�")
private String srcName;
+
+ @ApiModelProperty(value = "闂ㄧ鍚嶇О")
+ private String devName;
@ApiModelProperty(value = "浜嬩欢鐘舵��,0-鐬椂1-寮�濮�2-鍋滄4-浜嬩欢鑱斿姩缁撴灉鏇存柊5-浜嬩欢鍥剧墖寮傛涓婁紶")
private Integer status;
@@ -102,7 +108,7 @@
private String personPhone;
@ApiModelProperty(value = "浜哄憳绫诲瀷")
- private String personType;
+ private Integer personType;
@ApiModelProperty(value = "浜哄憳韬唤璇佸彿")
private String personIdcardDecode;
@@ -191,4 +197,6 @@
@ApiModelProperty(value = "閫氶亾鎬婚�氳浜烘暟")
private Integer totalTimes;
+ @ApiModelProperty(value = "鎺у埗鍣ㄨ澶囧敮涓�鎺ュ叆缂栫爜")
+ private String srcParentIndex;
}
--
Gitblit v1.9.3