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

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

@@ -855,9 +855,12 @@ public class ApiFlowServiceImpl implements ApiFlowService {
         }
 
         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());
+        List<Node> nodeList = nodeMapper.findbyFlowIds(flowIdList);
+        if (null == nodeStatisticData){
+            nodeStatisticData = new StatisticData();
+            nodeStatisticData.setUnstart(nodeList.size());
+        }else {
+            nodeStatisticData.setUnstart(nodeList.size() - nodeStatisticData.getUnstart());
         }
         List<FlowStatusSnapshoot> flowStatusSnapshootList = flowStatusSnapshootMapper.findByTime(startTime, endTime);
 

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

@@ -76,11 +76,10 @@ public class StatusSnapshootThreadRunHelper extends BaseThreadRunHelper {
                     //统计运行实例的数据
                     //如果存在实例
                     if (runRecording != null){
-                        //获取凌晨的时间戳
-                        Long time = LocalDate.now().atStartOfDay(ZoneOffset.ofHours(8)).toInstant().toEpochMilli();
+                        //获取上一个时间
                         Long preHourTime = hourDateTime.minusHours(1).toInstant(ZoneOffset.of("+8")).toEpochMilli();
                         //从凌晨到现在是否有运行实例
-                        if (preHourTime.longValue() < runRecording.getTriggerTime().longValue()){
+                        if (preHourTime.longValue() > runRecording.getTriggerTime().longValue()){
                             flowStatusSnapshoot.setFlowStatus(1);
                             flowStatusSnapshoot.setUnstartNode(flow.getFlowNodeCount());
                         } else { //存在工作流的运行实例