失衡等指标优化

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

@@ -1472,8 +1472,13 @@ public class TrendServiceImpl implements TrendService {
             vo.setTrafficAccidentNum(0);
             //不停车通过率
             vo.setNoStopPassRate(0);
+            if (po.getNoStopRate() != null && po.getNoStopRate() >= 0) {
+                vo.setNoStopPassRate((double) Math.round(po.getNoStopRate()));
+            }
             //一次停车通过率
-            vo.setOneStopPassRate(0);
+            if (po.getOneStopRate() != null && po.getOneStopRate() >= 0) {
+                vo.setOneStopPassRate((double) Math.round(po.getOneStopRate()));
+            }
             //二次停车通过率
             vo.setTwoStopPassRate(0);
             //路口未清空率
@@ -1506,7 +1511,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))
                 .collect(Collectors.toList());
         return sortedRes;
     }
@@ -1590,7 +1595,7 @@ public class TrendServiceImpl implements TrendService {
             vo.setFreeFlowTimes(0);
             //溢流率
             if (po.getEffusionRate() != null) {
-                vo.setOverflowRate(po.getEffusionRate());
+                vo.setOverflowRate((int) Math.round(po.getEffusionRate()));
             }else {
                 vo.setOverflowRate(0.0);
             }
@@ -1617,12 +1622,12 @@ public class TrendServiceImpl implements TrendService {
             //交通事故数
             vo.setTrafficAccidentNum(0);
             //不停车通过率
-            vo.setNoStopPassRate(po.getNoStopRate());
+            vo.setNoStopPassRate((double) Math.round(po.getNoStopRate()));
 
             //一次停车通过率
-            vo.setOneStopPassRate(po.getOneStopRate());
+            vo.setOneStopPassRate((double) Math.round(po.getOneStopRate()));
             //二次停车通过率
-            vo.setTwoStopPassRate(po.getTwoStopRate());
+            vo.setTwoStopPassRate((double) Math.round(po.getTwoStopRate()));
             //路口未清空率
             vo.setCrossNoClearRate(0);
             //平均排队长度
@@ -1648,7 +1653,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))
                 .collect(Collectors.toList());
         return sortedRes;
     }
@@ -1802,7 +1807,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))//
                 .collect(Collectors.toList());
         return sortedRes;
     }
@@ -1961,7 +1966,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)) //
                 .collect(Collectors.toList());
         return sortedRes;
     }
@@ -2071,13 +2076,13 @@ public class TrendServiceImpl implements TrendService {
             vo.setTrafficAccidentNum(0);
             //不停车通过率
             if (po.getNoStopRate() != null) {
-                vo.setNoStopPassRate((int) Math.round(po.getNoStopRate()));
+                vo.setNoStopPassRate((double) Math.round(po.getNoStopRate()));
             }else {
                 vo.setNoStopPassRate(0);
             }
             //一次停车通过率
             if (po.getOneStopRate() != null) {
-                vo.setOneStopPassRate(po.getOneStopRate());
+                vo.setOneStopPassRate((double) Math.round(po.getOneStopRate()));
             }else {
                 vo.setOneStopPassRate(0);
             }
@@ -2108,7 +2113,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)) //
                 .collect(Collectors.toList());
         return sortedRes;
     }
@@ -2546,7 +2551,7 @@ public class TrendServiceImpl implements TrendService {
                         List<MetricHistDTO> metricHistDTOS = crossDataHistMapper.selectMetricHistDTO(crossId, startStamp, endStamp);
                         // 使用全量数据按时间粒度聚合指标
                         List<RunningEvaluateMetricsDetailVO.CrossMetrics> crossMetrics = RunningEvaluateServiceImpl.buildMetricsList(metricHistDTOS, 120);
-                        List<RunningEvaluateMetricsDetailVO.CrossMetrics> collect = crossMetrics.stream().sorted(Comparator.comparing(RunningEvaluateMetricsDetailVO.CrossMetrics::getTimeStamp).reversed()).collect(Collectors.toList());
+                        List<RunningEvaluateMetricsDetailVO.CrossMetrics> collect = crossMetrics.stream().sorted(Comparator.comparing(RunningEvaluateMetricsDetailVO.CrossMetrics::getTimeStamp)).collect(Collectors.toList());
                         top5IndexVO.setMetricsList(collect);
                         hotspotCrossVOS.add(top5IndexVO);
                     }