修改任务类型新增逻辑

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

@@ -53,6 +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());
+                    if (ptaskStatus != 1 && ptaskStatus != 0){
+                        return AjaxResult.error("任务状态必须是0或1，请检查输入");
+                    }
+                    task.setPTaskStatus(ptaskStatus);
+                }catch (Exception e){
+                    return AjaxResult.error("传递的任务状态格式不正确");
+                }
+            }
+
             Object pTaskIdObj = taskInfo.get("pTaskId");
             Long manualTaskId = null;
             if (pTaskIdObj != null) {
@@ -226,6 +239,11 @@ public class PredictTaskController {
         }
     }
 
+    /**
+     * 根据id删除预测任务
+     * @param pTaskId
+     * @return
+     */
     @DeleteMapping("/{pTaskId}")
     public AjaxResult deleteById(@PathVariable Long pTaskId){
         try {

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

@@ -9,6 +9,7 @@ import com.xvji.domain.vo.TrainTaskVO;
 import com.xvji.mapper.TrainTaskMapper;
 import com.xvji.service.ComponentService;
 import com.xvji.service.TrainTaskService;
+import org.aspectj.weaver.loadtime.Aj;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,6 +59,19 @@ 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());
+                    if (ttaskStatus != 0 && ttaskStatus != 1) {
+                        return AjaxResult.error("任务状态必须是0或1，请检查输入");
+                    }
+                    task.setTTaskStatus(ttaskStatus);
+                }catch (Exception e){
+                    return AjaxResult.error("传入的任务状态格式不正确");
+                }
+            }
+
             Object tTaskIdObj = taskInfo.get("tTaskId");
             Long manualTaskId = null;
             if (tTaskIdObj != null) {
@@ -265,6 +279,7 @@ public class TrainTaskController {
     }
 
 
+
     ///////////////////////////////////////////////////////////////////////////
     /**
      * 使用解析后的isEnable，删除错误强转