隐藏任务状态,新增查询全部定时任务接口

xvji-admin/src/main/java/com/xvji/aspect/SysJobSyncAspect.java

@@ -60,7 +60,7 @@ public class SysJobSyncAspect {
             predictTask.setPTaskId(taskId);
             predictTask.setPTaskName(sysJob.getJobName());
             predictTask.setPCronExpression(sysJob.getCronExpression());
-            predictTask.setPTaskStatus(taskStatus);
+            //predictTask.setPTaskStatus(taskStatus);
             predictTaskService.updateById(predictTask);
             log.info("同步预测任务[ID:{}]成功", taskId);
         }else if ("TRAIN_TASK".equals(sysJob.getJobGroup()) && trainTaskService != null) {
@@ -68,7 +68,7 @@ public class SysJobSyncAspect {
             trainTask.setTTaskId(taskId);
             trainTask.setTTaskName(sysJob.getJobName());
             trainTask.setTCronExpression(sysJob.getCronExpression());
-            trainTask.setTTaskStatus(taskStatus);
+            //trainTask.setTTaskStatus(taskStatus);
             trainTaskService.updateById(trainTask);
             log.info("定时任务[ID:{}]同步训练任务[ID:{}]成功", sysJob.getJobId(), taskId);
         } else {

xvji-admin/src/main/java/com/xvji/domain/PredictTask.java

@@ -31,7 +31,7 @@ public class PredictTask {
     /**
      * 任务状态：1成功 0失败 2未运行
      */
-    private Integer pTaskStatus;
+    private Integer pTaskStatus = 0;
 
     /**
      * 任务创建时间：默认当前系统时间

xvji-admin/src/main/java/com/xvji/domain/TrainTask.java

@@ -31,7 +31,7 @@ public class TrainTask {
     /**
      * 任务状态：1成功 0失败 2未运行
      */
-    private Integer tTaskStatus;
+    private Integer tTaskStatus = 0;
 
     /**
      * 任务创建时间：默认当前系统时间

xvji-admin/src/main/java/com/xvji/quartz/TaskQuartzJob.java

@@ -50,7 +50,7 @@ public class TaskQuartzJob implements ApplicationContextAware {
             PredictTaskService predictTaskService = getBean(PredictTaskService.class);
             PredictTask predictTask = new PredictTask();
             predictTask.setPTaskId(taskId.longValue());
-            predictTask.setPTaskStatus(1); // 1-成功
+            //predictTask.setPTaskStatus(1); // 1-成功
             // 记录成功信息和耗时
             long costTime = System.currentTimeMillis() - startTime;
             predictTask.setPRunInfo("执行成功，耗时：" + costTime + "ms");
@@ -63,7 +63,7 @@ public class TaskQuartzJob implements ApplicationContextAware {
             PredictTaskService predictTaskService = getBean(PredictTaskService.class);
             PredictTask predictTask = new PredictTask();
             predictTask.setPTaskId(taskId.longValue());
-            predictTask.setPTaskStatus(0); // 0-失败
+            //predictTask.setPTaskStatus(0); // 0-失败
             // 记录失败原因和异常信息
             long costTime = System.currentTimeMillis() - startTime;
             predictTask.setPRunInfo("执行失败（耗时：" + costTime + "ms）：" + e.getMessage());
@@ -93,7 +93,7 @@ public class TaskQuartzJob implements ApplicationContextAware {
             TrainTaskService trainTaskService = getBean(TrainTaskService.class);
             TrainTask trainTask = new TrainTask();
             trainTask.setTTaskId(taskId.longValue());
-            trainTask.setTTaskStatus(1); // 1-成功
+            //trainTask.setTTaskStatus(1); // 1-成功
             long costTime = System.currentTimeMillis() - startTime;
             trainTask.setTRunInfo("执行成功，耗时：" + costTime + "ms");
 
@@ -110,7 +110,7 @@ public class TaskQuartzJob implements ApplicationContextAware {
             TrainTaskService trainTaskService = getBean(TrainTaskService.class);
             TrainTask trainTask = new TrainTask();
             trainTask.setTTaskId(taskId.longValue());
-            trainTask.setTTaskStatus(0); // 0-失败
+            //trainTask.setTTaskStatus(0); // 0-失败
             long costTime = System.currentTimeMillis() - startTime;
             trainTask.setTRunInfo("执行失败（耗时：" + costTime + "ms）：" + e.getMessage());
 

xvji-admin/src/main/java/com/xvji/service/impl/PredictTaskServiceImpl.java

@@ -42,7 +42,7 @@ public class PredictTaskServiceImpl extends ServiceImpl<PredictTaskMapper, Predi
             predictTask.setPCreateTime(new Date());
         }
         if (predictTask.getPTaskStatus() == null) {
-            predictTask.setPTaskStatus(0); // 0-初始状态
+            //predictTask.setPTaskStatus(0); // 0-初始状态
         }
 
         // 插入预测任务

xvji-admin/src/main/java/com/xvji/service/impl/TrainTaskServiceImpl.java

@@ -43,7 +43,7 @@ public class TrainTaskServiceImpl extends ServiceImpl<TrainTaskMapper, TrainTask
             trainTask.setTCreateTime(new Date()); // 默认当前时间
         }
         if (trainTask.getTTaskStatus() == null) {
-            trainTask.setTTaskStatus(0); // 默认初始状态（1-成功，0-失败）
+            //trainTask.setTTaskStatus(0); // 默认初始状态（1-成功，0-失败）
         }
 
         // 保存训练任务

xvji-admin/src/main/java/com/xvji/web/controller/PredictTaskController.java

@@ -53,18 +53,19 @@ public class PredictTaskController {
             task.setPQuartzTask((String) taskInfo.get("pQuartzTask"));
             task.setPRunInfo((String) taskInfo.get("pRunInfo"));
 
-            Object ptaskStatusObj = taskInfo.get("ptaskStatus");
-            if (ptaskStatusObj != null){
-                try {
-                    Integer ptaskStatus = Integer.parseInt(ptaskStatusObj.toString());
+            //暂时隐藏任务状态
+//            Object ptaskStatusObj = taskInfo.get("ptaskStatus");
+//            if (ptaskStatusObj != null){
+//                try {
+//                    Integer ptaskStatus = Integer.parseInt(ptaskStatusObj.toString());
 //                    if (ptaskStatus != 1 && ptaskStatus != 0 && ptaskStatus != 2){
 //                        return AjaxResult.error("任务状态必须是0,1,2，请检查输入");
 //                    }
-                    task.setPTaskStatus(ptaskStatus);
-                }catch (Exception e){
-                    return AjaxResult.error("传递的任务状态格式不正确");
-                }
-            }
+//                    task.setPTaskStatus(ptaskStatus);
+//                }catch (Exception e){
+//                    return AjaxResult.error("传递的任务状态格式不正确");
+//                }
+//            }
 
             Object pTaskIdObj = taskInfo.get("pTaskId");
             Long manualTaskId = null;
@@ -307,25 +308,25 @@ public class PredictTaskController {
             }
 
             //状态校验
-            Integer pTaskStatus = null;
-            try {
-                Object pTaskStatusObj = taskInfo.get("pTaskStatus");
-                if (pTaskStatusObj != null){
-                    pTaskStatus = Integer.parseInt(pTaskStatusObj.toString());
+//            Integer pTaskStatus = null;
+//            try {
+//                Object pTaskStatusObj = taskInfo.get("pTaskStatus");
+//                if (pTaskStatusObj != null){
+//                    pTaskStatus = Integer.parseInt(pTaskStatusObj.toString());
 //                    if (pTaskStatus != 0 && pTaskStatus != 1 && pTaskStatus != 2){
 //                        return AjaxResult.error("任务状态必须是0,1,2，请检查输入");
 //                    }
-                }
-            }catch (Exception e){
-                return AjaxResult.error("任务状态格式不正确");
-            }
+//                }
+//            }catch (Exception e){
+//                return AjaxResult.error("任务状态格式不正确");
+//            }
 
             task.setPTaskId(pTaskId);
             task.setPTaskName((String) taskInfo.get("pTaskName"));
             task.setPCronExpression((String) taskInfo.get("pCronExpression"));
             task.setPQuartzTask((String) taskInfo.get("pQuartzTask"));
             task.setPRunInfo((String) taskInfo.get("pRunInfo"));
-            task.setPTaskStatus(pTaskStatus);
+//            task.setPTaskStatus(pTaskStatus);
 
             boolean updateTask = predictTaskService.updateById(task);
             if (!updateTask){

xvji-admin/src/main/java/com/xvji/web/controller/TrainTaskController.java

@@ -59,18 +59,18 @@ public class TrainTaskController {
             task.setTRunInfo((String) taskInfo.get("tRunInfo"));
             task.setTAnalysisReport((String) taskInfo.get("tAnalysisReport"));
 
-            Object taskStatusObj = taskInfo.get("tTaskStatus");
-            if (taskStatusObj != null){
-                try {
-                    Integer tTaskStatus = Integer.parseInt(taskStatusObj.toString());
+//            Object taskStatusObj = taskInfo.get("tTaskStatus");
+//            if (taskStatusObj != null){
+//                try {
+//                    Integer tTaskStatus = Integer.parseInt(taskStatusObj.toString());
 //                    if (tTaskStatus != 0 && tTaskStatus != 1 && tTaskStatus != 2) {
 //                        return AjaxResult.error("任务状态必须是0,1,2，请检查输入");
 //                    }
-                    task.setTTaskStatus(tTaskStatus);
-                }catch (Exception e){
-                    return AjaxResult.error("传入的任务状态格式不正确");
-                }
-            }
+//                    task.setTTaskStatus(tTaskStatus);
+//                }catch (Exception e){
+//                    return AjaxResult.error("传入的任务状态格式不正确");
+//                }
+//            }
 
             Object tTaskIdObj = taskInfo.get("tTaskId");
             Long manualTaskId = null;
@@ -331,24 +331,24 @@ public class TrainTaskController {
             }
 
             Object taskStatusObj = taskInfo.get("tTaskStatus");
-            Integer tTaskStatus = null;
-            if (taskStatusObj != null){
-                try {
-                    tTaskStatus = Integer.parseInt(taskStatusObj.toString());
+//            Integer tTaskStatus = null;
+//            if (taskStatusObj != null){
+//                try {
+//                    tTaskStatus = Integer.parseInt(taskStatusObj.toString());
 //                    if (tTaskStatus != 0 && tTaskStatus != 1 && tTaskStatus != 2) {
 //                        return AjaxResult.error("任务状态必须是0,1,2，请检查输入");
 //                    }
-                }catch (Exception e){
-                    return AjaxResult.error("传入的任务状态格式不正确");
-                }
-            }
+//                }catch (Exception e){
+//                    return AjaxResult.error("传入的任务状态格式不正确");
+//                }
+//            }
 
             task.setTTaskName((String) taskInfo.get("tTaskName"));
             task.setTCronExpression((String) taskInfo.get("tCronExpression"));
             task.setTQuartzTask((String) taskInfo.get("tQuartzTask"));
             task.setTRunInfo((String) taskInfo.get("tRunInfo"));
             task.setTAnalysisReport((String) taskInfo.get("tAnalysisReport"));
-            task.setTTaskStatus(tTaskStatus);
+//            task.setTTaskStatus(tTaskStatus);
             task.setTTaskId(tTaskId);
             boolean updateTask = trainTaskService.updateById(task);
             if (!updateTask){

xvji-admin/src/test/java/com/xvji/admin/PredictTaskServiceTest.java

@@ -69,7 +69,7 @@ public class PredictTaskServiceTest {
         updateTask.setPTaskId(TEST_TASK_ID);
         updateTask.setPTaskName("测试编辑-更新后名称"); // 新名称
         updateTask.setPCronExpression("0 15 3 * * ?");  // 新Cron（每天3:15执行）
-        updateTask.setPTaskStatus(0);                   // 状态改为停用
+        //updateTask.setPTaskStatus(0);                   // 状态改为停用
 
         // 2. 执行更新
         boolean updateResult = predictTaskService.updatePredictTask(updateTask);
@@ -132,7 +132,7 @@ public class PredictTaskServiceTest {
         PredictTask newTask = new PredictTask();
         newTask.setPTaskName("测试新增任务");
         newTask.setPCronExpression("0 0 12 * * ?");
-        newTask.setPTaskStatus(1);
+        //newTask.setPTaskStatus(1);
 
         // 2. 构建关联组件
         Component component = new Component();

xvji-quartz/src/main/java/com/xvji/quartz/controller/SysJobController.java

@@ -52,6 +52,15 @@ public class SysJobController extends BaseController
     }
 
     /**
+     * 查询全部定时任务 无分页
+     */
+    @PreAuthorize("@ss.hasPermi('monitor:job:list')")
+    @GetMapping("/getAll")
+    public AjaxResult getAll() {
+        List<SysJob> list = jobService.selectJob();
+        return AjaxResult.success(list);
+    }
+    /**
      * 导出定时任务列表
      */
     @PreAuthorize("@ss.hasPermi('monitor:job:export')")

xvji-quartz/src/main/java/com/xvji/quartz/service/ISysJobService.java

@@ -23,6 +23,11 @@ public interface ISysJobService
     public List<SysJob> selectJobList(SysJob job);
 
     /**
+     * 查询全部定时任务无分页
+     */
+    public List<SysJob> selectJob();
+
+    /**
      * 通过调度任务ID查询调度信息
      * @param jobId 调度任务ID
      * @return 调度任务对象信息

xvji-quartz/src/main/java/com/xvji/quartz/service/impl/SysJobServiceImpl.java

@@ -75,6 +75,15 @@ public class SysJobServiceImpl implements ISysJobService, ApplicationContextAwar
     }
 
     /**
+     * 查询全部定时任务 无分页
+     * @return
+     */
+    @Override
+    public List<SysJob> selectJob() {
+        return jobMapper.selectJobAll();
+    }
+
+    /**
      * 通过调度任务ID查询调度信息
      * 
      * @param jobId 调度任务ID
@@ -212,9 +221,9 @@ public class SysJobServiceImpl implements ISysJobService, ApplicationContextAwar
                     Object predictTask = predictTaskClass.newInstance();
                     // 只更新ID和状态
                     Method setPTaskId = predictTaskClass.getMethod("setPTaskId", Long.class);
-                    Method setPTaskStatus = predictTaskClass.getMethod("setPTaskStatus", Integer.class);
+                    //Method setPTaskStatus = predictTaskClass.getMethod("setPTaskStatus", Integer.class);
                     setPTaskId.invoke(predictTask, taskId);
-                    setPTaskStatus.invoke(predictTask, bizStatus);
+                    //setPTaskStatus.invoke(predictTask, bizStatus);
                     // 调用更新
                     Method updateMethod = predictTaskService.getClass().getMethod("updateById", Object.class);
                     updateMethod.invoke(predictTaskService, predictTask);
@@ -226,9 +235,9 @@ public class SysJobServiceImpl implements ISysJobService, ApplicationContextAwar
                     Class<?> trainTaskClass = Class.forName("com.xvji.domain.TrainTask");
                     Object trainTask = trainTaskClass.newInstance();
                     Method setTTaskId = trainTaskClass.getMethod("setTTaskId", Long.class);
-                    Method setTTaskStatus = trainTaskClass.getMethod("setTTaskStatus", Integer.class);
+                    //Method setTTaskStatus = trainTaskClass.getMethod("setTTaskStatus", Integer.class);
                     setTTaskId.invoke(trainTask, taskId);
-                    setTTaskStatus.invoke(trainTask, bizStatus);
+                    //setTTaskStatus.invoke(trainTask, bizStatus);
                     Method updateMethod = trainTaskService.getClass().getMethod("updateById", Object.class);
                     updateMethod.invoke(trainTaskService, trainTask);
                     log.info("定时任务[ID:{}]暂停，同步训练任务[ID:{}]状态为2（未启用）", jobId, taskId);
@@ -315,12 +324,12 @@ public class SysJobServiceImpl implements ISysJobService, ApplicationContextAwar
                     Method setPTaskId = predictTaskClass.getMethod("setPTaskId", Long.class);
                     Method setPCronExpression = predictTaskClass.getMethod("setPCronExpression", String.class);
                     Method setPTaskName = predictTaskClass.getMethod("setPTaskName", String.class);
-                    Method setPTaskStatus = predictTaskClass.getMethod("setPTaskStatus", Integer.class);
+                    //Method setPTaskStatus = predictTaskClass.getMethod("setPTaskStatus", Integer.class);
 
                     setPTaskId.invoke(predictTask, taskId);
                     setPCronExpression.invoke(predictTask, job.getCronExpression());
                     setPTaskName.invoke(predictTask, job.getJobName() + "[SYNCED]");
-                    setPTaskStatus.invoke(predictTask, taskStatus);
+                    //setPTaskStatus.invoke(predictTask, taskStatus);
 
                     Method updateMethod = predictTaskService.getClass().getMethod("updateById", Object.class);
                     updateMethod.invoke(predictTaskService, predictTask);
@@ -358,12 +367,12 @@ public class SysJobServiceImpl implements ISysJobService, ApplicationContextAwar
                     Method setTTaskId = trainTaskClass.getMethod("setTTaskId", Long.class);
                     Method setTCronExpression = trainTaskClass.getMethod("setTCronExpression", String.class);
                     Method setTTaskName = trainTaskClass.getMethod("setTTaskName", String.class);
-                    Method setTTaskStatus = trainTaskClass.getMethod("setTTaskStatus", Integer.class);
+                    //Method setTTaskStatus = trainTaskClass.getMethod("setTTaskStatus", Integer.class);
 
                     setTTaskId.invoke(trainTask, taskId);
                     setTCronExpression.invoke(trainTask, job.getCronExpression());
                     setTTaskName.invoke(trainTask, job.getJobName() + "[SYNCED]"); // 防循环标记
-                    setTTaskStatus.invoke(trainTask, taskStatus);
+                    //setTTaskStatus.invoke(trainTask, taskStatus);
 
                     // 调用更新
                     Method updateMethod = trainTaskService.getClass().getMethod("updateById", Object.class);