From c39c2270fcd63bf2700120cb9d2115027e0b57d2 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Wed, 26 May 2021 14:06:03 +0800
Subject: [PATCH] 因子上下限空字符串判断
---
screen-manage/src/main/java/com/moral/api/entity/Sensor.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 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 1c37b3a..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
@@ -49,6 +49,21 @@
private String code;
/**
+ * ������
+ */
+ private Double upper;
+
+ /**
+ * ������
+ */
+ private Double lower;
+
+ /**
+ * ������������
+ */
+ private String defaultUnitKey;
+
+ /**
* ������������
*/
private Date createTime;
@@ -63,10 +78,16 @@
*/
private String isDelete;
+ @TableField(exist = false)
+ private String unit;
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
+ @TableField(exist = false)
+ private String unitKey;
+
+ @TableField(exist = false)
+ private Integer maxValue;
+
+ @TableField(exist = false)
+ private Integer minValue;
}
--
Gitblit v1.8.0