4个交通指标mock

signal-optimize-service/src/main/java/net/wanji/opt/controller/TrendController.java

@@ -296,11 +296,24 @@ public class TrendController {
             @ApiResponse(code = 200, message = "OK", response = TableQueryVO.CycleDataElement.class),
     })
     public JsonViewObject laneTrafficIndex(@RequestBody LanePeriodVO crossIdDateTimeVO) throws Exception {
+        Date start = crossIdDateTimeVO.getStart();
         if(isMock == true){
-            crossIdDateTimeVO.setStart(DateUtil.parse("2025-04-09 00:00:00", "yyyy-MM-dd HH:mm:ss"));
-            crossIdDateTimeVO.setEnd(DateUtil.parse("2025-04-12 00:00:00", "yyyy-MM-dd HH:mm:ss"));
+            crossIdDateTimeVO.setCrossId("12Q5V099C30");
+            String time = DateUtil.format(start, "HH:mm:ss");
+            crossIdDateTimeVO.setStart(DateUtil.parse("2025-04-10 " + time, "yyyy-MM-dd HH:mm:ss"));
+            crossIdDateTimeVO.setEnd(DateUtil.parse("2025-04-10 18:00:00", "yyyy-MM-dd HH:mm:ss"));
         }
         List<TableQueryVO.CycleDataElement> result = trendService.laneTrafficIndex(crossIdDateTimeVO);
+        if(isMock == true){
+            //提取yyyy-MM-dd
+            String date = DateUtil.format(start, "yyyy-MM-dd");
+            result.forEach(item -> {
+                //提取HH:mm:ss
+                String time = DateUtil.format(item.getTime(), "HH:mm:ss");
+                time = date + " " + time;
+                item.setTime(DateUtil.parse(time, "yyyy-MM-dd HH:mm:ss"));
+            });
+        }
         return JsonViewObject.newInstance().success(result);
     }
 
@@ -318,8 +331,11 @@ public class TrendController {
             @ApiResponse(code = 200, message = "OK", response = AnalysisRidTurnIndicators.class),
     })
     public JsonViewObject lanePeriodTurnData(@RequestBody LanePeriodTurnVO lanePeriodTurnVO) throws Exception {
+        Date start = lanePeriodTurnVO.getStart();
         if(isMock == true){
-            lanePeriodTurnVO.setStart(DateUtil.parse("2025-04-09 00:00:00", "yyyy-MM-dd HH:mm:ss"));
+            lanePeriodTurnVO.setCrossId("12Q5V099C30");
+            String time = DateUtil.format(start, "HH:mm:ss");
+            lanePeriodTurnVO.setStart(DateUtil.parse("2025-04-09 " + time, "yyyy-MM-dd HH:mm:ss"));
             lanePeriodTurnVO.setEnd(DateUtil.parse("2025-04-12 00:00:00", "yyyy-MM-dd HH:mm:ss"));
         }
         String turns = lanePeriodTurnVO.getTurns();
@@ -343,6 +359,16 @@ public class TrendController {
             lanePeriodTurnVO.setTurnType(turnType.toString());
         }
         List<CrossingTurnQueryVO.CycleDataElement> result = trendService.lanePeriodTurnData(lanePeriodTurnVO);
+        if(isMock == true){
+            //提取yyyy-MM-dd
+            String date = DateUtil.format(start, "yyyy-MM-dd");
+            result.forEach(item -> {
+                //提取HH:mm:ss
+                String time = DateUtil.format(item.getTime(), "HH:mm:ss");
+                time = date + " " + time;
+                item.setTime(DateUtil.parse(time, "yyyy-MM-dd HH:mm:ss"));
+            });
+        }
         return JsonViewObject.newInstance().success(result);
     }
 
@@ -370,11 +396,24 @@ public class TrendController {
             @ApiResponse(code = 200, message = "OK", response = AnalysisRidTurnIndicators.class),
     })
     public JsonViewObject periodDirectionData(@RequestBody PeriodDirectionVO periodDirectionVO) throws Exception {
+        Date start = periodDirectionVO.getStart();
         if(isMock == true){
-            periodDirectionVO.setStart(DateUtil.parse("2025-04-10 00:00:00", "yyyy-MM-dd HH:mm:ss"));
+            periodDirectionVO.setCrossId("12Q5V099C30");
+            String time = DateUtil.format(start, "HH:mm:ss");
+            periodDirectionVO.setStart(DateUtil.parse("2025-04-09 " + time, "yyyy-MM-dd HH:mm:ss"));
             periodDirectionVO.setEnd(DateUtil.parse("2025-04-13 00:00:00", "yyyy-MM-dd HH:mm:ss"));
         }
         List<CrossingDirectionQueryVO.CycleDataElement> result = trendService.periodDirectionData(periodDirectionVO);
+        if(isMock == true){
+            //提取yyyy-MM-dd
+            String date = DateUtil.format(start, "yyyy-MM-dd");
+            result.forEach(item -> {
+                //提取HH:mm:ss
+                String time = DateUtil.format(item.getTime(), "HH:mm:ss");
+                time = date + " " + time;
+                item.setTime(DateUtil.parse(time, "yyyy-MM-dd HH:mm:ss"));
+            });
+        }
         return JsonViewObject.newInstance().success(result);
     }
 
