From f9f8f90ac63d6ce3274410d3721b173f40db6e41 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 25 Aug 2023 14:12:48 +0800
Subject: [PATCH] chore:过滤海城小时数据

---
 screen-manage/src/main/java/com/moral/api/entity/Sensor.java |   49 +++++++++++++++++++++++++++++++++----------------
 1 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/entity/Sensor.java b/screen-manage/src/main/java/com/moral/api/entity/Sensor.java
index 2a9209a..d83752e 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/Sensor.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/Sensor.java
@@ -1,10 +1,13 @@
 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 lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -14,7 +17,7 @@
  * </p>
  *
  * @author moral
- * @since 2021-05-06
+ * @since 2021-05-08
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -36,47 +39,61 @@
     /**
      * ���������������������������
      */
-    private String sensorKey;
+    @TableField(value = "`desc`")
+    private String desc;
 
     /**
-     * ������������
+     * ������������������
      */
-    private String unit;
+    @TableField(value = "`code`")
+    private String code;
 
     /**
-     * ���������
+     * ������
      */
     private Double upper;
 
     /**
-     * ���������
+     * ������
      */
     private Double lower;
 
     /**
+     * ������������
+     */
+    private String defaultUnitKey;
+
+    /**
      * ������������
      */
-    private LocalDateTime createTime;
+    private Date createTime;
 
     /**
      * ������������
      */
-    private LocalDateTime updateTime;
+    private Date updateTime;
 
     /**
      * ������������
      */
     private String isDelete;
 
-    /**
-     * ������
-     */
-    private String desc;
+    @TableField(exist = false)
+    private String unit;
 
+    @TableField(exist = false)
+    private String unitKey;
 
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
+    @TableField(exist = false)
+    private String showUnit;
+
+    @TableField(exist = false)
+    private String showUnitKey;
+
+    @TableField(exist = false)
+    private String alarmLevel;
+
+    @TableField(exist = false)
+    private String formula;
 
 }

--
Gitblit v1.8.0