From 43942a545271345ce26e40d82bb97138c5ea7611 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 28 六月 2024 13:54:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java | 47 +++++++++++++++++++++++++++++++++++------------
1 files changed, 35 insertions(+), 12 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
index 3b3b815..96da8e3 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
@@ -1,7 +1,6 @@
package com.doumee.dao.business.model;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -10,16 +9,17 @@
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
+import java.math.BigDecimal;
/**
* 鏈堝彴淇℃伅琛�
* @author 姹熻箘韫�
- * @since 2024/04/28 16:06
+ * @date 2024/06/28 10:03
*/
@Data
@ApiModel("鏈堝彴淇℃伅琛�")
@TableName("`platform`")
-public class Platform extends LoginUserModel {
+public class Platform {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@@ -32,6 +32,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,7 +41,8 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- private Date editDate;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
@@ -74,14 +76,6 @@
@ExcelColumn(name="宸ヤ綔缁撴潫鏃堕棿")
private String endTime;
- @ApiModelProperty(value = "鍏宠仈鏈堝彴鐩戞帶鐐硅澶囩紪鐮�(鍏宠仈devices)锛屽涓敤鑻辨枃閫楀彿闅斿紑")
- @ExcelColumn(name="鍏宠仈鏈堝彴鐩戞帶鐐硅澶囩紪鐮�(鍏宠仈devices)锛屽涓敤鑻辨枃閫楀彿闅斿紑")
- private String deviceIds;
-
- @ApiModelProperty(value = "鍏宠仈鏈堝彴灞忓箷缂栫爜闆嗗悎锛堝叧鑱攄evices锛夛紝澶氫釜鐢ㄨ嫳鏂囬�楀彿闅斿紑")
- @ExcelColumn(name="鍏宠仈鏈堝彴灞忓箷缂栫爜闆嗗悎锛堝叧鑱攄evices锛夛紝澶氫釜鐢ㄨ嫳鏂囬�楀彿闅斿紑")
- private String screenIds;
-
@ApiModelProperty(value = "鍚屾椂浣滀笟鏁伴噺", example = "1")
@ExcelColumn(name="鍚屾椂浣滀笟鏁伴噺")
private Integer workingNum;
@@ -96,6 +90,7 @@
@ApiModelProperty(value = "鏈�鍚庝簨浠舵帹閫佹椂闂�")
@ExcelColumn(name="鏈�鍚庝簨浠舵帹閫佹椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date lastEventTime;
@ApiModelProperty(value = "鐩戞帶鐐瑰悕绉帮紝澶氫釜鐢ㄨ嫳鏂囬�楀彿闅斿紑")
@@ -106,4 +101,32 @@
@ExcelColumn(name="鏈堝彴灞忓箷鍚嶇О锛屽涓敤鑻辨枃閫楀彿闅斿紑")
private String screenName;
+ @ApiModelProperty(value = "娴峰悍鏍囪瘑")
+ @ExcelColumn(name="娴峰悍鏍囪瘑")
+ private String hkId;
+
+ @ApiModelProperty(value = "鍏宠仈鎵跨鍏徃")
+ @ExcelColumn(name="鍏宠仈鎵跨鍏徃")
+ private String companys;
+
+ @ApiModelProperty(value = "X鍧愭爣", example = "1")
+ @ExcelColumn(name="X鍧愭爣")
+ private BigDecimal xpos;
+
+ @ApiModelProperty(value = "Y鍧愭爣", example = "1")
+ @ExcelColumn(name="Y鍧愭爣")
+ private BigDecimal ypos;
+
+ @ApiModelProperty(value = "瀹藉害", example = "1")
+ @ExcelColumn(name="瀹藉害")
+ private BigDecimal width;
+
+ @ApiModelProperty(value = "楂樺害", example = "1")
+ @ExcelColumn(name="楂樺害")
+ private BigDecimal height;
+
+ @ApiModelProperty(value = "瑙掑害", example = "1")
+ @ExcelColumn(name="瑙掑害")
+ private BigDecimal angle;
+
}
--
Gitblit v1.9.3