From b0bcb9d10a8d1f5f5bcc91c47d33d16369cf2476 Mon Sep 17 00:00:00 2001 From: "3067418132@qq.com" Date: Tue, 23 Jun 2026 14:37:47 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=8F=A0=E6=B5=B7=E5=8C=97=E5=B8=88?= =?UTF-8?q?=E5=A4=A7=E7=9B=91=E8=A7=86=E7=AE=A1=E7=90=86=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=83=AD=E6=B3=B5=E5=88=97=E8=A1=A8=E5=86=85=E5=AE=B9=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/service/impl/NowDataServiceImpl.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/user-service/src/main/java/com/mh/user/service/impl/NowDataServiceImpl.java b/user-service/src/main/java/com/mh/user/service/impl/NowDataServiceImpl.java index 37436bb..3433f30 100644 --- a/user-service/src/main/java/com/mh/user/service/impl/NowDataServiceImpl.java +++ b/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( - nowDataEntity -> { + list.stream() + .filter(nowDataEntity -> nowDataEntity.getPumpName() != null && nowDataEntity.getPumpName().contains("热泵")) + .forEach(nowDataEntity -> { MultiControlModel multiControlModel1 = new MultiControlModel(); - BeanUtils.copyProperties(nowDataEntity, multiControlModel1); - multiControlModel1.setBuildingId(buildingId); - multiControlModel1.setBuildingName(list.get(0).getBuildingName()); + BeanUtils.copyProperties(multiControlModel, multiControlModel1); multiControlModel1.setPumpName(nowDataEntity.getPumpName()); multiControlModel1.setPumpId(nowDataEntity.getPumpId()); multiControlModel1.setTempSet(nowDataEntity.getTempSet()); multiControlModel1.setWaterTemp(nowDataEntity.getWaterTemp()); - multiControlModel1.setIsFault(nowDataEntity.getIsFault()); // Fixed method name - multiControlModel1.setPumpRunState(nowDataEntity.getRunState()); // Fixed method name + multiControlModel1.setIsFault(nowDataEntity.getIsFault()); + 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]", ""))