小程序电梯错误调试

lift-batch-service/src/main/java/cn/com/ty/lift/batch/applet/dao/model/request/CommonRequest.java

@@ -43,16 +43,22 @@ public class CommonRequest implements Serializable {
         if (startTimeDate != null) {
             return startTimeDate;
         }
-        return DataStatisticsUtil.getLocalDateTimeFromStr(startTimeDateStr,
-                DataStatisticsConstants.DATA_STATISTICS_TIME_FORMAT);
+        if(StringUtils.isNotBlank(startTimeDateStr)) {
+            return DataStatisticsUtil.getLocalDateTimeFromStr(startTimeDateStr,
+                    DataStatisticsConstants.DATA_STATISTICS_TIME_FORMAT);
+        }
+        return DataStatisticsUtil.getYearFirstTime();
     }
 
     public LocalDateTime getEndTimeDate() {
         if (endTimeDate != null) {
             return endTimeDate;
         }
-        return DataStatisticsUtil.getLocalDateTimeFromStr(endTimeDateStr,
-                DataStatisticsConstants.DATA_STATISTICS_TIME_FORMAT);
+        if(StringUtils.isNotBlank(endTimeDateStr)) {
+            return DataStatisticsUtil.getLocalDateTimeFromStr(endTimeDateStr,
+                    DataStatisticsConstants.DATA_STATISTICS_TIME_FORMAT);
+        }
+        return LocalDateTime.now();
     }
 
     public String getStartTimeDateStr() {

lift-batch-service/src/main/java/cn/com/ty/lift/batch/applet/service/LiftDataService.java

@@ -89,18 +89,24 @@ public class LiftDataService {
             }
 
             //获取时间段内按月份统计的新增电梯数量
-            Map<Integer, Long> monthToNewLiftNums = liftDataModelList.stream()
+            liftDataModelList = liftDataModelList.stream()
                     //获取电梯状态是新增的电梯数据
                     .filter(liftDataModel -> {
                         if (liftDataModel.getLiftStatus() != null) {
                             return liftDataModel.getLiftStatus() == 1;
                         }
                         return false;
-                    })
-                    //通过新增时间顺序排列
-                    .sorted(Comparator.comparing(LiftDataModel::getConnectTime))
-                    .collect(Collectors.groupingBy(liftDataModel ->
-                            DataStatisticsUtil.getMonth(liftDataModel.getConnectTime()), Collectors.counting()));
+                    }).sorted(Comparator.comparing(liftDataModel -> {
+                        if (liftDataModel.getConnectTime() != null) {
+                            return liftDataModel.getConnectTime();
+                        }
+                        return LocalDateTime.of(1997, 1, 1, 0, 0, 0);
+                    })).collect(Collectors.toList());
+            Map<Integer, Long> monthToNewLiftNums = new HashMap<>();
+            if (liftDataModelList.size() > 0) {
+                monthToNewLiftNums = liftDataModelList.stream().collect(Collectors.groupingBy(liftDataModel ->
+                        DataStatisticsUtil.getMonth(liftDataModel.getConnectTime()), Collectors.counting()));
+            }
 
             //获取时间段内按月份统计的丢失电梯数量
             liftDataModelList = liftDataModelList.stream().filter(liftDataModel -> {