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; + + +}