[add] 绿波子区时段指标

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

@@ -37,14 +37,14 @@ public class GreenBeltServiceImpl implements GreenBeltInfoService {
         LocalDate nextDate = currentDate.plusDays(1);
         LocalTime endTime = LocalTime.MIDNIGHT; // 00:00 of the next day
         LocalDateTime endOfDay = LocalDateTime.of(nextDate, endTime);
-        long startSecond = startOfDay.toEpochSecond(ZoneOffset.of("+8"));
+        long startSecond = startOfDay.toEpochSecond(ZoneOffset.of("+8")) + 5 * 600;
         long endSecond = endOfDay.toEpochSecond(ZoneOffset.of("+8"));
-        List<CrossDataHistPO> crossDataHistPOS = crossDataHistMapper.selectByCrossIdsAndTimestamp(crossIds, (int) startSecond, (int) endSecond);
+        List<CrossDataHistPO> crossDataHistPOS = crossDataHistMapper.selectByCrossIdsAndTimestamp(crossIds, (int) startSecond , (int) endSecond);
         if (!CollectionUtils.isEmpty(crossDataHistPOS)) {
             List<GreenBeltFlowStopTimeVO> results = new ArrayList<>();
             Map<Date, List<CrossDataHistPO>> startTimeMap = crossDataHistPOS.stream().collect(Collectors.groupingBy(CrossDataHistPO::getStartTime));
-            GreenBeltFlowStopTimeVO greenBeltFlowStopTimeVO = new GreenBeltFlowStopTimeVO();
             for (Map.Entry<Date, List<CrossDataHistPO>> entry : startTimeMap.entrySet()) {
+                GreenBeltFlowStopTimeVO greenBeltFlowStopTimeVO = new GreenBeltFlowStopTimeVO();
                 Date startDate = entry.getKey();
                 List<GreenBeltFlowStopTimeVO.FlowStopTimeDetail> crossList = new ArrayList<>();
                 greenBeltFlowStopTimeVO.setStartTime(startDate);
@@ -61,6 +61,7 @@ public class GreenBeltServiceImpl implements GreenBeltInfoService {
                 greenBeltFlowStopTimeVO.setDetailList(crossList);
                 results.add(greenBeltFlowStopTimeVO);
             }
+            Collections.sort(results, Comparator.comparing(GreenBeltFlowStopTimeVO::getStartTime));
             return results;
         }
         return Collections.EMPTY_LIST;

signal-utc-hisense-service/pom.xml

@@ -68,7 +68,7 @@
         <dependency>
             <groupId>net.wanji</groupId>
             <artifactId>wj-databus</artifactId>
-            <version>0.0.1</version>
+            <version>0.0.3</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>