From 3815f5a4e08149ddcd05c737ee137d05e0a33ac2 Mon Sep 17 00:00:00 2001 From: lihongjie0209 Date: Thu, 18 Apr 2024 16:16:11 +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/syslog/dto/SysLogDto.java | 3 +++ .../cn/lihongjie/coal/syslog/entity/SysLogEntity.java | 10 +--------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/main/java/cn/lihongjie/coal/syslog/dto/SysLogDto.java b/src/main/java/cn/lihongjie/coal/syslog/dto/SysLogDto.java index 200c82a3..47608c3d 100644 --- a/src/main/java/cn/lihongjie/coal/syslog/dto/SysLogDto.java +++ b/src/main/java/cn/lihongjie/coal/syslog/dto/SysLogDto.java @@ -1,6 +1,8 @@ package cn.lihongjie.coal.syslog.dto; import cn.lihongjie.coal.base.dto.OrgCommonDto; +import cn.lihongjie.coal.common.DictCode; +import cn.lihongjie.coal.pojoProcessor.DictTranslate; import lombok.Data; @@ -10,6 +12,7 @@ import org.hibernate.annotations.Comment; public class SysLogDto extends OrgCommonDto { private String optStatus; + @DictTranslate(dictKey = DictCode.SYSLOG_STATUS) private String optStatusName; @Comment("ip") diff --git a/src/main/java/cn/lihongjie/coal/syslog/entity/SysLogEntity.java b/src/main/java/cn/lihongjie/coal/syslog/entity/SysLogEntity.java index 5cc7f3cc..8ba94ba0 100644 --- a/src/main/java/cn/lihongjie/coal/syslog/entity/SysLogEntity.java +++ b/src/main/java/cn/lihongjie/coal/syslog/entity/SysLogEntity.java @@ -7,7 +7,6 @@ import jakarta.persistence.Entity; import lombok.Data; import org.hibernate.annotations.Comment; -import org.hibernate.annotations.Formula; @Entity @Data @@ -41,14 +40,7 @@ public class SysLogEntity extends OrgBaseEntity { @Comment("操作状态 0 成功 1 失败") private String optStatus; - @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 = 'syslog.status'\n" - + " and i.code = opt_status)") - private String optStatusName; + @Comment("错误堆栈") private String stacktrace;