电梯状态设置

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

@@ -52,7 +52,7 @@ public class LiftDataService {
         List<LiftMapDataModel> liftMapDataModelList = getLiftMapDataModel(liftDataRequest);
         if (liftMapDataModelList != null && liftMapDataModelList.size() > 0) {
             //设置总电梯数
-            liftStatusToNum.put(CommonConstants.LiftDataConstants.STATUS_ALL_LIFT, liftMapDataModelList.stream().count());
+            liftStatusToNum.put(CommonConstants.LiftDataConstants.STATUS_ALL_LIFT, (long) liftMapDataModelList.size());
             //设置未定位电梯数
             long noLocateCount = liftMapDataModelList.stream()
                     .filter(liftMapDataModel -> liftMapDataModel.getLiftLocateStatus() == -1).count();
@@ -139,18 +139,13 @@ public class LiftDataService {
             List<MtPlanDataModel> mtPlanDataModelList = commonDataMapper.getMtPlanData(liftDataRequest);
             //将维保计划数据转化为 liftId(电梯id) -> status(维保计划状态)
             final Map<Long, Integer> liftIdToMaintenancePlanStatus = getLiftIdToMaintenancePlanStatus(mtPlanDataModelList);
-            //获取维保记录
-            List<MtRecordDataModel> mtRecordDataModelList = commonDataMapper.getMtRecordData(liftDataRequest);
-            //将维保记录数据转化为 liftId(电梯id) -> status(维保记录状态)
-            final Map<Long, String> liftIdToMaintenanceRecordStatus = getLiftIdToMaintenanceRecordStatus(
-                    mtRecordDataModelList);
             //获取急修记录
             List<EmergencyRecordDataModel> emergencyRecordDataModelList =
                     commonDataMapper.getEmergencyRecordData(liftDataRequest);
             //将急修记录数据转化为 liftId(电梯id) -> status(急修状态)
             final Map<Long, Integer> liftIdToEmergencyStatus = getLiftIdToEmergencyStatus(emergencyRecordDataModelList);
             //设置电梯状态
-            setLiftMapStatus(liftMapDataModelList, liftIdToMaintenancePlanStatus, liftIdToMaintenanceRecordStatus, liftIdToEmergencyStatus);
+            setLiftMapStatus(liftMapDataModelList, liftIdToMaintenancePlanStatus, liftIdToEmergencyStatus);
         }
         return liftMapDataModelList;
     }
@@ -163,7 +158,6 @@ public class LiftDataService {
      */
     private void setLiftMapStatus(List<LiftMapDataModel> liftMapDataModelList,
                                   Map<Long, Integer> liftIdToMaintenancePlanStatus,
-                                  Map<Long, String> liftIdToMaintenanceRecordStatus,
                                   Map<Long, Integer> liftIdToEmergencyStatus) {
         //循环设置电梯状态
         liftMapDataModelList.forEach(liftMapDataModel -> {
@@ -178,16 +172,16 @@ public class LiftDataService {
             if (liftIdToMaintenancePlanStatus.size() > 0) {
                 Integer maintenanceStatus = liftIdToMaintenancePlanStatus.get(liftMapDataModel.getLiftId());
                 if (maintenanceStatus != null) {
-                    //状态不为空说明有维保计划，设置待维保
-                    liftMapDataModel.setLiftMapStatus(CommonConstants.LiftDataConstants.STATUS_WAIT_MAINTENANCE);
-                    if (liftIdToMaintenanceRecordStatus.size() > 0) {
-                        if (liftIdToMaintenanceRecordStatus.get(liftMapDataModel.getLiftId()) != null) {
-                            //有维保记录设置为维保中
-                            liftMapDataModel.setLiftMapStatus(CommonConstants.LiftDataConstants.STATUS_GO_MAINTENANCE);
-                        }
+                    if(maintenanceStatus == 0) {
+                        //维保状态 - 待维保
+                        liftMapDataModel.setLiftMapStatus(CommonConstants.LiftDataConstants.STATUS_WAIT_MAINTENANCE);
+                    }
+                    if(maintenanceStatus == 2) {
+                        //维保状态 - 维保中
+                        liftMapDataModel.setLiftMapStatus(CommonConstants.LiftDataConstants.STATUS_GO_MAINTENANCE);
                     }
-                    //设置维保完成
                     if (maintenanceStatus == 1) {
+                        //维保完成
                         liftMapDataModel.setLiftMapStatus(CommonConstants.LiftDataConstants.STATUS_HAVE_MAINTENANCE);
                     }
                 }