From ea3eee2bc39a219c94d3dff01ef6bf670bcd6562 Mon Sep 17 00:00:00 2001 From: lihongjie0209 Date: Thu, 18 Apr 2024 16:16:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/lihongjie/coal/script/dto/ScriptDto.java | 3 +++ .../cn/lihongjie/coal/script/entity/ScriptEntity.java | 10 +--------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/main/java/cn/lihongjie/coal/script/dto/ScriptDto.java b/src/main/java/cn/lihongjie/coal/script/dto/ScriptDto.java index 4fe6d28a..43efa00f 100644 --- a/src/main/java/cn/lihongjie/coal/script/dto/ScriptDto.java +++ b/src/main/java/cn/lihongjie/coal/script/dto/ScriptDto.java @@ -1,6 +1,8 @@ package cn.lihongjie.coal.script.dto; import cn.lihongjie.coal.base.dto.CommonDto; +import cn.lihongjie.coal.common.DictCode; +import cn.lihongjie.coal.pojoProcessor.DictTranslate; import lombok.Data; @@ -16,6 +18,7 @@ public class ScriptDto extends CommonDto { @Comment("脚本类型") private String scriptType; + @DictTranslate(dictKey = DictCode.SCRIPT_USAGE) private String usageName; private String usage; } diff --git a/src/main/java/cn/lihongjie/coal/script/entity/ScriptEntity.java b/src/main/java/cn/lihongjie/coal/script/entity/ScriptEntity.java index f8c4b741..e728829e 100644 --- a/src/main/java/cn/lihongjie/coal/script/entity/ScriptEntity.java +++ b/src/main/java/cn/lihongjie/coal/script/entity/ScriptEntity.java @@ -7,7 +7,6 @@ import jakarta.persistence.Entity; import lombok.Data; import org.hibernate.annotations.Comment; -import org.hibernate.annotations.Formula; @Data @Entity @@ -22,14 +21,7 @@ public class ScriptEntity extends CommonEntity { private String usage; - @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 = 'script.usage'\n" - + " and i.code = usage)") - private String usageName; + @Comment("脚本类型") private String scriptType;