diff --git a/src/main/java/cn/lihongjie/coal/meter/dto/MeterDto.java b/src/main/java/cn/lihongjie/coal/meter/dto/MeterDto.java index 047ffa03..1b05a42a 100644 --- a/src/main/java/cn/lihongjie/coal/meter/dto/MeterDto.java +++ b/src/main/java/cn/lihongjie/coal/meter/dto/MeterDto.java @@ -1,6 +1,8 @@ package cn.lihongjie.coal.meter.dto; import cn.lihongjie.coal.base.dto.OrgCommonDto; +import cn.lihongjie.coal.common.DictCode; +import cn.lihongjie.coal.pojoProcessor.DictTranslate; import lombok.Data; @@ -12,6 +14,7 @@ public class MeterDto extends OrgCommonDto { private String type; @Comment("初始值") private Double initValue; + @DictTranslate(dictKey = DictCode.METER_TYPE) private String typeName; @Comment("安装位置") diff --git a/src/main/java/cn/lihongjie/coal/meter/entity/MeterEntity.java b/src/main/java/cn/lihongjie/coal/meter/entity/MeterEntity.java index 04553ef1..21dc3c66 100644 --- a/src/main/java/cn/lihongjie/coal/meter/entity/MeterEntity.java +++ b/src/main/java/cn/lihongjie/coal/meter/entity/MeterEntity.java @@ -7,7 +7,6 @@ import jakarta.persistence.Entity; import lombok.Data; import org.hibernate.annotations.Comment; -import org.hibernate.annotations.Formula; @Data @Entity @@ -19,14 +18,7 @@ public class MeterEntity extends OrgCommonEntity { @Comment("初始值") private Double initValue; - @Formula( - "(select i.name\n" - + "from t_dictionary d,\n" - + " t_dictionary_item i\n" - + "where d.id = i.dictionary_id\n" - + " and d.code = 'meter.type'\n" - + " and i.code = type)") - private String typeName; + @Comment("安装位置") private String location;