From 04ce84fa924049d5a7d5c08b8f9b3e94d12b4c27 Mon Sep 17 00:00:00 2001 From: "3067418132@qq.com" Date: Fri, 31 Jul 2026 08:37:15 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=85=BC=E5=AE=B9=E6=99=A8=E9=B8=A3?= =?UTF-8?q?=E8=8D=AF=E4=B8=9A=E4=BE=9D=E8=B7=9E=E5=86=B7=E9=87=8F=E8=AE=A1?= =?UTF-8?q?=E8=BE=93=E5=87=BA=EF=BC=8C=E7=9B=AE=E5=89=8D=E4=B8=BA=E4=BA=86?= =?UTF-8?q?=E5=BF=AB=EF=BC=8C=E5=9B=BA=E5=AE=9A=E5=88=A4=E6=96=AD=E9=A1=B9?= =?UTF-8?q?=E7=9B=AEid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mh/user/constants/Constant.java | 9 +++++++++ .../com/mh/user/service/impl/DataResultServiceImpl.java | 4 ++++ .../com/mh/user/strategy/ModbusProtocolStrategy.java | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/user-service/src/main/java/com/mh/user/constants/Constant.java b/user-service/src/main/java/com/mh/user/constants/Constant.java index 669f589..3dce9e6 100644 --- a/user-service/src/main/java/com/mh/user/constants/Constant.java +++ b/user-service/src/main/java/com/mh/user/constants/Constant.java @@ -62,4 +62,13 @@ public class Constant { // 项目图片存储路径 public static String PROJECT_IMG_PATH = "\\images\\"; + // 瞬时冷量 + public static String MOMENT_HOT_YILUO_1 = "4176"; + + // 进水温度值 + public static String INT_TEMP_YILUO_1 = "4182"; + + // 出水温度值 + public static String OUT_TEMP_YILUO_1 = "4184"; + } diff --git a/user-service/src/main/java/com/mh/user/service/impl/DataResultServiceImpl.java b/user-service/src/main/java/com/mh/user/service/impl/DataResultServiceImpl.java index b409930..1b60a6c 100644 --- a/user-service/src/main/java/com/mh/user/service/impl/DataResultServiceImpl.java +++ b/user-service/src/main/java/com/mh/user/service/impl/DataResultServiceImpl.java @@ -331,6 +331,10 @@ public class DataResultServiceImpl implements DataResultService { momentCoolingStr = Constant.MOMENT_HOT_YILUO; outTempStr = Constant.OUT_TEMP_YILUO; intTempStr = Constant.INT_TEMP_YILUO; + } else if (projectId.equals("35")) { + momentCoolingStr = Constant.MOMENT_HOT_YILUO_1; + outTempStr = Constant.OUT_TEMP_YILUO_1; + intTempStr = Constant.INT_TEMP_YILUO_1; } // 查询温度低的冷量计 String registerAddr = meterManageMapper.selectRegisterAddr(projectId, intTempStr); diff --git a/user-service/src/main/java/com/mh/user/strategy/ModbusProtocolStrategy.java b/user-service/src/main/java/com/mh/user/strategy/ModbusProtocolStrategy.java index 813b3e9..c21e022 100644 --- a/user-service/src/main/java/com/mh/user/strategy/ModbusProtocolStrategy.java +++ b/user-service/src/main/java/com/mh/user/strategy/ModbusProtocolStrategy.java @@ -93,7 +93,7 @@ public class ModbusProtocolStrategy implements ProtocolStrategy { int dataLengthInt = Integer.parseInt(dataLength, 16); // 截取数据域 String data = receiveData; - if ("2".equals(deviceCodeParamEntity.getDeviceType())) { + if ("2".equals(deviceCodeParamEntity.getDeviceType()) && !"35".equals(deviceCodeParamEntity.getProjectId())) { data = data.substring(data.length() - 8, data.length() - 6) + data.substring(data.length() - 6, data.length() - 4) + data.substring(data.length() - 12, data.length() - 10)