修改统计

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

@@ -761,9 +761,9 @@ public class ApiFlowServiceImpl implements ApiFlowService {
                 nodeStatisticData = new StatisticData();
                 nodeStatisticData.setUnstart(nodeList.size());
             }else {
-                nodeStatisticData.setUnstart(nodeList.size() - nodeStatisticData.getUnstart());
+                nodeStatisticData.setUnstart(nodeList.size() - nodeStatisticData.getFail() - nodeStatisticData.getStop() - nodeStatisticData.getRunIng() - nodeStatisticData.getSuccess() - nodeStatisticData.getKill());
             }
-            List<FlowStatusSnapshoot> flowStatusSnapshootList = flowStatusSnapshootMapper.findByTime(startTime, endTime);
+            List<FlowStatusSnapshoot> flowStatusSnapshootList = flowStatusSnapshootMapper.findByTime(flowIdList, startTime, endTime);
 
             Map<String, StatisticData> flowCollectMap = new HashMap<>();
             Map<String, StatisticData> nodeCollectMap = new HashMap<>();
@@ -864,7 +864,7 @@ public class ApiFlowServiceImpl implements ApiFlowService {
         }else {
             nodeStatisticData.setUnstart(nodeList.size() - nodeStatisticData.getFail() - nodeStatisticData.getStop() - nodeStatisticData.getRunIng() - nodeStatisticData.getSuccess() - nodeStatisticData.getKill());
         }
-        List<FlowStatusSnapshoot> flowStatusSnapshootList = flowStatusSnapshootMapper.findByTime(startTime, endTime);
+        List<FlowStatusSnapshoot> flowStatusSnapshootList = flowStatusSnapshootMapper.findByTime(flowIdList,startTime, endTime);
 
         Map<String, StatisticData> nodeCollectMap = new HashMap<>();
         flowStatusSnapshootList.forEach(flowStatusSnapshoot -> {

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

@@ -46,7 +46,7 @@ public interface FlowStatusSnapshootMapper {
      * @param endTime
      * @return
      */
-    List<FlowStatusSnapshoot> findByTime(@Param("startTime")Long startTime, @Param("endTime")Long endTime);
+    List<FlowStatusSnapshoot> findByTime(@Param("flowIdList")List<Integer> flowIdList,@Param("startTime")Long startTime, @Param("endTime")Long endTime);
 
     /**
      * 根据天、小时、工作流id获取快照信息

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

@@ -204,6 +204,13 @@
     from flow_status_snapshoot
     where snapshoot_time >= #{startTime}
     and snapshoot_time <= #{endTime}
+    <if test="flowIdList != null">
+      and flow_id in (
+      <foreach collection="flowIdList" item="flowId" separator=",">
+        #{flowId}
+      </foreach>
+      )
+    </if>
   </select>
     <select id="findByDateAndHourAndFlowId" resultMap="BaseResultMap">
     select <include refid="Base_Column_List" />