修改虚节点拉取不赋值依赖和状态问题

byit-myth-admin/src/main/resources/logback-spring.xml

@@ -58,13 +58,13 @@
         </encoder>
     </appender>
 
-    <logger name="com.byit.thread" level="debug" additivity="false">
+    <logger name="com.byit.thread" level="info" additivity="false">
         <appender-ref ref="console"/>
     </logger>
-    <logger name="com.byit.selector" level="debug" additivity="false">
+    <logger name="com.byit.selector" level="info" additivity="false">
         <appender-ref ref="console"/>
     </logger>
-    <logger name="com.byit.task" level="debug" additivity="false">
+    <logger name="com.byit.task" level="info" additivity="false">
         <appender-ref ref="console"/>
     </logger>
 

byit-myth-core/myth-admin-core/src/main/java/com/byit/service/mapservice/impl/RunRecordingAndJobTaskServiceImpl.java

 package com.byit.service.mapservice.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.byit.enums.EmailEnum;
 import com.byit.enums.FlowPropertyEnum;
 import com.byit.enums.NodeRunStatusPropertyEnum;
 import com.byit.enums.RunRecordingEnum;
+import com.byit.job.utils.DateUtil;
 import com.byit.model.*;
 import com.byit.service.*;
 import com.byit.service.mapservice.RunRecordingAndJobTaskService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -33,10 +36,14 @@ public class RunRecordingAndJobTaskServiceImpl implements RunRecordingAndJobTask
     private final JobTaskService jobTaskService;
     private final WaitingRecordService waitingRecordService;
     private final WaitingTaskService taskService;
