增加补批接口返回

byit-myth-admin/src/main/java/com/byit/api/ApiFlowOperatingController.java

 package com.byit.api;
 
+import com.byit.dto.specials.MakeUpReturn;
 import com.byit.dto.specials.RepairFlow;
 import com.byit.dto.specials.SpecialJobParam;
 import com.byit.service.ApiFlowOperatingService;
@@ -9,6 +10,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  *
  * 需求：节点操作执行的Controllrt
@@ -32,8 +35,8 @@ public class ApiFlowOperatingController {
      * @param specialJobParam 采纳数信息
      */
     @PostMapping("specialRunBatch")
-    public void specialRunBatch(@RequestBody SpecialJobParam specialJobParam){
-        apiFlowOperatingService.specialRunBatch(specialJobParam);
+    public List<MakeUpReturn> specialRunBatch(@RequestBody SpecialJobParam specialJobParam){
+        return apiFlowOperatingService.specialRunBatch(specialJobParam);
     }
 
     /**
@@ -41,7 +44,7 @@ public class ApiFlowOperatingController {
      * @param repairFlow 常规的补批
      */
     @PostMapping("routineSupplementBatch")
-    public void routineSupplementBatch(@RequestBody RepairFlow repairFlow) {
-        apiFlowOperatingService.routineSupplementBatch(repairFlow);
+    public List<MakeUpReturn> routineSupplementBatch(@RequestBody RepairFlow repairFlow) {
+        return apiFlowOperatingService.routineSupplementBatch(repairFlow);
     }
 }

byit-myth-admin/src/main/java/com/byit/service/ApiFlowOperatingService.java

 package com.byit.service;
 
+import com.byit.dto.specials.MakeUpReturn;
 import com.byit.dto.specials.RepairFlow;
 import com.byit.dto.specials.SpecialJobParam;
 
+import java.util.List;
+
 /**
  * 工作流操作实现解耦
  *
@@ -15,12 +18,14 @@ public interface ApiFlowOperatingService {
      * 基于某一节点自动识别下面所有的节点
      *
      * @param specialJobParam 补批参数
+     * @return 补批完成后的结果信息
      */
-    void specialRunBatch(SpecialJobParam specialJobParam);
+    List<MakeUpReturn> specialRunBatch(SpecialJobParam specialJobParam);
 
     /**
      * 常规工作流补批
      * @param repairFlow 常规工作流补批
+     * @return 补批完成后的结果信息
      */
-    void routineSupplementBatch(RepairFlow repairFlow);
+    List<MakeUpReturn> routineSupplementBatch(RepairFlow repairFlow);
 }

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

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
 import com.byit.dto.NodeRelyDto;
 import com.byit.dto.executor.RunParamWrapped;
+import com.byit.dto.specials.MakeUpReturn;
 import com.byit.dto.specials.RepairFlow;
 import com.byit.dto.specials.SpecialJobParam;
 import com.byit.enums.NodeTypeEnum;
@@ -69,7 +70,8 @@ public class ApiFlowOperatingServiceImpl implements ApiFlowOperatingService {
     }
 
     @Override
-    public void specialRunBatch(SpecialJobParam specialJobParam) {
+    public List<MakeUpReturn> specialRunBatch(SpecialJobParam specialJobParam) {
+        List<MakeUpReturn> makeUpReturns = new ArrayList<>(2);
         //获取操作人
         String operator = currentUserUtils.account();
         //工作空间名称
@@ -137,13 +139,21 @@ public class ApiFlowOperatingServiceImpl implements ApiFlowOperatingService {
             List<WaitingTask> waitingTaskList = buildWaitingTaskResult(waitingRecords, nodeRelyDtoSet, specialJobParam.getPublicParam(), timeFormatName, nowTimeFormatName);
             runRecordings.forEach(runRecordingMapper::saveRunRecording);
             waitingTaskList.forEach(waitingTaskMapper::insertSelective);
-        }
 
+            makeUpReturns = waitingRecords.stream().map(waitingRecord -> {
+                MakeUpReturn makeUpReturn = new MakeUpReturn();
+                makeUpReturn.setFlowName(waitingRecord.getFlowName());
+                makeUpReturn.setRunId(waitingRecord.getRunId());
+                return makeUpReturn;
+            }).collect(Collectors.toList());
+        }
 
+        return makeUpReturns;
     }
 
     @Override
-    public void routineSupplementBatch(RepairFlow repairFlow) {
+    public List<MakeUpReturn> routineSupplementBatch(RepairFlow repairFlow) {
+        List<MakeUpReturn> makeUpReturns = new ArrayList<>(2);
         ValidationUtil.dataNotNull(repairFlow, "补批核心参数不能为空！");
         if ("1".equals(repairFlow.getAllNodes())) {
             log.info("-------补批工作流-------");
@@ -151,8 +161,9 @@ public class ApiFlowOperatingServiceImpl implements ApiFlowOperatingService {
             BeanUtils.copyProperties(repairFlow, specialJobParam);
             specialJobParam.setStartNodeTaskName("start");
             specialJobParam.setRepairTimeList(repairFlow.getRepairTimes());
-            specialRunBatch(specialJobParam);
+            return specialRunBatch(specialJobParam);
         }
+        return makeUpReturns;
     }
 
     /**

byit-myth-core/myth-dto-core/src/main/java/com/byit/dto/specials/MakeUpReturn.java

+package com.byit.dto.specials;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author huangfu
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class MakeUpReturn {
+    private String flowName;
+    private String runId;
+}