首页-电梯地图数据

lift-system-service/src/main/java/cn/com/ty/lift/system/homepage/service/LiftDataService.java

@@ -90,12 +90,23 @@ public class LiftDataService {
         //获取电梯数据
         List<LiftMapDataModel> liftMapDataModelList = getLiftMapDataModel(liftDataRequest);
         if(liftMapDataModelList != null && liftMapDataModelList.size() > 0) {
-            //通过电梯状态进行分组
+            //通过电梯状态进行分组，默认通过状态来获取
             Map<Integer, List<LiftMapDataModel>> statusToLiftData = liftMapDataModelList.stream()
                     .collect(Collectors.groupingBy(LiftMapDataModel::getLiftLocateStatus));
             if(statusToLiftData != null) {
                 returnLiftMapDataModelList = statusToLiftData.get(liftDataRequest.getLiftDataStatus());
             }
+            switch (liftDataRequest.getLiftDataStatus()){
+                case CommonConstants.LiftDataConstants.STATUS_ALL_LIFT:
+                    returnLiftMapDataModelList = liftMapDataModelList;
+                    break;
+                case CommonConstants.LiftDataConstants.STATUS_NO_LOCATE:
+                    //未定位的数据
+                    returnLiftMapDataModelList = liftMapDataModelList.stream()
+                            .filter(liftMapDataModel -> liftMapDataModel.getLiftLocateStatus() == -1)
+                            .collect(Collectors.toList());
+                    break;
+            }
         }
         return RestResponse.success(returnLiftMapDataModelList, ApiConstants.RESULT_SUCCESS, "获取电梯数据成功");
     }