From df67fe187fae9ce9f486ea2f14c95a14d843e4a1 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 15 Nov 2023 14:23:56 +0800
Subject: [PATCH] fix：增加导出功能
---
screen-job/src/main/java/com/moral/api/entity/Device.java | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/entity/Device.java b/screen-job/src/main/java/com/moral/api/entity/Device.java
index 842a27f..ddfb10d 100644
--- a/screen-job/src/main/java/com/moral/api/entity/Device.java
+++ b/screen-job/src/main/java/com/moral/api/entity/Device.java
@@ -1,10 +1,14 @@
package com.moral.api.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -18,6 +22,7 @@
*/
@Data
@EqualsAndHashCode(callSuper = false)
+@JsonIgnoreProperties(ignoreUnknown = true)
public class Device extends Model<Device> {
private static final long serialVersionUID = 1L;
@@ -74,6 +79,11 @@
private Integer organizationId;
/**
+ * ���������/���������/���������������������gov_monitor_point���guid������
+ */
+ private String guid;
+
+ /**
* ������������id
*/
private Integer deviceVersionId;
@@ -101,17 +111,20 @@
/**
* ������(������)������
*/
- private LocalDateTime createTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
/**
* ������������
*/
- private LocalDateTime updateTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
/**
* ������������
*/
- private LocalDateTime installTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date installTime;
/**
* ������������,0���������������1���������
@@ -123,10 +136,19 @@
*/
private String extend;
+ /**
+ * ���������������code
+ */
+ private Integer townCode;
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
+ /*
+ * ������������
+ * */
+ @TableField(exist = false)
+ private Version version;
+ /*
+ *������
+ * */
+ private Integer devNum;
}
--
Gitblit v1.8.0