From bef0de137de24d42d9523457da2d561d086c5cfa Mon Sep 17 00:00:00 2001
From: Zhujx <Zhujx@Raytrontech.com>
Date: Mon, 28 Jul 2025 14:35:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=8A=A8=E6=80=81=E8=B0=83=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../schedule/enums/TaskStatusEnum.java        |  3 ++-
 .../schedule/mapper/ScheduledTaskMapper.java  |  4 +++
 .../DynamicTaskSchedulerServiceImpl.java      | 17 +++++++++++++
 .../service/IDynamicTaskSchedulerService.java |  4 +++
 .../resources/mapper/ScheduledTaskMapper.xml  | 25 ++++++++++++++++---
 5 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/xservice-schedule-starter/src/main/java/com/xiang/xservice/schedule/enums/TaskStatusEnum.java b/xservice-schedule-starter/src/main/java/com/xiang/xservice/schedule/enums/TaskStatusEnum.java
index cd266b3..cd2d591 100644
--- a/xservice-schedule-starter/src/main/java/com/xiang/xservice/schedule/enums/TaskStatusEnum.java
+++ b/xservice-schedule-starter/src/main/java/com/xiang/xservice/schedule/enums/TaskStatusEnum.java
@@ -7,7 +7,8 @@ public enum TaskStatusEnum {
     UN_START(1, "未开始"),
     PROCEED(2, "进行中"),
     FINISHED(3, "已完成"),
-    CANCELED(4, "取消")
+    CANCELED(4, "取消"),
+    ERROR(5, "错误"),
     ;
 
     private final Integer code;
diff --git a/xservice-schedule-starter/src/main/java/com/xiang/xservice/schedule/mapper/ScheduledTaskMapper.java b/xservice-schedule-starter/src/main/java/com/xiang/xservice/schedule/mapper/ScheduledTaskMapper.java
index 302046c..3e4172a 100644
--- a/xservice-schedule-starter/src/main/java/com/xiang/xservice/schedule/mapper/ScheduledTaskMapper.java
+++ b/xservice-schedule-starter/src/main/java/com/xiang/xservice/schedule/mapper/ScheduledTaskMapper.java
@@ -5,6 +5,8 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Mapper
 @Repository
 public interface ScheduledTaskMapper {
@@ -14,4 +16,6 @@ public interface ScheduledTaskMapper {
     int update(ScheduledTaskEntity entity);
 
     ScheduledTaskEntity getTask(@Param("id") Long taskId);
+
+    List<ScheduledTaskEntity> getTaskList(ScheduledTaskEntity entity);
 }
diff --git a/xservice-schedule-starter/src/main/java/com/xiang/xservice/schedule/service/DynamicTaskSchedulerServiceImpl.java b/xservice-schedule-starter/src/main/java/com/xiang/xservice/schedule/service/DynamicTaskSchedulerServiceImpl.java
index 69e7178..c6974a2 100644
--- a/xservice-schedule-starter/src/main/java/com/xiang/xservice/schedule/service/DynamicTaskSchedulerServiceImpl.java
+++ b/xservice-schedule-starter/src/main/java/com/xiang/xservice/schedule/service/DynamicTaskSchedulerServiceImpl.java
@@ -7,6 +7,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Objects;
 
 @Service
@@ -62,4 +63,20 @@ public class DynamicTaskSchedulerServiceImpl implements IDynamicTaskSchedulerSer
         }
         return Boolean.FALSE;
     }
+
+    @Override
+    public Boolean errTask(Long taskId) {
+        ScheduledTaskEntity task = scheduledTaskMapper.getTask(taskId);
+        if (Objects.nonNull(task)) {
+            task.setStatus(TaskStatusEnum.ERROR.getCode());
+            task.setUpdatedTime(LocalDateTime.now());
+            return scheduledTaskMapper.update(task) > 0;
+        }
+        return Boolean.FALSE;
+    }
+
+    @Override
+    public List<ScheduledTaskEntity> getTaskList(ScheduledTaskEntity entity) {
+        return scheduledTaskMapper.getTaskList(entity);
+    }
 }
diff --git a/xservice-schedule-starter/src/main/java/com/xiang/xservice/schedule/service/IDynamicTaskSchedulerService.java b/xservice-schedule-starter/src/main/java/com/xiang/xservice/schedule/service/IDynamicTaskSchedulerService.java
index c2a91da..4434659 100644
--- a/xservice-schedule-starter/src/main/java/com/xiang/xservice/schedule/service/IDynamicTaskSchedulerService.java
+++ b/xservice-schedule-starter/src/main/java/com/xiang/xservice/schedule/service/IDynamicTaskSchedulerService.java
@@ -2,6 +2,8 @@ package com.xiang.xservice.schedule.service;
 
 import com.xiang.xservice.schedule.entity.ScheduledTaskEntity;
 
+import java.util.List;
+
 
 public interface IDynamicTaskSchedulerService {
     Boolean saveTask(ScheduledTaskEntity entity);
@@ -10,4 +12,6 @@ public interface IDynamicTaskSchedulerService {
     Boolean updateProcess(Long taskId);
     Boolean cancelTask(Long taskId);
     Boolean finishTask(Long taskId);
+    Boolean errTask(Long taskId);
+    List<ScheduledTaskEntity> getTaskList(ScheduledTaskEntity entity);
 }
diff --git a/xservice-schedule-starter/src/main/resources/mapper/ScheduledTaskMapper.xml b/xservice-schedule-starter/src/main/resources/mapper/ScheduledTaskMapper.xml
index f3db068..9bef30b 100644
--- a/xservice-schedule-starter/src/main/resources/mapper/ScheduledTaskMapper.xml
+++ b/xservice-schedule-starter/src/main/resources/mapper/ScheduledTaskMapper.xml
@@ -8,10 +8,10 @@
         <result column="task_name" property="taskName"/>
         <result column="task_group" property="taskGroup"/>
         <result column="run_time" property="runTime"/>
-        <result column="parameters" property="status"/>
-        <result column="create_time" property="parameters"/>
-        <result column="update_time" property="createdTime"/>
-        <result column="status" property="updatedTime"/>
+        <result column="status" property="status"/>
+        <result column="parameters" property="parameters"/>
+        <result column="create_time" property="createdTime"/>
+        <result column="update_time" property="updatedTime"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -41,5 +41,22 @@
         select <include refid="Base_Column_List"/>
         from script_schedule_task where id = #{id}
     </select>
+    <select id="getTaskList" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from script_schedule_task
+        <where>
+            1=1
+            <if test="taskName != null and taskName != ''">
+                and task_name = #{taskName}
+            </if>
+            <if test="taskGroup != null and taskGroup != ''">
+                and task_group = #{taskGroup}
+            </if>
+            <if test="status != null">
+                and status = #{status}
+            </if>
+        </where>
+    </select>
 
 </mapper>
\ No newline at end of file