Merge pull request 'f_paush' (#6) from f_paush into test

Reviewed-on: http://th.local.t-aaron.com:13000/THENG/a-cloud-all/pulls/6

ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/RemoteTaskService.java

@@ -3,6 +3,9 @@ package com.ruoyi.task.api;
 import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.constant.ServiceNameConstants;
 import com.ruoyi.common.core.domain.R;
+import com.ruoyi.task.api.domain.TaskDeleteVO;
+import com.ruoyi.task.api.domain.TaskPauseVO;
+import com.ruoyi.task.api.domain.TaskResumeVO;
 import com.ruoyi.task.api.domain.TaskResultVO;
 import com.ruoyi.task.api.domain.TaskVO;
 import com.ruoyi.task.api.domain.TaskTempVO;
@@ -145,4 +148,37 @@ public interface RemoteTaskService
      */
     @GetMapping("/task/pending-auto")
     R<List<TaskVO>> getPendingTasksForAutoExecute(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 删除任务或计划（逻辑删除，设置 valid 为 false）
+     *
+     * @param deleteVO 删除请求参数
+     * @param source 请求来源
+     * @return 结果
+     */
+    @PostMapping("/task/delete")
+    R<Boolean> deleteTaskOrPlan(@RequestBody TaskDeleteVO deleteVO,
+                                @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 暂停任务或计划
+     *
+     * @param pauseVO 暂停请求参数
+     * @param source 请求来源
+     * @return 结果
+     */
+    @PostMapping("/task/pause")
+    R<Boolean> pauseTaskOrPlan(@RequestBody TaskPauseVO pauseVO,
+                               @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 恢复任务或计划
+     *
+     * @param resumeVO 恢复请求参数
+     * @param source 请求来源
+     * @return 结果
+     */
+    @PostMapping("/task/resume")
+    R<Boolean> resumeTaskOrPlan(@RequestBody TaskResumeVO resumeVO,
+                                @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 }

ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskDeleteVO.java

@@ -0,0 +1,24 @@
+package com.ruoyi.task.api.domain;
+
+public class TaskDeleteVO {
+
+    private Long planId;
+
+    private Long taskId;
+
+    public Long getPlanId() {
+        return planId;
+    }
+
+    public void setPlanId(Long planId) {
+        this.planId = planId;
+    }
+
+    public Long getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(Long taskId) {
+        this.taskId = taskId;
+    }
+}

ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskPauseVO.java

@@ -0,0 +1,24 @@
+package com.ruoyi.task.api.domain;
+
+public class TaskPauseVO {
+
+    private Long planId;
+
+    private Long taskId;
+
+    public Long getPlanId() {
+        return planId;
+    }
+
+    public void setPlanId(Long planId) {
+        this.planId = planId;
+    }
+
+    public Long getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(Long taskId) {
+        this.taskId = taskId;
+    }
+}

ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskResumeVO.java

@@ -0,0 +1,24 @@
+package com.ruoyi.task.api.domain;
+
+public class TaskResumeVO {
+
+    private Long planId;
+
+    private Long taskId;
+
+    public Long getPlanId() {
+        return planId;
+    }
+
+    public void setPlanId(Long planId) {
+        this.planId = planId;
+    }
+
+    public Long getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(Long taskId) {
+        this.taskId = taskId;
+    }
+}

ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/enums/StatusEnum.java

@@ -9,7 +9,8 @@ public enum StatusEnum {
     RUNNING("running", "执行中"),
     COMPLETED("completed", "已完成"),
     FAILED("failed", "失败"),
-    CANCELED("canceled", "已取消");
+    CANCELED("canceled", "已取消"),
+    PAUSE("pause", "已暂停");
 
     private final String code;
     private final String name;

ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/factory/RemoteTaskFallbackFactory.java

@@ -2,6 +2,9 @@ package com.ruoyi.task.api.factory;
 
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.task.api.RemoteTaskService;
+import com.ruoyi.task.api.domain.TaskDeleteVO;
+import com.ruoyi.task.api.domain.TaskPauseVO;
+import com.ruoyi.task.api.domain.TaskResumeVO;
 import com.ruoyi.task.api.domain.TaskResultVO;
 import com.ruoyi.task.api.domain.TaskVO;
 import com.ruoyi.task.api.domain.TaskTempVO;
@@ -93,6 +96,21 @@ public class RemoteTaskFallbackFactory implements FallbackFactory<RemoteTaskServ
             public R<List<TaskVO>> getPendingTasksForAutoExecute(String source) {
                 return R.ok(Collections.emptyList());
             }
+
+            @Override
+            public R<Boolean> deleteTaskOrPlan(TaskDeleteVO deleteVO, String source) {
+                return R.fail("删除任务或计划失败");
+            }
+
+            @Override
+            public R<Boolean> pauseTaskOrPlan(TaskPauseVO pauseVO, String source) {
+                return R.fail("暂停任务或计划失败");
+            }
+
+            @Override
+            public R<Boolean> resumeTaskOrPlan(TaskResumeVO resumeVO, String source) {
+                return R.fail("恢复任务或计划失败");
+            }
         };
     }
 }