From dcc092a20202d51e8fbb6694d429a09a340b580a Mon Sep 17 00:00:00 2001
From: beeajax <1105173470@qq.com>
Date: Thu, 29 Jun 2023 08:34:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TaskConfigServiceImpl.java            |  7 +++++++
 .../main/java/com/docus/server/entity/TaskConfig.java  | 10 +++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TaskConfigServiceImpl.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TaskConfigServiceImpl.java
index d3ff6a4..1cd7623 100644
--- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TaskConfigServiceImpl.java
+++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TaskConfigServiceImpl.java
@@ -1,5 +1,7 @@
 package com.docus.server.archivefile.service.impl;
 
+import com.docus.core.util.Func;
+import com.docus.infrastructure.redis.service.IdService;
 import com.docus.infrastructure.web.request.SearchRequest;
 import com.docus.infrastructure.web.response.PageResult;
 import com.docus.server.archivefile.infrastructure.dao.ITaskConfigDao;
@@ -16,6 +18,8 @@ import java.util.List;
 public class TaskConfigServiceImpl implements ITaskConfigService {
     @Resource
     private ITaskConfigDao taskConfigDao;
+    @Resource
+    private IdService idService;
 
     @Transactional(rollbackFor = Exception.class)
     @Override
@@ -42,6 +46,9 @@ public class TaskConfigServiceImpl implements ITaskConfigService {
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean updateTaskConfig(TaskConfig taskConfig) {
+        if (Func.isNull(taskConfig.getId())) {
+            taskConfig.setId(idService.getDateSeq());
+        }
         return taskConfigDao.saveOrUpdate(taskConfig);
     }
 
diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/TaskConfig.java b/docus-client-interface/src/main/java/com/docus/server/entity/TaskConfig.java
index 1d3e73b..a035b86 100644
--- a/docus-client-interface/src/main/java/com/docus/server/entity/TaskConfig.java
+++ b/docus-client-interface/src/main/java/com/docus/server/entity/TaskConfig.java
@@ -20,7 +20,7 @@ import java.util.List;
 @JsonIgnoreProperties(value = {"incPeriodTimes", "allPeriodTimes", "offset", "pageNum"})
 public class TaskConfig {
     @ApiModelProperty(value = "主键")
-    private String id;
+    private Long id;
 
     /**
      * 任务名字
@@ -95,11 +95,19 @@ public class TaskConfig {
      */
     @ApiModelProperty(value = "上回失败信息")
     private String lastErrorMsg;
+
     @ApiModelProperty(value = "创建时间")
+    @TableField("create_time")
     private Date createTime;
+
     @ApiModelProperty(value = "更新时间")
+    @TableField("update_time")
     private Date updateTime;
 
+    @ApiModelProperty(value = "是否有重试详情日志")
+    @TableField(exist = false)
+    private boolean haveRetryLog;
+
     public List<PeriodTime> getAllPeriodTimes() {
         List<PeriodTime> periodTimes = DateSpiltUtil.spiltDate(this.getStartTime(), this.endTime, 1000 * spiltPeriod);
         return periodTimes;