1、珠海北师大监视管理添加热泵列表内容数据优化

user-service/src/main/java/com/mh/user/service/impl/NowDataServiceImpl.java

@@ -117,24 +117,24 @@ public class NowDataServiceImpl implements NowDataService {
         }
 
         // 在进行遍历，获取包含热泵的对应数据
-        list.stream().filter(nowDataEntity -> nowDataEntity.getPumpName().contains("热泵")).forEach(
+        list.stream()
-                nowDataEntity -> {
+                .filter(nowDataEntity -> nowDataEntity.getPumpName() != null && nowDataEntity.getPumpName().contains("热泵"))
+                .forEach(nowDataEntity -> {
                     MultiControlModel multiControlModel1 = new MultiControlModel();
-                    BeanUtils.copyProperties(nowDataEntity, multiControlModel1);
+                    BeanUtils.copyProperties(multiControlModel, multiControlModel1);
-                    multiControlModel1.setBuildingId(buildingId);
-                    multiControlModel1.setBuildingName(list.get(0).getBuildingName());
                     multiControlModel1.setPumpName(nowDataEntity.getPumpName());
                     multiControlModel1.setPumpId(nowDataEntity.getPumpId());
                     multiControlModel1.setTempSet(nowDataEntity.getTempSet());
                     multiControlModel1.setWaterTemp(nowDataEntity.getWaterTemp());
-                    multiControlModel1.setIsFault(nowDataEntity.getIsFault()); // Fixed method name
+                    multiControlModel1.setIsFault(nowDataEntity.getIsFault());
-                    multiControlModel1.setPumpRunState(nowDataEntity.getRunState()); // Fixed method name
+                    multiControlModel1.setPumpRunState(nowDataEntity.getRunState());
                     if (!StringUtils.isBlank(nowDataEntity.getWaterLevel())) {
                         multiControlModel1.setWaterLevel(nowDataEntity.getWaterLevel());
+                    } else {
+                        multiControlModel1.setWaterLevel("离线");
                     }
-                    result.add(multiControlModel1); // Add to result list
+                    result.add(multiControlModel1);
-                }
+                });
-                );
         // result再根据热泵名称的数字进行排序
         result.sort(Comparator.comparingInt(multiControlModel1 ->
                 Integer.parseInt(multiControlModel1.getPumpName().replaceAll("[^0-9]", ""))