mirror of
https://codeup.aliyun.com/64f7d6b8ce01efaafef1e678/coal/coal.git
synced 2026-01-25 07:46:40 +08:00
优化
This commit is contained in:
@@ -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("安装位置")
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user