From 2fb6bef88927a1d7c9096c50fc6ca874390b54b9 Mon Sep 17 00:00:00 2001
From: 25604 <ljf25604@163.com>
Date: Thu, 8 Jan 2026 17:54:39 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=95=B0=E6=8D=AE=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E4=BC=98=E5=8C=96=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CollectionParamsManageServiceImpl.java    |  1 +
 .../mqtt/service/impl/EventsServiceImpl.java  |  1 +
 .../mh/user/strategy/HeatPumpStrategy.java    | 24 +++++++++----------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/user-service/src/main/java/com/mh/user/service/impl/CollectionParamsManageServiceImpl.java b/user-service/src/main/java/com/mh/user/service/impl/CollectionParamsManageServiceImpl.java
index 049bfc1..703e43f 100644
--- a/user-service/src/main/java/com/mh/user/service/impl/CollectionParamsManageServiceImpl.java
+++ b/user-service/src/main/java/com/mh/user/service/impl/CollectionParamsManageServiceImpl.java
@@ -314,6 +314,7 @@ public class CollectionParamsManageServiceImpl implements CollectionParamsManage
                         hotPumpVo.setManualAutoSwitch(item.getCurValue().intValue());
                         hotPumpVo.setManualAutoSwitchId(item.getCpmId());
                     }
+                    break;
                 default:
                     break;
             }
diff --git a/user-service/src/main/java/com/mh/user/service/mqtt/service/impl/EventsServiceImpl.java b/user-service/src/main/java/com/mh/user/service/mqtt/service/impl/EventsServiceImpl.java
index 8be4548..953f280 100644
--- a/user-service/src/main/java/com/mh/user/service/mqtt/service/impl/EventsServiceImpl.java
+++ b/user-service/src/main/java/com/mh/user/service/mqtt/service/impl/EventsServiceImpl.java
@@ -218,6 +218,7 @@ public class EventsServiceImpl implements IEventsService {
                 && collectionParamsManageEntity.getParamTypeId() != 22
                 && collectionParamsManageEntity.getParamTypeId() != 23
                 && collectionParamsManageEntity.getParamTypeId() != 24
+                && collectionParamsManageEntity.getParamTypeId() != 3   // 通过运行状态点判断故障点
         ) {
             DeviceInstallEntity deviceInstallEntity = deviceInstallService.selectDeviceById(collectionParamsManageEntity.getDeviceInstallId());
             if (deviceInstallEntity != null) {
diff --git a/user-service/src/main/java/com/mh/user/strategy/HeatPumpStrategy.java b/user-service/src/main/java/com/mh/user/strategy/HeatPumpStrategy.java
index 31a97e7..1d4ad40 100644
--- a/user-service/src/main/java/com/mh/user/strategy/HeatPumpStrategy.java
+++ b/user-service/src/main/java/com/mh/user/strategy/HeatPumpStrategy.java
@@ -691,12 +691,19 @@ public class HeatPumpStrategy implements DeviceStrategy {
             dataType = "runState";
             if (dataStr.equalsIgnoreCase("2")) { //0
                 sValue = "运行"; //关机
+                //计算热泵运行时间,按分钟
+                nowDataService.proPumpMinutes(deviceInstallEntity.getBuildingId(), deviceInstallEntity.getDeviceAddr(), sValue);
+                log.info("计算热泵运行时长,楼栋名称:" + deviceInstallEntity.getBuildingName() + ",热泵编号:" + deviceInstallEntity.getDeviceAddr() + ",状态:" + sValue);
+            } else if (dataStr.equalsIgnoreCase("4")) {
+                dataType = "isFault";
+                if (dataStr.equals("0")) {
+                    sValue = "无故障";
+                } else {
+                    sValue = "有故障";
+                }
             } else {//2
                 sValue = "不运行";   //制冷
             }
-            //计算热泵运行时间,按分钟
-            nowDataService.proPumpMinutes(deviceInstallEntity.getBuildingId(), deviceInstallEntity.getDeviceAddr(), sValue);
-            log.info("计算热泵运行时长,楼栋名称:" + deviceInstallEntity.getBuildingName() + ",热泵编号:" + deviceInstallEntity.getDeviceAddr() + ",状态:" + sValue);
         } else if (paramTypeId == 7 || paramTypeId == 10) {
             //7设定温度,10水箱水温
             if (paramTypeId == 7) {
@@ -728,13 +735,8 @@ public class HeatPumpStrategy implements DeviceStrategy {
             } else {
                 pumpSetService.updatePumpSetTemp(sValue, deviceInstallEntity.getBuildingId(), deviceInstallEntity.getDeviceAddr()); //更新设定温度
             }
-        } else if (paramTypeId == 3) { //故障状态
-            dataType = "isFault";
-            if (dataStr.equals("0")) {
-                sValue = "无故障";
-            } else {
-                sValue = "有故障";
-            }
+            nowDataService.proWaterTemp(dateStr, deviceInstallEntity.getBuildingId(), deviceInstallEntity.getDeviceAddr()); //保存楼栋时间点温度变化
+            log.info("----------------保存楼栋时间点温度变化值！----------------");
         } else {
             return null;
         }
@@ -742,8 +744,6 @@ public class HeatPumpStrategy implements DeviceStrategy {
             nowDataService.saveNowHistoryData(deviceInstallEntity.getDeviceAddr(), "热泵", sValue, dataType.toString(), deviceInstallEntity.getBuildingId());
             log.info("时间： " + dateStr + "热泵ID：" + deviceInstallEntity.getDeviceAddr() + ",数据： " + dataStr + ",保存数据库成功！楼栋名称：" + deviceInstallEntity.getBuildingName());
         }
-        nowDataService.proWaterTemp(dateStr, deviceInstallEntity.getBuildingId(), deviceInstallEntity.getDeviceAddr()); //保存楼栋时间点温度变化
-        log.info("----------------保存楼栋时间点温度变化值！----------------");
         return sValue;
     }
 }