@@ -399,11 +438,24 @@ public class TrendController {
             @ApiResponse(code = 200, message = "OK", response = AnalysisRidTurnIndicators.class),
     })
     public JsonViewObject periodDirectionData(@RequestBody PeriodCrossingVO periodCrossingVO) throws Exception {
+        Date start = periodCrossingVO.getStart();
         if(isMock == true){
-            periodCrossingVO.setStart(DateUtil.parse("2025-04-09 00:00:00", "yyyy-MM-dd HH:mm:ss"));
+            periodCrossingVO.setCrossId("12Q5V099C30");
+            String time = DateUtil.format(start, "HH:mm:ss");
+            periodCrossingVO.setStart(DateUtil.parse("2025-04-09 " + time, "yyyy-MM-dd HH:mm:ss"));
             periodCrossingVO.setEnd(DateUtil.parse("2025-04-12 00:00:00", "yyyy-MM-dd HH:mm:ss"));
         }
         List<CrossingQueryVO.CycleDataElement> result = trendService.periodCrossingData(periodCrossingVO);
+        if(isMock == true){
+            //提取yyyy-MM-dd
+            String date = DateUtil.format(start, "yyyy-MM-dd");
+            result.forEach(item -> {
+                //提取HH:mm:ss
+                String time = DateUtil.format(item.getTime(), "HH:mm:ss");
+                time = date + " " + time;
+                item.setTime(DateUtil.parse(time, "yyyy-MM-dd HH:mm:ss"));
+            });
+        }
         return JsonViewObject.newInstance().success(result);
     }
 

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

@@ -1648,7 +1648,7 @@ public class TrendServiceImpl implements TrendService {
         }
 
         List<TableQueryVO.CycleDataElement> sortedRes = res.stream()
-                .sorted(Comparator.comparing(TableQueryVO.CycleDataElement::getTime).reversed())
+                .sorted(Comparator.comparing(TableQueryVO.CycleDataElement::getTime)) //.reversed()
                 .collect(Collectors.toList());
         return sortedRes;
     }
@@ -1802,7 +1802,7 @@ public class TrendServiceImpl implements TrendService {
         }
 
         List<CrossingTurnQueryVO.CycleDataElement> sortedRes = res.stream()
-                .sorted(Comparator.comparing(CrossingTurnQueryVO.CycleDataElement::getTime).reversed())
+                .sorted(Comparator.comparing(CrossingTurnQueryVO.CycleDataElement::getTime))//.reversed()
                 .collect(Collectors.toList());
         return sortedRes;
     }
@@ -1961,7 +1961,7 @@ public class TrendServiceImpl implements TrendService {
         }
 
         List<CrossingDirectionQueryVO.CycleDataElement> sortedRes = res.stream()
-                .sorted(Comparator.comparing(CrossingDirectionQueryVO.CycleDataElement::getTime).reversed())
+                .sorted(Comparator.comparing(CrossingDirectionQueryVO.CycleDataElement::getTime)) //.reversed()
                 .collect(Collectors.toList());
         return sortedRes;
     }
@@ -2108,7 +2108,7 @@ public class TrendServiceImpl implements TrendService {
         }
 
         List<CrossingQueryVO.CycleDataElement> sortedRes = res.stream()
-                .sorted(Comparator.comparing(CrossingQueryVO.CycleDataElement::getTime).reversed())
+                .sorted(Comparator.comparing(CrossingQueryVO.CycleDataElement::getTime)) //.reversed()
                 .collect(Collectors.toList());
         return sortedRes;
     }

wj-databus/src/main/resources/mapper/CrossLaneDataHistMapper.xml

@@ -185,7 +185,7 @@
             t2.sort,
             startTime
         ORDER BY
-            t1.start_time asc,
+            startTime asc,
             t2.dir
     </select>
 </mapper>
\ No newline at end of file