From 4b649487100513b3f9e06c591f117d1004ca17c3 Mon Sep 17 00:00:00 2001 From: qinjie <463333974@qq.com> Date: Wed, 11 Dec 2024 13:56:14 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BF=AE=E6=94=B91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DeviceServiceImpl.java | 47 +++++++++++++------ 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/isu/gaswellwatch/service/impl/DeviceServiceImpl.java b/src/main/java/com/isu/gaswellwatch/service/impl/DeviceServiceImpl.java index 276fbd8..ca229ff 100644 --- a/src/main/java/com/isu/gaswellwatch/service/impl/DeviceServiceImpl.java +++ b/src/main/java/com/isu/gaswellwatch/service/impl/DeviceServiceImpl.java @@ -86,23 +86,42 @@ public class DeviceServiceImpl extends ServiceImpl implements Object online = this.redisTemplate.opsForHash().get(deviceKey, "online"); deviceVO.setOnline(online == null ? "" : online.toString()); - Object gas_status = this.redisTemplate.opsForHash().get(deviceKey, "wellStatus"); - deviceVO.setWellStatus(gas_status == null ? "" : gas_status.toString()); + if(PersistenceHandler.ETC_MODBUS_TYPE.equalsIgnoreCase(deviceVO.getProduct().getCode())){ + Object gas_status = this.redisTemplate.opsForHash().get(deviceKey, "solenoidValveStatus"); + deviceVO.setWellStatus(gas_status == null ? "" : gas_status.toString()); - Object runMode = this.redisTemplate.opsForHash().get(deviceKey, "runMode"); - if (runMode == null) { - deviceVO.setRunMode(""); - } else { - Dictionary runMode1 = null; - if(PersistenceHandler.ETC_MODBUS_TYPE.equalsIgnoreCase(deviceVO.getProduct().getCode())){ - runMode1 = controlModeMap.get(runMode.toString()); - }else if(PersistenceHandler.SCSS_MODBUS_TYPE.equalsIgnoreCase(deviceVO.getProduct().getCode())){ - runMode1 = ctlModeMap.get(runMode.toString()); - }else{ - runMode1 = runModeMap.get(runMode.toString()); + Object runMode = this.redisTemplate.opsForHash().get(deviceKey, "controllerCurrentStatus"); + if (runMode == null) { + deviceVO.setRunMode(""); + } else { + Dictionary runMode1 = controlModeMap.get(runMode.toString()); + deviceVO.setRunMode(runMode1 == null ? "" : runMode1.getName()); + } + }else if(PersistenceHandler.SCSS_MODBUS_TYPE.equalsIgnoreCase(deviceVO.getProduct().getCode())){ + Object gas_status = this.redisTemplate.opsForHash().get(deviceKey, "firstSolenoidStatus"); + deviceVO.setWellStatus(gas_status == null ? "" : gas_status.toString()); + + Object runMode = this.redisTemplate.opsForHash().get(deviceKey, "ctlModel"); + if (runMode == null) { + deviceVO.setRunMode(""); + } else { + Dictionary runMode1 = ctlModeMap.get(runMode.toString()); + deviceVO.setRunMode(runMode1 == null ? "" : runMode1.getName()); + } + }else{ + Object gas_status = this.redisTemplate.opsForHash().get(deviceKey, "wellStatus"); + deviceVO.setWellStatus(gas_status == null ? "" : gas_status.toString()); + + Object runMode = this.redisTemplate.opsForHash().get(deviceKey, "runMode"); + if (runMode == null) { + deviceVO.setRunMode(""); + } else { + Dictionary runMode1 = runModeMap.get(runMode.toString()); + deviceVO.setRunMode(runMode1 == null ? "" : runMode1.getName()); } - deviceVO.setRunMode(runMode1 == null ? "" : runMode1.getName()); } + + Object plugStatus = this.redisTemplate.opsForHash().get(deviceKey, "plugStatus"); if (plugStatus == null) { deviceVO.setPlugStatus("");