From f6b8468ea8532f719023a409445148be047f6d0a Mon Sep 17 00:00:00 2001 From: mh Date: Wed, 20 Nov 2024 13:52:50 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E5=86=B7=E9=87=8F?= =?UTF-8?q?=E8=AE=A1=E8=A7=A3=E6=9E=90=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mh/user/strategy/ModbusProtocolStrategy.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 c273faf..9a4c85b 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 @@ -205,7 +205,7 @@ public void analysisCloudOrder485(final String data, final DeviceCodeParamEntity System.out.println("插入时间30" + dateStr); } try { - if (registerAddr.equals("0004") || registerAddr.equals("0014")) { + if (registerAddr.equals("0004") || registerAddr.equals("0020")) { dataResultCh.setDeviceAddr(cloudId); dataResultCh.setDeviceType(deviceCodeParam.getDeviceType()); dataResultCh.setFunCode(deviceCodeParam.getFunCode()); @@ -221,7 +221,7 @@ public void analysisCloudOrder485(final String data, final DeviceCodeParamEntity log.info("冷量计==>{},寄存器地址==>{},读数==>{},项目名称==>{}", cloudId, registerAddr, dataResultCh.getCurValue(), projectName); dataResultService.saveDataResultCh(dataResultCh); log.info("冷量计瞬时冷量/流量保存数据库成功!项目名称:{}", projectName); - } else if (registerAddr.equals("0050")) { + } else if (registerAddr.equals("0080")) { dataResultCl.setDeviceAddr(cloudId); dataResultCl.setDeviceType(deviceCodeParam.getDeviceType()); dataResultCl.setCurDate(sdf1.parse(dateStr));