From ffe9d36074938e837f46afcd30b99788a7fbb4a0 Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Fri, 04 Mar 2022 16:02:40 +0800 Subject: [PATCH] 烟气流速,流量校准 --- screen-manage/src/main/java/com/moral/api/entity/VersionSensorUnit.java | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 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 33c428e..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 @@ -7,6 +7,7 @@ import java.time.LocalDateTime; import java.io.Serializable; import java.util.Date; +import java.util.Objects; import lombok.Data; import lombok.EqualsAndHashCode; @@ -77,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