修改统计获取方式

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

@@ -749,14 +749,15 @@ public class ApiFlowServiceImpl implements ApiFlowService {
         //如果工作空间下面有数据
         if (flowIdList.size() > 0){
             StatisticData flowStatisticData = runRecordingMapper.findStatusByStartAndEndTime(new Date(startTime), new Date(endTime), flowIdList);
-            StatisticData unstartflowStatisticData = waitingRecordMapper.findStatusByStartAndEndTime(flowIdList);
-            if (null != unstartflowStatisticData){
-                flowStatisticData.setUnstart(flowStatisticData.getUnstart() + unstartflowStatisticData.getUnstart());
+            if (null != flowStatisticData){
+                flowStatisticData = new StatisticData();
+                flowStatisticData.setUnstart(flowList.size());
             }
             StatisticData nodeStatisticData = jobTaskRunLogMapper.findStatusByStartAndEndTime(new Date(startTime), new Date(endTime), flowIdList);
-            StatisticData unstartNodeStatisticData = waitingTaskMapper.findStatusByStartAndEndTime(flowIdList);
-            if (null != unstartNodeStatisticData){
-                nodeStatisticData.setUnstart(nodeStatisticData.getUnstart() + unstartNodeStatisticData.getUnstart());
+            if (null != nodeStatisticData){
+                nodeStatisticData = new StatisticData();
+                List<Node> nodeList = nodeMapper.findbyFlowIds(flowIdList);
+                nodeStatisticData.setUnstart(nodeList.size());
             }
             List<FlowStatusSnapshoot> flowStatusSnapshootList = flowStatusSnapshootMapper.findByTime(startTime, endTime);
 

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

@@ -93,4 +93,6 @@ public interface NodeMapper {
      * @return
      */
     List<Node> findByFlowIdAndName(@Param("flowId") Integer flowId, @Param("nodeNameList")List<String> nodeNameList);
+
+    List<Node> findbyFlowIds(@Param("flowIdList")List<Integer> flowIdList);
 }
\ No newline at end of file

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

@@ -95,7 +95,6 @@ public class StatusSnapshootThreadRunHelper extends BaseThreadRunHelper {
                                     case "5" : flowStatusSnapshoot.setFlowStatus(6); break;
                                     default : flowStatusSnapshoot.setFlowStatus(5); break;
                                 }
-                            }
                                 //获取运行实例下各类状态的节点数目
                                 StatisticData nodeStatistic = jobTaskRunLogMapper.findStatisticDataByRunIdAndFlowId(runRecording.getRunId(), flow.getFlowId());
                                 //判断是否存在节点的运行日志
@@ -111,12 +110,15 @@ public class StatusSnapshootThreadRunHelper extends BaseThreadRunHelper {
                                     //不存在节点的运行日志
                                     flowStatusSnapshoot.setUnstartNode(flow.getFlowNodeCount());
                                 }
+                                flowStatusSnapshootList.add(flowStatusSnapshoot);
+                            }
+
                         }
                     }else {
                         //如果不存在运行实例
                         flowStatusSnapshoot.setUnstartNode(flow.getFlowNodeCount());
-                    }
                         flowStatusSnapshootList.add(flowStatusSnapshoot);
+                    }
                     /*
                      排队的运行实例已经放在run_recording表中，无需二次记录
                     //获取排队的运行实例

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

@@ -136,6 +136,18 @@
         </foreach>
         )
   </select>
+  <select id="findbyFlowIds" resultType="com.byit.model.Node">
+    select
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from node
+    where flow_id in (
+    <foreach collection="flowIdList" item="flowId" separator=",">
+      #{flowId}
+    </foreach>
+    )
+  </select>
 
   <delete id="deleteVirtualNode">
     delete from node