From b87a9b40a48a4413f325a40b5034f48df3bde5ae Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 30 Jun 2023 16:38:04 +0800
Subject: [PATCH] 补充提交
---
screen-manage/src/main/java/com/moral/api/entity/VersionSensorUnit.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/entity/VersionSensorUnit.java b/screen-manage/src/main/java/com/moral/api/entity/VersionSensorUnit.java
index a4432ec..c733a49 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/VersionSensorUnit.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/VersionSensorUnit.java
@@ -1,11 +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 java.util.Objects;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -36,8 +38,14 @@
private Integer versionId;
/**
- * ������code
+ * ������Id
*/
+ @TableField(exist = false)
+ private Integer sensorId;
+
+ /*
+ * ������code
+ * */
private String sensorCode;
/**
@@ -48,12 +56,12 @@
/*
* ���������
* */
- private Integer maxValue;
+ private Double upper;
/*
* ���������
* */
- private Integer minValue;
+ private Double lower;
/**
* ������������
@@ -70,10 +78,22 @@
*/
private String isDelete;
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ VersionSensorUnit that = (VersionSensorUnit) o;
+ return Objects.equals(sensorCode, that.sensorCode) &&
+ Objects.equals(unitKey, that.unitKey) &&
+ Objects.equals(upper, that.upper) &&
+ Objects.equals(lower, that.lower);
+ }
@Override
- protected Serializable pkVal() {
- return this.id;
+ public int hashCode() {
+
+ return Objects.hash(super.hashCode(), sensorCode, unitKey, upper, lower);
}
+
}
--
Gitblit v1.8.0