From d2c050780bc55b5f7f7c319ab8acf15188f8858d Mon Sep 17 00:00:00 2001 From: wangshilong Date: Fri, 7 Mar 2025 00:50:11 +0800 Subject: [PATCH] =?UTF-8?q?ETC=E5=86=99=E6=AD=BB=E8=AE=A1=E6=97=B6?= =?UTF-8?q?=E5=99=A8=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/isu/gaswellwatch/service/impl/DeviceServiceImpl.java | 4 ++-- src/main/resources/mapper/DeviceDao.xml | 2 +- 2 files changed, 3 insertions(+), 3 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 712af88..8806dbf 100644 --- a/src/main/java/com/isu/gaswellwatch/service/impl/DeviceServiceImpl.java +++ b/src/main/java/com/isu/gaswellwatch/service/impl/DeviceServiceImpl.java @@ -138,7 +138,7 @@ public class DeviceServiceImpl extends ServiceImpl implements Dictionary runMode1 = controlModeMap.get(runMode.toString()); deviceVO.setRunMode(runMode1 == null ? "" : runMode1.getName()); } - deviceVO.setRunMode(""); // ETC不显示运行模式，点表中没有改点位 + deviceVO.setRunMode("计时器模式"); // ETC运行模式写死 } 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()); @@ -401,7 +401,7 @@ public class DeviceServiceImpl extends ServiceImpl implements if (CollectionUtil.isNotEmpty(deviceHistoryVO)) { Map runModeMap = this.dictionaryService.getValueMapByType("runMode"); if (PersistenceHandler.ETC_MODBUS_TYPE.equalsIgnoreCase(device.getProduct().getCode())) { - runModeMap = this.dictionaryService.getValueMapByType("controlMode"); + runModeMap = Map.of("1", Dictionary.builder().code("1").name("计时器模式").build()); } else if (PersistenceHandler.SCSS_MODBUS_TYPE.equalsIgnoreCase(device.getProduct().getCode())) { runModeMap = this.dictionaryService.getValueMapByType("ctlMode"); } else if (PersistenceHandler.WEPS_PLUG_MODBUS_TYPE.equalsIgnoreCase(device.getProduct().getCode())) { diff --git a/src/main/resources/mapper/DeviceDao.xml b/src/main/resources/mapper/DeviceDao.xml index 877ecda..88e57f2 100644 --- a/src/main/resources/mapper/DeviceDao.xml +++ b/src/main/resources/mapper/DeviceDao.xml @@ -105,7 +105,7 @@ ,t.pre_pressure,'etc' as type,t.current_status_remaining_time as statusEndTime - ,t.controller_current_status as runMode,t.solenoid_valve_status as wellStatus + ,'1' as runMode,t.solenoid_valve_status as wellStatus ,t.battery_voltage