From aecc6316d0a6bcb3119dc062106deb5a57cdd790 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Tue, 25 May 2021 17:20:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-manage/src/main/java/com/moral/api/entity/Sensor.java | 43 +++++++++++++++++++++++++++----------------
1 files changed, 27 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..c7bf6a6 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,55 @@
/**
* ���������������������������
*/
- 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 Integer maxValue;
+
+ @TableField(exist = false)
+ private Integer minValue;
}
--
Gitblit v1.8.0