Merge remote-tracking branch 'origin/developer' into developer

byit-myth-core/myth-admin-core/src/main/java/com/byit/mapper/WaitingTaskMapper.java

@@ -18,6 +18,8 @@ public interface WaitingTaskMapper {
 
     int deleteById(Integer id);
 
+    void deleteIds(@Param("ids") List<Integer> ids);
+
     int insertSelective(WaitingTask record);
 
     WaitingTask getById(Integer id);

byit-myth-core/myth-admin-core/src/main/java/com/byit/service/WaitingRecordService.java

@@ -21,4 +21,10 @@ public interface WaitingRecordService {
      * @param waitingRecord
      */
     void updateById(WaitingRecord waitingRecord);
+
+    /**
+     * 删除等待工作流
+     * @param id
+     */
+    void deleteWaitingRecordById (Integer id);
 }

byit-myth-core/myth-admin-core/src/main/java/com/byit/service/WaitingTaskService.java

@@ -14,4 +14,6 @@ public interface WaitingTaskService {
      * @return
      */
     List<WaitingTask> findAllByWaitId(Integer waitId);
+
+    void deleteAllByIds (List<Integer> ids);
 }

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

@@ -40,4 +40,11 @@ public class WaitingRecordServiceImpl implements WaitingRecordService {
     public void updateById(WaitingRecord waitingRecord) {
         waitingRecordMapper.updateByIdSelective(waitingRecord);
     }
+
+    @Override
+    public void deleteWaitingRecordById(Integer id) {
+        waitingRecordMapper.deleteById(id);
+    }
+
+
 }

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

@@ -27,4 +27,9 @@ public class WaitingTaskServiceImpl implements WaitingTaskService {
     public List<WaitingTask> findAllByWaitId(Integer waitId) {
         return waitingTaskMapper.findAllByWaitId(waitId);
     }
+
+    @Override
+    public void deleteAllByIds(List<Integer> ids) {
+        waitingTaskMapper.deleteIds(ids);
+    }
 }

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

@@ -17,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -147,12 +148,14 @@ public class RunRecordingAndJobTaskServiceImpl implements RunRecordingAndJobTask
         log.info("---------开始查询等待工作流{}对应的数据-------------",waitingRecord);
         RunRecording runRecording = runRecordingService.findAllByRunID(waitingRecord.getRunId());
         //将运行实例改为以执行
-        runRecording.setFlowStatus(RunRecordingEnum.FLOW_STATUS_IS_LOAD.getCode());
+        runRecording.setFlowStatus(RunRecordingEnum.FLOW_STATUS_NOT_RUN.getCode());
         runRecordingService.updateRunRecordingById(runRecording);
         log.info("-------修改运行实例表成功，查询对应等待实例{}，的等待节点-------",waitingRecord);
         List<WaitingTask> allByWaitId = taskService.findAllByWaitId(waitingRecord.getWaitId());
         log.info("-------查询等待节点成功，查询对应的等待节点成功，开始保存对应的等待节点{}-------",allByWaitId);
+        List<Integer> ids = new ArrayList<>(2);
         List<JobTask> jobTasks = allByWaitId.stream().map(waitingTask -> {
+            ids.add(waitingTask.getId());
             JobTask target = new JobTask();
             target.setTriggerStatus("1");
             target.setRunId(waitingRecord.getRunId());
@@ -163,11 +166,10 @@ public class RunRecordingAndJobTaskServiceImpl implements RunRecordingAndJobTask
         //保存等待实例
         waitingRecord.setWaitOrder(-1);
         log.info("-------保存jobTask成功，开始修改等待实例{}-----------------",waitingRecord);
-        waitingRecordService.updateById(waitingRecord);
-
-    }
-
-    public static void main(String[] args) {
-        System.out.println(DateUtil.dateFormat(new Date(1584420360000L), "yyyy-MM-dd HH mm ss"));
+        //waitingRecordService.updateById(waitingRecord);
+        if (CollectionUtil.isNotEmpty(ids)) {
+            taskService.deleteAllByIds(ids);
+        }
+        waitingRecordService.deleteWaitingRecordById(waitingRecord.getWaitId());
     }
 }

byit-myth-core/myth-admin-core/src/main/java/com/byit/thread/helper/MakeUpFlowThreadRunHelper.java

 package com.byit.thread.helper;
 
-import com.byit.model.RunRecording;
 import com.byit.model.WaitingRecord;
 import com.byit.service.RunRecordingService;
 import com.byit.service.WaitingRecordService;
@@ -10,7 +9,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 import javax.sql.DataSource;
-import java.util.*;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.function.BinaryOperator;
 import java.util.function.Function;

byit-myth-core/myth-admin-core/src/main/resources/mapper/WaitingTaskMapper.xml

@@ -89,6 +89,15 @@
     where id = #{id,jdbcType=INTEGER}
   </delete>
 
+  <delete id="deleteIds">
+    delete from waiting_task
+    where id in
+    <foreach collection="ids" item="id" index="index" open="(" close=")" separator=",">
+      #{id,jdbcType=INTEGER}
+    </foreach>
+
+  </delete>
+
   <insert id="insertSelective" parameterType="com.byit.model.WaitingTask">
     <!-- generated @mbg.generated date: 2020-03-12 -->
     insert into waiting_task