From e137482b5386be49830b48c352672e2d8a83df16 Mon Sep 17 00:00:00 2001
From: lihongjie0209 <lihongjie0209@gmail.com>
Date: Thu, 18 Apr 2024 15:25:09 +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

---
 .../coal/cronJobLog/dto/CronJobLogDto.java          | 13 +++++++++++--
 .../coal/cronJobLog/entity/CronJobLogEntity.java    |  9 +--------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/main/java/cn/lihongjie/coal/cronJobLog/dto/CronJobLogDto.java b/src/main/java/cn/lihongjie/coal/cronJobLog/dto/CronJobLogDto.java
index 0a217299..d499f140 100644
--- a/src/main/java/cn/lihongjie/coal/cronJobLog/dto/CronJobLogDto.java
+++ b/src/main/java/cn/lihongjie/coal/cronJobLog/dto/CronJobLogDto.java
@@ -1,11 +1,13 @@
 package cn.lihongjie.coal.cronJobLog.dto;
 
 import cn.lihongjie.coal.base.dto.CommonDto;
+import cn.lihongjie.coal.common.DictCode;
 import cn.lihongjie.coal.cronJob.dto.CronJobDto;
+import cn.lihongjie.coal.pojoProcessor.DictTranslate;
 
 import lombok.Data;
 
-import org.hibernate.annotations.Formula;
+import org.hibernate.annotations.Comment;
 
 import java.time.LocalDateTime;
 
@@ -22,8 +24,15 @@ public class CronJobLogDto extends CommonDto {
     private LocalDateTime startTime;
     private LocalDateTime endTime;
 
-    @Formula("(EXTRACT(EPOCH FROM (endTime - startTime)) * 1000)")
     private long time;
 
     private String logs;
+
+
+    @Comment("执行状态")
+    private String execStatus;
+
+
+    @DictTranslate(dictKey =  DictCode.CRONJOB_EXECSTATUS)
+    private String execStatusName;
 }
diff --git a/src/main/java/cn/lihongjie/coal/cronJobLog/entity/CronJobLogEntity.java b/src/main/java/cn/lihongjie/coal/cronJobLog/entity/CronJobLogEntity.java
index 1211c188..865aaeca 100644
--- a/src/main/java/cn/lihongjie/coal/cronJobLog/entity/CronJobLogEntity.java
+++ b/src/main/java/cn/lihongjie/coal/cronJobLog/entity/CronJobLogEntity.java
@@ -35,14 +35,7 @@ public class CronJobLogEntity extends CommonEntity {
     private String execStatus;
 
 
-    @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 = 'cronJob.execStatus'\n"
-                    + "  and i.code = exec_status)")
-    private String execStatusName;
+
     
     
 }