空处理

signal-optimize-service/src/main/java/net/wanji/opt/servicev2/report/impl/AnalysisGreenWavePeakDetailServiceImpl.java

@@ -71,7 +71,7 @@ public class AnalysisGreenWavePeakDetailServiceImpl extends BaseDubboInterfaceIm
         List<Integer> greenList = Stream.of(ids.split(",")).map(o -> Integer.valueOf(o)).collect(Collectors.toList());
 
         Integer yearWeek = Integer.valueOf(year.toString() + week.toString());
-        Integer lastWeek = yearWeek;//Integer.valueOf(year.toString() + (week - 1));
+        Integer lastWeek = Integer.valueOf(year.toString() + (week - 1));
 
         Map<String, Object> params = new HashMap<>();
         params.put("greenIdList", greenList);
@@ -91,6 +91,9 @@ public class AnalysisGreenWavePeakDetailServiceImpl extends BaseDubboInterfaceIm
         thisWeekDataById.forEach((k, v) -> {
             //上周数据
             List<AnalysisGreenWavePeakDetail> lastWeekDataList = lastWeekDataById.get(k);
+            if (Objects.isNull(lastWeekDataList)) {
+                lastWeekDataList = new ArrayList<>();
+            }
 
             //总体运行情况
             GreenReportRunStateResponseVO runOverviewData = this.getRunOverview(v, lastWeekDataList);
@@ -118,6 +121,7 @@ public class AnalysisGreenWavePeakDetailServiceImpl extends BaseDubboInterfaceIm
                 if (vo1.getCongestStartTime() != null && vo2.getCongestEndTime() != null) {
                     weekData.setThisWeekCongestSpan(DateUtil.formatDate(vo1.getCongestStartTime(), "HH:mm") + "~" + DateUtil.formatDate(vo2.getCongestEndTime(), "HH:mm"));
                 }
+                if (Objects.nonNull(lastWeekDataList)){
                 //上周高峰指标数据
                 Optional<AnalysisGreenWavePeakDetail> optional = lastWeekDataList.stream().filter(o -> Objects.equals(o.getWeekDay(), detail.getWeekDay()) && Objects.equals(o.getPeakType(), detail.getPeakType())).findFirst();
                 if (optional.isPresent()) {
@@ -133,6 +137,7 @@ public class AnalysisGreenWavePeakDetailServiceImpl extends BaseDubboInterfaceIm
                     }
                     weekData.setLastWeekDayPeakSpan(DateUtil.formatDate(optional.get().getPeakStartTime(), "HH:mm") + "~" + DateUtil.formatDate(optional.get().getPeakEndTime(), "HH:mm"));
                 }
+                }
 
                 tableDataList.add(weekData);
             }
@@ -276,8 +281,10 @@ public class AnalysisGreenWavePeakDetailServiceImpl extends BaseDubboInterfaceIm
             vo.setAmMaxTravelTimeSameRatioSituation(maxTravelTimeSituation);
             vo.setAmAvgContestIndex(thisAvgCongestIndex);
             vo.setAmAvgContestIndexSameRatioSituation(amAvgCongestIndex);
-            vo.setThisWeekPeakEarliestStartTime(earliestStartTimePo.getPeakStartTime());
-            vo.setThisWeekPeakLatestEndTime(lastEndTimePo.getPeakEndTime());
+            if (earliestStartTimePo != null && lastEndTimePo != null) {
+                vo.setThisWeekPeakEarliestStartTime(earliestStartTimePo.getPeakStartTime());
+                vo.setThisWeekPeakLatestEndTime(lastEndTimePo.getPeakEndTime());
+            }
         } else if (Objects.equals(peakType, 2)) {
             vo.setWeekPmPeakSpan(amPeakScope);
             vo.setPmStartSameRatioSituation(amPeakStartSituation);
@@ -288,8 +295,10 @@ public class AnalysisGreenWavePeakDetailServiceImpl extends BaseDubboInterfaceIm
             vo.setPmMaxTravelTimeSameRatioSituation(maxTravelTimeSituation);
             vo.setPmAvgContestIndex(thisAvgCongestIndex);
             vo.setPmAvgContestIndexSameRatioSituation(amAvgCongestIndex);
-            vo.setLastWeekPeakEarliestStartTime(earliestStartTimePo.getPeakStartTime());
-            vo.setLastWeekPeakLatestEndTime(lastEndTimePo.getPeakEndTime());
+//            if (earliestStartTimePo != null && lastEndTimePo != null) {
+//                vo.setLastWeekPeakEarliestStartTime(earliestStartTimePo.getPeakStartTime());
+//                vo.setLastWeekPeakLatestEndTime(lastEndTimePo.getPeakEndTime());
+//            }
         }
 
         return vo;
@@ -305,6 +314,9 @@ public class AnalysisGreenWavePeakDetailServiceImpl extends BaseDubboInterfaceIm
      * @return 符合条件的波峰详情对象；如果没有找到符合条件的对象，则返回null
      */
     private AnalysisGreenWavePeakDetail getPeakTimeBoundary(List<AnalysisGreenWavePeakDetail> list, Integer type, Integer peakType) {
+        if (Objects.isNull(list)) {
+            return  null;
+        }
         AnalysisGreenWavePeakDetail ret = null;
         //修改为取交通指数最大的一条记录
 //        Optional<AnalysisGreenWavePeakDetail> optional =  list.stream().filter(o -> Objects.equals(peakType.toString(), o.getPeakType())).min(Comparator.comparing(AnalysisGreenWavePeakDetail::getTrafficIndex).reversed());