Merge branch 'huangyuan-user' of lift-manager/lift-server into develop

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

@@ -111,6 +111,12 @@ public class LiftDataService {
                     break;
             }
         }
+        //如果数据超过500返回前500
+        if (returnLiftMapDataModelList != null && returnLiftMapDataModelList.size() > 0) {
+            if (returnLiftMapDataModelList.size() > 500) {
+                returnLiftMapDataModelList = returnLiftMapDataModelList.stream().limit(500L).collect(Collectors.toList());
+            }
+        }
         return RestResponse.success(returnLiftMapDataModelList, ApiConstants.RESULT_SUCCESS, "获取电梯数据成功");
     }
 
@@ -172,11 +178,11 @@ public class LiftDataService {
             if (liftIdToMaintenancePlanStatus.size() > 0) {
                 Integer maintenanceStatus = liftIdToMaintenancePlanStatus.get(liftMapDataModel.getLiftId());
                 if (maintenanceStatus != null) {
-                    if(maintenanceStatus == 0) {
+                    if (maintenanceStatus == 0) {
                         //维保状态 - 待维保
                         liftMapDataModel.setLiftMapStatus(CommonConstants.LiftDataConstants.STATUS_WAIT_MAINTENANCE);
                     }
-                    if(maintenanceStatus == 2) {
+                    if (maintenanceStatus == 2) {
                         //维保状态 - 维保中
                         liftMapDataModel.setLiftMapStatus(CommonConstants.LiftDataConstants.STATUS_GO_MAINTENANCE);
                     }