Merge branches 'developer' and 'test' of https://git.byitgroup.com/liyuan/byit-myth-job into test

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

@@ -187,9 +187,14 @@ public class ApiFlowServiceImpl implements ApiFlowService {
         //设置超时时间，未设置默认5天
         flow.setFlowTimeout(null == pluginFlow.getConfig().getFlowTimeout() ? TimeUnit.DAYS.toMillis(5) : pluginFlow.getConfig().getFlowTimeout());
         Flow oldFlow = flowMapper.getByWorkSpaceAndName(workspaceId, pluginFlow.getName());
+        String versionName = pluginFlow.getVersionName();
+        if (StringUtils.isNoneBlank(versionName)) {
+            FlowVersion byWorkSpaceAndName = flowVersionMapper.getByWorkSpaceAndName(workspaceId, flow.getFlowName(), versionName);
+            ValidationUtil.isTrueValidation(byWorkSpaceAndName!=null,"该工作流版本已经存在，请联系调度团队！");
+        }
         //判断是否是重发
         if ((pluginFlow.isRePublish() && !isInnner) || (isInnner && null != oldFlow)) {
-            String versionName = pluginFlow.getVersionName();
+
             flow.setFlowId(oldFlow.getFlowId());
             //当版本号不存在
             if (StringUtils.isBlank(versionName)) {
@@ -204,7 +209,6 @@ public class ApiFlowServiceImpl implements ApiFlowService {
             updateNodeByFlow(pluginFlow.getNodeList(), flow, upFlowName);
 
         } else {
-            String versionName = pluginFlow.getVersionName();
             if (StringUtils.isBlank(versionName)) {
                 flow.setVersionName(JobVersionGenUtil.generateVersionName(1));
             } else {

byit-myth-core/myth-admin-core/src/main/java/com/byit/strategy/instances/RpcCallbackInstanceRunTheLifeCycleCallback.java

@@ -32,7 +32,7 @@ import java.util.Map;
  */
 @Component
 @Slf4j
-@MythRankOrder(2)
+@MythRankOrder(3)
 public class RpcCallbackInstanceRunTheLifeCycleCallback implements InstanceRunTheLifeCycleCallback {
 
     @TaskClient(timeout = 60000, callMethodEnum = CallMethodEnum.SYNCHRONIZE)

byit-myth-core/myth-admin-core/src/main/java/com/byit/strategy/instances/RunRecordingRunRedisRemoveTheLifeCycleCallback.java

@@ -18,7 +18,7 @@ import org.springframework.stereotype.Component;
  */
 @Component
 @Slf4j
-@MythRankOrder(1000)
+@MythRankOrder(4)
 public class RunRecordingRunRedisRemoveTheLifeCycleCallback implements InstanceRunTheLifeCycleCallback {
     private final StringRedisTemplate stringRedisTemplate;
 

byit-myth-core/myth-admin-core/src/main/java/com/byit/strategy/instances/WorkflowCommonParameterAggregation.java

@@ -24,7 +24,7 @@ import java.util.Map;
  */
 @Component
 @Slf4j
-@MythRankOrder(5)
+@MythRankOrder(2)
 public class WorkflowCommonParameterAggregation implements InstanceRunTheLifeCycleCallback {
     private final StringRedisTemplate stringRedisTemplate;
 

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

@@ -150,7 +150,7 @@
     select
         <include refid="Base_Column_List" />
     from run_recording
-    where flow_status = '2' and schedule_type != 4
+    where schedule_type != 4
   </select>
 
   <select id="findNoEnd" parameterType="com.byit.dto.FlowConditionDto" resultMap="BaseResultMap">