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

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

@@ -55,6 +55,13 @@ public class ApiFlowController {
         return ResponseResult.ok("SUCCESS");
     }
 
+    @PostMapping("exist")
+    @ApiOperation("判断工作流是否存在")
+    public ResponseResult exist(String param) throws ParseException {
+        Boolean result = apiFlowService.exist(param);
+        return ResponseResult.ok(result);
+    }
+
     @PostMapping("repealSchedule")
     @ApiOperation("撤销工作流调度，只可以撤销总工作流，若为内嵌工作流不允许撤销")
     public ResponseResult repealSchedule(String param) throws ParseException {

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

@@ -103,4 +103,13 @@ public interface ApiFlowService {
      * @return
      */
     Map<String, RunRecording> loadCurrentStatus(String param);
+
+    /**
+     * 功能描述 判断工作流是否存在
+     * @author gml
+     * @date 2020-05-27 10:12
+     * @param param
+     * @return java.lang.Boolean
+     */
+    Boolean exist(String param);
 }

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

@@ -1090,6 +1090,25 @@ public class ApiFlowServiceImpl implements ApiFlowService {
         return statusMap;
     }
 
+    @Override
+    public Boolean exist(String param) {
+        ValidationUtil.dataNotBank(param, "请求参数不允许为空！");
+        JSONObject jsonObject = JSON.parseObject(param);
+        //获取工作空间名称
+        String workspaceName = jsonObject.getString("workspaceName");
+        ValidationUtil.dataNotBank(workspaceName, "工作空间名称不允许为空！");
+        Workspace workspace = workspaceMapper.getByName(workspaceName);
+        ValidationUtil.dataNotNull(workspace, workspaceName + "工作空间不存在");
+        //获取工作流名称
+        String flowName = jsonObject.getString("flowName");
+        ValidationUtil.dataNotBank(flowName, "工作流名称不允许为空！");
+        Flow flow = flowMapper.getByWorkSpaceAndName(workspace.getWorkspaceId(), flowName);
+        if (null == flow){
+            return false;
+        }
+        return true;
+    }
+
     /**
      * runState  补批机制   1 补批当前节点   2   补批当前节点及以下节点
      * @param param
@@ -1412,12 +1431,15 @@ public class ApiFlowServiceImpl implements ApiFlowService {
         List<RunRecording> recordingList = runRecordingMapper.findOnScheduleByFlowId(flow.getFlowId());
         ValidationUtil.isTrueValidation(null != recordingList && recordingList.size() > 0 , "工作流已在调度中不允许撤销调度！");
         List<RunRecording> unStartRecordingList = runRecordingMapper.findUnStartByFlowId(flow.getFlowId());
-        //删除对应的task记录
-        unStartRecordingList.forEach(runRecording -> {
-            ValidationUtil.isTrueValidation((runRecording.getTriggerTime() - System.currentTimeMillis()) < 10000 , "工作流已在调度中不允许撤销调度");
-            runRecordingMapper.deleteByRunId(runRecording.getRunId());
-            jobTaskMapper.deleteByRunId(runRecording.getRunId());
-        });
+        if (null != unStartRecordingList && unStartRecordingList.size() > 0){
+            //删除对应的task记录
+            unStartRecordingList.forEach(runRecording -> {
+                ValidationUtil.isTrueValidation((runRecording.getTriggerTime() - System.currentTimeMillis()) < 10000 , "工作流已在调度中不允许撤销调度");
+                runRecordingMapper.deleteByRunId(runRecording.getRunId());
+                jobTaskMapper.deleteByRunId(runRecording.getRunId());
+            });
+        }
+
 
         //撤销工作流调度
         updateFlowStart(flow, false);
@@ -1434,10 +1456,10 @@ public class ApiFlowServiceImpl implements ApiFlowService {
             flow.setStartUp(FlowPropertyEnum.IS_START.getCode());
             //如果是周期调度修改下次执行时间
             if (FlowPropertyEnum.SCHEDULE_MODE.getCode().equals(flow.getExecType())){
+                flow.setTriggerNextTime(new CronExpression(flow.getFlowCron()).getNextValidTimeAfter(new Date()).getTime());
             }
         }else {
             flow.setStartUp(FlowPropertyEnum.NO_START.getCode());
-                flow.setTriggerNextTime(new CronExpression(flow.getFlowCron()).getNextValidTimeAfter(new Date()).getTime());
         }
         flowMapper.updateByIdSelective(flow);
         List<Node> nodeList = nodeMapper.findVirtualByFlowId(flow.getFlowId());
@@ -1468,7 +1490,7 @@ public class ApiFlowServiceImpl implements ApiFlowService {
         ValidationUtil.dataNotNull(flow, flowName + "工作流不存在");
         ValidationUtil.isTrueValidation(FlowPropertyEnum.IS_INNER.getCode().equals(flow.getIsInner()), "内嵌工作流不允许停止调度！");
         //判断是否在调度中
-        List<RunRecording> recordingList = runRecordingMapper.findOnScheduleByFlowId(flow.getFlowId());
+        List<RunRecording> recordingList = runRecordingMapper.findUnFinishByFlowId(flow.getFlowId());
         ValidationUtil.isTrueValidation(null == recordingList || recordingList.size() == 0 , flowName + "工作流没有正在运行的调度！");
         StringBuffer runids = new StringBuffer();
         //暂停工作流调度

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

@@ -209,6 +209,7 @@
     from run_recording
     where run_id = #{runId,jdbcType=VARCHAR} and flow_name = #{flowName,jdbcType=VARCHAR} and schedule_type != 4
   </select>
+
   <select id="findUnFinishByFlowId" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
@@ -216,24 +217,26 @@
     where flow_id = #{flowId}
         and flow_status != '4' and schedule_type != 4
   </select>
-    <select id="findStatusByStartAndEndTime" resultType="com.byit.dto.plugin.StatisticData" useCache="false" flushCache="true">
-      select  sum(case when flow_status = '1' then 1 else 0 end ) unstart,
-              sum(case when flow_status='2' then 1 else 0 end ) runIng,
-              sum(case when flow_status='3' then 1 else 0 end ) stop,
-              sum(case when flow_status='4' and (flow_run_result = '1' or flow_run_result = '3') then 1 else 0 end ) success,
-              sum(case when flow_status='4' and (flow_run_result = '2' or flow_run_result = '4') then 1 else 0 end ) fail,
-              sum(case when flow_run_result='5' then 1 else 0 end ) 'kill'
-      from run_recording
-        where  (end_time &lt;= #{endTime} or start_time &lt;= #{endTime})
-            and start_time &gt;= #{startTime} and schedule_type != 4
-            <if test="flowIdList != null">
-              and flow_id in (
-              <foreach collection="flowIdList" item="flowId" separator=",">
-                #{flowId}
-              </foreach>
-              )
-            </if>
-    </select>
+
+  <select id="findStatusByStartAndEndTime" resultType="com.byit.dto.plugin.StatisticData" useCache="false" flushCache="true">
+    select  sum(case when flow_status = '1' then 1 else 0 end ) unstart,
+            sum(case when flow_status='2' then 1 else 0 end ) runIng,
+            sum(case when flow_status='3' then 1 else 0 end ) stop,
+            sum(case when flow_status='4' and (flow_run_result = '1' or flow_run_result = '3') then 1 else 0 end ) success,
+            sum(case when flow_status='4' and (flow_run_result = '2' or flow_run_result = '4') then 1 else 0 end ) fail,
+            sum(case when flow_run_result='5' then 1 else 0 end ) 'kill'
+    from run_recording
+      where  (end_time &lt;= #{endTime} or start_time &lt;= #{endTime})
+          and start_time &gt;= #{startTime} and schedule_type != 4
+          <if test="flowIdList != null">
+            and flow_id in (
+            <foreach collection="flowIdList" item="flowId" separator=",">
+              #{flowId}
+            </foreach>
+            )
+          </if>
+  </select>
+
   <select id="findMaxByFlowId" resultMap="BaseResultMap">
     select <include refid="Base_Column_List" />
     from run_recording