runID重复BUG

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

@@ -72,8 +72,6 @@ public class ApiFlowOperatingServiceImpl implements ApiFlowOperatingService {
     public void specialRunBatch(SpecialJobParam specialJobParam) {
         //获取操作人
         String operator = currentUserUtils.account();
-        //生成本次补批的运行标识
-        String runId = IDGenerationStrategy.runIdGenerationStrategy(serverPort);
         //工作空间名称
         String workspaceName = specialJobParam.getWorkspaceName();
         ValidationUtil.dataNotBank(workspaceName, "工作空间名称不允许为空");
@@ -133,7 +131,7 @@ public class ApiFlowOperatingServiceImpl implements ApiFlowOperatingService {
         }
         if (CollectionUtil.isNotEmpty(nodeRelyDtoSet)) {
             //构建等待队列
-            List<WaitingRecord> waitingRecords = buildWaitingRecordList(flowByName, runId, nodeRelyDtoSet.size(), operator, repairTimeList);
+            List<WaitingRecord> waitingRecords = buildWaitingRecordList(flowByName, nodeRelyDtoSet.size(), operator, repairTimeList);
             waitingRecords.forEach(waitingRecordMapper::insertSelective);
             List<RunRecording> runRecordings = buildRunRecordingList(waitingRecords);
             List<WaitingTask> waitingTaskList = buildWaitingTaskResult(waitingRecords, nodeRelyDtoSet, specialJobParam.getPublicParam(), timeFormatName, nowTimeFormatName);
@@ -250,13 +248,12 @@ public class ApiFlowOperatingServiceImpl implements ApiFlowOperatingService {
      * 构建等待队列
      *
      * @param flow           工作流
-     * @param runId          运行标识
      * @param nodeCount      节点数量
      * @param operator       操作人
      * @param repairTimeList 补时间
      * @return 等待队列集合
      */
-    private List<WaitingRecord> buildWaitingRecordList(Flow flow, String runId, Integer nodeCount, String operator, List<String> repairTimeList) {
+    private List<WaitingRecord> buildWaitingRecordList(Flow flow, Integer nodeCount, String operator, List<String> repairTimeList) {
         //查看当前排队的工作流最大排队序号
         Integer order = waitingRecordMapper.findOrderByFlowId(flow.getFlowId());
         if (order == null) {
@@ -269,7 +266,7 @@ public class ApiFlowOperatingServiceImpl implements ApiFlowOperatingService {
             //设置排期
             BeanUtils.copyProperties(flow, waitingRecord);
             waitingRecord.setFlowVersionName(flow.getVersionName());
-            waitingRecord.setRunId(runId);
+            waitingRecord.setRunId(IDGenerationStrategy.runIdGenerationStrategy(serverPort));
             waitingRecord.setFlowNodeCount(nodeCount);
             waitingRecord.setOperator(operator);
             waitingRecord.setScheduleType(ScheduleTypeEnum.REPAIR.getCode());

byit-myth-core/myth-admin-core/src/main/java/com/byit/util/IDGenerationStrategy.java

 package com.byit.util;
 
+import cn.hutool.crypto.SecureUtil;
 import com.byit.utils.IpUtil;
 import org.apache.commons.lang3.StringUtils;
 
@@ -23,8 +24,7 @@ public class IDGenerationStrategy {
             String replace = ipPort.replace(".", "").replace(":", "");
             runIdPre = runIdPre + replace;
         }
-
-        return runIdPre;
+        return SecureUtil.md5(runIdPre);
     }
 
     /**