From 5981f3413b9db0dea9ef7b5e33fd39d214ebb636 Mon Sep 17 00:00:00 2001 From: kaiyu <404897439@qq.com> Date: Wed, 23 Jun 2021 14:19:47 +0800 Subject: [PATCH] screen-manage 增加功能: 修改型号的因子,组织型号关系表也进行维护 --- screen-manage/src/main/java/com/moral/api/entity/VersionSensorUnit.java | 36 +++++++++++++++++++++++++++++++++++- 1 files changed, 35 insertions(+), 1 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 402f9cf..0e2ee21 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,14 +38,30 @@ private Integer versionId; /** - * ������code + * ������Id */ + @TableField(exist = false) + private Integer sensorId; + + /* + * ������code + * */ private String sensorCode; /** * ������������key */ private String unitKey; + + /* + * ��������� + * */ + private Double upper; + + /* + * ��������� + * */ + private Double lower; /** * ������������ @@ -60,6 +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 + public int hashCode() { + + return Objects.hash(super.hashCode(), sensorCode, unitKey, upper, lower); + } @Override protected Serializable pkVal() { -- Gitblit v1.8.0