From e402f34de7b1387a73474861d245d5873803e150 Mon Sep 17 00:00:00 2001 From: lihongjie0209 Date: Thu, 21 Mar 2024 21:42:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=8E=AF=E5=A2=83=E5=9B=A0?= =?UTF-8?q?=E5=AD=90=E9=85=8D=E7=BD=AE=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coal/emDevice/entity/EmDeviceEntity.java | 7 +++++++ .../emDevice/entity/EmDeviceItemConfig.java | 20 +++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 src/main/java/cn/lihongjie/coal/emDevice/entity/EmDeviceItemConfig.java diff --git a/src/main/java/cn/lihongjie/coal/emDevice/entity/EmDeviceEntity.java b/src/main/java/cn/lihongjie/coal/emDevice/entity/EmDeviceEntity.java index eb092321..f1ada3c5 100644 --- a/src/main/java/cn/lihongjie/coal/emDevice/entity/EmDeviceEntity.java +++ b/src/main/java/cn/lihongjie/coal/emDevice/entity/EmDeviceEntity.java @@ -4,6 +4,7 @@ import cn.lihongjie.coal.base.entity.OrgCommonEntity; import cn.lihongjie.coal.emDeviceSupplier.entity.EmDeviceSupplierEntity; import cn.lihongjie.coal.thirdAccount.entity.ThirdAccountEntity; +import jakarta.persistence.ElementCollection; import jakarta.persistence.Entity; import jakarta.persistence.ManyToOne; @@ -13,6 +14,8 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.Comment; import org.hibernate.annotations.Formula; +import java.util.List; + @Data @Entity public class EmDeviceEntity extends OrgCommonEntity { @@ -47,4 +50,8 @@ public class EmDeviceEntity extends OrgCommonEntity { + " and d.code = 'archiveStatus'\n" + " and i.code = archive_status)") private String archiveStatusName; + + + @ElementCollection + private List itemConfig; } diff --git a/src/main/java/cn/lihongjie/coal/emDevice/entity/EmDeviceItemConfig.java b/src/main/java/cn/lihongjie/coal/emDevice/entity/EmDeviceItemConfig.java new file mode 100644 index 00000000..89c13641 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/emDevice/entity/EmDeviceItemConfig.java @@ -0,0 +1,20 @@ +package cn.lihongjie.coal.emDevice.entity; + +import jakarta.persistence.Embeddable; + +import lombok.Data; + +@Data +@Embeddable +public class EmDeviceItemConfig { + + + private String code; + private String name; + private Double minVal; + private Double maxVal; + + private Boolean enableAlter; + + +}