干线周报4.1排序修改为按拥堵次数

signal-optimize-service/src/main/java/net/wanji/opt/servicev2/judgeanalysis/impl/AnalysisGreenCongestionPeriodServiceImpl.java

@@ -263,12 +263,20 @@ public class AnalysisGreenCongestionPeriodServiceImpl implements AnalysisGreenCo
         //按拥堵指数降序排序
 //        List<AnalysisGreenCongestionPeriodVO> periodVOS = voList.stream().sorted(Comparator.comparing(AnalysisGreenCongestionPeriodVO::getCongestIndex).reversed())
 //                .collect(Collectors.toList());
+//        List<GreenReportProblemOverallDataVO> overallDataVOS = greenList.stream().sorted(Comparator.comparing(x -> {
+//            double congestIndexAll = 0;
+//            for (GreenWaveDirProblemDataVO dataVO : x.getList()) {
+//                congestIndexAll += dataVO.getCongestIndex();
+//            }
+//            return - congestIndexAll/x.getList().size();
+//        })).collect(Collectors.toList());
+        //按拥堵次数降序排序
         List<GreenReportProblemOverallDataVO> overallDataVOS = greenList.stream().sorted(Comparator.comparing(x -> {
-            double congestIndexAll = 0;
+            double congestCountAll = 0;
             for (GreenWaveDirProblemDataVO dataVO : x.getList()) {
-                congestIndexAll += dataVO.getCongestIndex();
+                congestCountAll += dataVO.getCongestCount();
             }
-            return - congestIndexAll/x.getList().size();
+            return - congestCountAll;
         })).collect(Collectors.toList());
         List<Integer> greenIds = new ArrayList<>();
         for (GreenReportProblemOverallDataVO periodVO : overallDataVOS) {