[update] 交通流量添加详细事件戳

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

@@ -431,7 +431,6 @@ public class RunningEvaluateServiceImpl implements RunningEvaluateService {
 
     private List<RunningEvaluateMetricsDetailVO.CrossMetrics> buildMetricsList(
             List<MetricHistDTO> metricHistDTOList, Integer minutes) {
-        List<RunningEvaluateMetricsDetailVO.CrossMetrics> res = new ArrayList<>();
 
         // 按时间段分组
         Map<String, List<MetricHistDTO>> groupedByTime = metricHistDTOList.stream()
@@ -449,9 +448,9 @@ public class RunningEvaluateServiceImpl implements RunningEvaluateService {
         // 获取时间段数组
         List<String> minuteSectionArray = TimeArrayUtil.getMinuteSectionArray(minutes);
         // 计算指标
+        List<RunningEvaluateMetricsDetailVO.CrossMetrics> res = new ArrayList<>();
         for (String section : minuteSectionArray) {
             RunningEvaluateMetricsDetailVO.CrossMetrics crossMetrics = new RunningEvaluateMetricsDetailVO.CrossMetrics();
-            crossMetrics.setMetricTime(section);
             List<MetricHistDTO> dtoList = groupedByTime.get(section);
             if (CollectionUtil.isNotEmpty(dtoList)) {
                 int flowSum = 0;
@@ -489,7 +488,12 @@ public class RunningEvaluateServiceImpl implements RunningEvaluateService {
                 crossMetrics.setDelayTime(delayTimeSum / size);
                 crossMetrics.setEffusionRate(effusionRateSum / size);
                 crossMetrics.setEmptyPhase(emptyPhaseSum);
-                crossMetrics.setTimeStamp(dtoList.get(0).getStartTime());
+                Date currentDate = dtoList.get(0).getStartTime();
+                Calendar instance = Calendar.getInstance();
+                instance.setTime(currentDate);
+                instance.set(Calendar.HOUR_OF_DAY, Integer.parseInt(section.substring(0, 2)));
+                crossMetrics.setTimeStamp(instance.getTime());
+                crossMetrics.setMetricTime(section);
             }
             res.add(crossMetrics);
         }