mock数据

signal-optimize-service/src/main/java/net/wanji/opt/service/impl/RunningEvaluateServiceImpl.java

@@ -191,28 +191,39 @@ public class RunningEvaluateServiceImpl implements RunningEvaluateService {
         vo.setSpilloverSum(spilloverSum/60);//溢出时长
 
         // 相位空放指标
-        Date startDate = bo.getStartDate();
-        Date endDate = bo.getEndDate();
-        if (isZeros(endDate)) {
-            endDate = DateUtil.offsetDay(endDate, 1); // 包含最后一天
-        }
-        long startTime = startDate.getTime();
-        long endTime = endDate.getTime();
-        KafkaConsumerUtil kafkaConsumerUtil = new KafkaConsumerUtil(bootstrapServers, "empty-phase-evaluate");
-        List<PhaseEmptyResult> phaseEmptyResults =
-                kafkaConsumerUtil.consumeEmptyPhaseForTimeRange(emptyPhaseTopic, 0, startTime, endTime);
-
-        int emptyPhaseCount = (int) phaseEmptyResults.stream()
-                .filter(result -> result != null && crossId.equals(result.getCrossId()))
-                .count();
-        int emptyPhaseSum = phaseEmptyResults.stream()
-                .filter(result -> result != null && crossId.equals(result.getCrossId()))
-                .map(PhaseEmptyResult::getDuration)
+//        Date startDate = bo.getStartDate();
+//        Date endDate = bo.getEndDate();
+//        if (isZeros(endDate)) {
+//            endDate = DateUtil.offsetDay(endDate, 1); // 包含最后一天
+//        }
+//        long startTime = startDate.getTime();
+//        long endTime = endDate.getTime();
+//        KafkaConsumerUtil kafkaConsumerUtil = new KafkaConsumerUtil(bootstrapServers, "empty-phase-evaluate");
+//        List<PhaseEmptyResult> phaseEmptyResults =
+//                kafkaConsumerUtil.consumeEmptyPhaseForTimeRange(emptyPhaseTopic, 0, startTime, endTime);
+//
+//        int emptyPhaseCount = (int) phaseEmptyResults.stream()
+//                .filter(result -> result != null && crossId.equals(result.getCrossId()))
+//                .count();
+//        int emptyPhaseSum = phaseEmptyResults.stream()
+//                .filter(result -> result != null && crossId.equals(result.getCrossId()))
+//                .map(PhaseEmptyResult::getDuration)
+//                .filter(Objects::nonNull)
+//                .mapToInt(Integer::intValue)
+//                .sum();
+//        vo.setEmptyPhaseTimes(emptyPhaseCount);
+//        vo.setEmptyPhaseSum(emptyPhaseSum/60);//空放时长
+
+        //---------------
+        List<CrossDataHistPO> emptyReleaseEventList = buildEmptyReleaseEvents(crossDataHistPOList);  // 获取溢出事件集合
+        vo.setEmptyPhaseTimes(emptyReleaseEventList.size());//空放次数
+        int emptyReleaseSum = emptyReleaseEventList.stream()
+                .filter(Objects::nonNull)
+                .map(CrossDataHistPO::getDuration)
                 .filter(Objects::nonNull)
                 .mapToInt(Integer::intValue)
                 .sum();
-        vo.setEmptyPhaseTimes(emptyPhaseCount);
-        vo.setEmptyPhaseSum(emptyPhaseSum/60);//空放时长
+        vo.setEmptyPhaseSum(emptyReleaseSum/60);//溢出时长
 
         Integer schemeProblems = calcSchemeProblems(
                 congestionEventList, unbalanceEventList, spilloverEventList, crossId); // 计算方案问题
@@ -1124,6 +1135,10 @@ public class RunningEvaluateServiceImpl implements RunningEvaluateService {
         return buildEvents(crossDataHistPOList, CrossStatusEnum.CONGESTION.getCode());
     }
 
+    private List<CrossDataHistPO> buildEmptyReleaseEvents(List<CrossDataHistPO> crossDataHistPOList) {
+        return buildEvents(crossDataHistPOList, CrossStatusEnum.EMPTY_RELEASE.getCode());
+    }
+
     private List<CrossDataHistPO> buildEvents(List<CrossDataHistPO> crossDataHistPOList, int status) {
 
         List<CrossDataHistPO> collect = crossDataHistPOList.stream()