+    /**
+     * 节点依赖查询操作
+     */
+    private final NodeDependencyService nodeDependencyService;
 
     public RunRecordingAndJobTaskServiceImpl(JobTaskRunLogService jobTaskRunLogService, NodeService nodeService,
                                              FlowService flowService, RunRecordingService runRecordingService,
-                                             JobTaskService jobTaskService, WaitingRecordService waitingRecordService, WaitingTaskService taskService) {
+                                             JobTaskService jobTaskService, WaitingRecordService waitingRecordService, WaitingTaskService taskService, NodeDependencyService nodeDependencyService) {
         this.jobTaskRunLogService = jobTaskRunLogService;
         this.nodeService = nodeService;
         this.flowService = flowService;
@@ -44,6 +51,7 @@ public class RunRecordingAndJobTaskServiceImpl implements RunRecordingAndJobTask
         this.jobTaskService = jobTaskService;
         this.waitingRecordService = waitingRecordService;
         this.taskService = taskService;
+        this.nodeDependencyService = nodeDependencyService;
     }
     /**
      * 保存节点日志
@@ -100,6 +108,7 @@ public class RunRecordingAndJobTaskServiceImpl implements RunRecordingAndJobTask
                 .triggerTime(equals?mainFlow.getTriggerNextTime():virFlow.getTriggerNextTime())
                 .principal(virFlow.getPrincipal())
                 .startTime(new Date())
+                .flowNodeCount(virFlow.getFlowNodeCount())
                 .isAlarm(EmailEnum.IS_ALARM_NO.getCode())
                 .isInner(FlowPropertyEnum.IS_INNER.getCode())
                 .failFast(RunRecordingEnum.FAIL_FAST_NO.getCode()).build();
@@ -110,6 +119,12 @@ public class RunRecordingAndJobTaskServiceImpl implements RunRecordingAndJobTask
         List<JobTask> jobTasks = nodeByFlowIdAndVersionName.stream()
                 .map(node -> {
                     JobTask task = new JobTask();
+                    List<Integer> dependIdByNodeId = nodeDependencyService.findDependIdByNodeId(jobTask.getNodeId());
+                    if(CollectionUtil.isNotEmpty(dependIdByNodeId)){
+                        String parentIds = StringUtils.join(dependIdByNodeId, ",");
+                        task.setNodeDepend(parentIds);
+                    }
+
                     BeanUtils.copyProperties(node, task);
                     if (equals) {
                         task.setTriggerTime(mainFlow.getTriggerNextTime());
@@ -117,6 +132,7 @@ public class RunRecordingAndJobTaskServiceImpl implements RunRecordingAndJobTask
                         task.setTriggerTime(virFlow.getTriggerNextTime());
                     }
                     task.setRunId(jobTask.getRunId());
+                    task.setTriggerStatus("1");
                     return task;
                 }).collect(Collectors.toList());
         jobTaskService.saveJobTasks(jobTasks);
@@ -148,4 +164,8 @@ public class RunRecordingAndJobTaskServiceImpl implements RunRecordingAndJobTask
         waitingRecordService.updateById(waitingRecord);
 
     }
+
+    public static void main(String[] args) {
+        System.out.println(DateUtil.dateFormat(new Date(1584420360000L), "yyyy-MM-dd HH mm ss"));
+    }
 }

byit-myth-core/myth-core-common/src/main/java/com/byit/job/utils/DateUtil.java

@@ -25,9 +25,9 @@ public class DateUtil {
         LocalDateTime localDateTime = dateToLocalDateTime(date);
         String dateFormat;
         if(StringUtils.isNotBlank(formatStr)){
-            dateFormat = localDateTime.format(DateTimeFormatter.ofPattern(NOT_FORMAT_DATE));
-        }else{
             dateFormat = localDateTime.format(DateTimeFormatter.ofPattern(formatStr));
+        }else{
+            dateFormat = localDateTime.format(DateTimeFormatter.ofPattern(NOT_FORMAT_DATE));
         }
         return dateFormat;
     }

byit-myth-core/myth-executor-core/src/test/java/com/test/Test1.java

@@ -13,10 +13,83 @@ import java.util.Map;
 public class Test1 {
     public static void main(String[] args) throws IOException, MyException {
         FastDfsFileSystem fds = new FastDfsFileSystem();
-        fds.fileRemove("ddmp/M00/00/00/CgB4Al5XoBSAZg1qAAAAW4eTPeg3226.py");
-        byte[] bytes = FileUtils.readFileToByteArray(new File("D:\\2020project\\byit-myth-job\\byit-myth-core\\myth-executor-core\\src\\test\\java\\com\\test\\test-ex.py"));
-        Map<String,String> map = new HashMap<>();
-        map.put("filename","test-ex.py");
-        System.out.println(fds.uploadFile(bytes, "py", map));
+        /*fds.fileRemove("ddmp/M00/00/00/CgB4Al5wNyeAZdkbAAAAb-omIFM6333.py");
+        fds.fileRemove("ddmp/M00/00/00/CgB4Al5wNyeANch6AAAAb1xkZcY9815.py");
+        fds.fileRemove("ddmp/M00/00/00/CgB4Al5wNyeAY9HjAAAAbzGlprU0241.py");
+        fds.fileRemove("ddmp/M00/00/00/CgB4Al5wNyeASM74AAAAb-uR6K03377.py");
+        fds.fileRemove("ddmp/M00/00/00/CgB4Al5wNyiAPlYXAAAAb4ZQK943410.py");
+        fds.fileRemove("ddmp/M00/00/00/CgB4Al5wNyiAc_nJAAAAbzASbks9878.py");
+        fds.fileRemove("ddmp/M00/00/00/CgB4Al5wNyiABB-kAAAAb13TrTg1071.py");
+        fds.fileRemove("ddmp/M00/00/00/CgB4Al5wNyiARAFVAAAAb18L9Do3337.py");
+        fds.fileRemove("ddmp/M00/00/00/CgB4Al5wNyiACVSEAAAAbzLKN0k8232.py");
+        fds.fileRemove("ddmp/M00/00/00/CgB4Al5wNyiAZbfWAAAAcK8DUJU5054.py");
+        fds.fileRemove("ddmp/M00/00/00/CgB4Al5wNyiAZnPBAAAAcMLCk-Y6177.py");
+        fds.fileRemove("ddmp/M00/00/00/CgB4Al5wODWAePJQAAAAHSB_HGI4727.py");
+        fds.fileRemove("ddmp/M00/00/00/CgB4Al5wODWAFdLWAAAAG7nO0c08696.py");*/
+        /*byte[] bytes1 = FileUtils.readFileToByteArray(new File("C:\\Users\\Administrator\\Desktop\\script/node1.py"));
+        Map<String,String> map1 = new HashMap<>();
+        map1.put("filename","node1.py");
+        System.out.println(fds.uploadFile(bytes1, "py", map1));
+
+        byte[] bytes2 = FileUtils.readFileToByteArray(new File("C:\\Users\\Administrator\\Desktop\\script/node2.py"));
+        Map<String,String> map2 = new HashMap<>();
+        map2.put("filename","node2.py");
+        System.out.println(fds.uploadFile(bytes2, "py", map2));
+
+        byte[] bytes3 = FileUtils.readFileToByteArray(new File("C:\\Users\\Administrator\\Desktop\\script/node3.py"));
+        Map<String,String> map3 = new HashMap<>();
+        map3.put("filename","node3.py");
+        System.out.println(fds.uploadFile(bytes3, "py", map3));
+
+        byte[] bytes4 = FileUtils.readFileToByteArray(new File("C:\\Users\\Administrator\\Desktop\\script/node4.py"));
+        Map<String,String> map4 = new HashMap<>();
+        map4.put("filename","node4.py");
+        System.out.println(fds.uploadFile(bytes4, "py", map4));
+
+        byte[] bytes5 = FileUtils.readFileToByteArray(new File("C:\\Users\\Administrator\\Desktop\\script/node5.py"));
+        Map<String,String> map5 = new HashMap<>();
+        map5.put("filename","node5.py");
+        System.out.println(fds.uploadFile(bytes5, "py", map5));
+
+        byte[] bytes6 = FileUtils.readFileToByteArray(new File("C:\\Users\\Administrator\\Desktop\\script/node6.py"));
+        Map<String,String> map6 = new HashMap<>();
+        map6.put("filename","node6.py");
+        System.out.println(fds.uploadFile(bytes6, "py", map6));
+
+        byte[] bytes7 = FileUtils.readFileToByteArray(new File("C:\\Users\\Administrator\\Desktop\\script/node7.py"));
+        Map<String,String> map7 = new HashMap<>();
+        map7.put("filename","node7.py");
+        System.out.println(fds.uploadFile(bytes7, "py", map7));
+
+        byte[] bytes8 = FileUtils.readFileToByteArray(new File("C:\\Users\\Administrator\\Desktop\\script/node8.py"));
+        Map<String,String> map8 = new HashMap<>();
+        map8.put("filename","node8.py");
+        System.out.println(fds.uploadFile(bytes8, "py", map8));
+
+        byte[] bytes9 = FileUtils.readFileToByteArray(new File("C:\\Users\\Administrator\\Desktop\\script/node9.py"));
+        Map<String,String> map9 = new HashMap<>();
+        map9.put("filename","node9.py");
+        System.out.println(fds.uploadFile(bytes9, "py", map9));
+
+        byte[] bytes10 = FileUtils.readFileToByteArray(new File("C:\\Users\\Administrator\\Desktop\\script/node10.py"));
+        Map<String,String> map10 = new HashMap<>();
+        map10.put("filename","node10.py");
+        System.out.println(fds.uploadFile(bytes10, "py", map10));
+
+        byte[] bytes11 = FileUtils.readFileToByteArray(new File("C:\\Users\\Administrator\\Desktop\\script/node11.py"));
+        Map<String,String> map11 = new HashMap<>();
+        map11.put("filename","node11.py");
+        System.out.println(fds.uploadFile(bytes11, "py", map11));*/
+
+
+        byte[] bytes1 = FileUtils.readFileToByteArray(new File("C:\\Users\\Administrator\\Desktop\\script/start.py"));
+        Map<String,String> map1 = new HashMap<>();
+        map1.put("filename","start.py");
+        System.out.println(fds.uploadFile(bytes1, "py", map1));
+
+        byte[] bytes2 = FileUtils.readFileToByteArray(new File("C:\\Users\\Administrator\\Desktop\\script/end.py"));
+        Map<String,String> map2 = new HashMap<>();
+        map2.put("filename","end.py");
+        System.out.println(fds.uploadFile(bytes2, "py", map2));
     }
 }