From c09c63313fca688a4e1960c8fb926b73b974b5d3 Mon Sep 17 00:00:00 2001 From: wangshilong Date: Fri, 7 Mar 2025 21:02:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A9=BA=E5=80=BC=E8=BF=87?= =?UTF-8?q?=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/BusinessMessageHandlerListener.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/isu/gaswellwatch/modbus/data/listener/BusinessMessageHandlerListener.java b/src/main/java/com/isu/gaswellwatch/modbus/data/listener/BusinessMessageHandlerListener.java index 87bef4a..a1216a0 100755 --- a/src/main/java/com/isu/gaswellwatch/modbus/data/listener/BusinessMessageHandlerListener.java +++ b/src/main/java/com/isu/gaswellwatch/modbus/data/listener/BusinessMessageHandlerListener.java @@ -86,11 +86,13 @@ public class BusinessMessageHandlerListener implements BatchMessageListener { String wellStatusKey = getWellStatusKey(device); //比对新旧数据，看开关状态是否一致 if (Objects.nonNull(oldObject.getString(wellStatusKey)) && !Objects.equals(oldObject.getString(wellStatusKey), newObject.getString(wellStatusKey))) { - deviceWellStatusMap.put(Long.valueOf(deviceId), getWellStatusValue(device, newObject, wellStatusKey)); - - if (Objects.isNull(newObject.getInteger(wellStatusKey))) { + Integer wellStatusValue = getWellStatusValue(device, newObject, wellStatusKey); + if (Objects.isNull(wellStatusValue)) { continue; } + + deviceWellStatusMap.put(Long.valueOf(deviceId), wellStatusValue); + //记录开关井状态及对应的套压油压数据 SwitchStatusExport switchStatusExport = new SwitchStatusExport(); switchStatusExport.setId(snowflakeConfig.snowflakeId()); @@ -100,7 +102,7 @@ public class BusinessMessageHandlerListener implements BatchMessageListener { switchStatusExport.setOilPressure(newObject.getString("oilPressure")); switchStatusExport.setBlockId(device.getGasWell().getBlockId()); if (newObject.getInteger(wellStatusKey) != null) { - switchStatusExport.setSwitchStatus(getWellStatusValue(device, newObject, wellStatusKey) == 1 ? "开井" : "关井"); + switchStatusExport.setSwitchStatus(wellStatusValue == 1 ? "开井" : "关井"); } switchStatusExportList.add(switchStatusExport); } @@ -127,12 +129,8 @@ public class BusinessMessageHandlerListener implements BatchMessageListener { } } } - - } } - - } }