project-zsy
/
gasWellWatch
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ETC写死计时器模式

This commit is contained in:
wangshilong 2025-03-07 00:50:11 +08:00
parent 4ff1723f65
commit d2c050780b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/isu/gaswellwatch/service/impl/DeviceServiceImpl.java
View File

@ -138,7 +138,7 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceDao, Device> implements
Dictionary runMode1 = controlModeMap.get(runMode.toString()); Dictionary runMode1 = controlModeMap.get(runMode.toString());
deviceVO.setRunMode(runMode1 == null ? "" : runMode1.getName()); deviceVO.setRunMode(runMode1 == null ? "" : runMode1.getName());
} }
deviceVO.setRunMode(""); // ETC不显示运行模式，点表中没有改点位 deviceVO.setRunMode("计时器模式"); // ETC运行模式写死
} else if (PersistenceHandler.SCSS_MODBUS_TYPE.equalsIgnoreCase(deviceVO.getProduct().getCode())) { } else if (PersistenceHandler.SCSS_MODBUS_TYPE.equalsIgnoreCase(deviceVO.getProduct().getCode())) {
Object gas_status = this.redisTemplate.opsForHash().get(deviceKey, "firstSolenoidStatus"); Object gas_status = this.redisTemplate.opsForHash().get(deviceKey, "firstSolenoidStatus");
deviceVO.setWellStatus(gas_status == null ? "" : gas_status.toString()); deviceVO.setWellStatus(gas_status == null ? "" : gas_status.toString());
@ -401,7 +401,7 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceDao, Device> implements
if (CollectionUtil.isNotEmpty(deviceHistoryVO)) { if (CollectionUtil.isNotEmpty(deviceHistoryVO)) {
Map<String, Dictionary> runModeMap = this.dictionaryService.getValueMapByType("runMode"); Map<String, Dictionary> runModeMap = this.dictionaryService.getValueMapByType("runMode");
if (PersistenceHandler.ETC_MODBUS_TYPE.equalsIgnoreCase(device.getProduct().getCode())) { 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())) { } else if (PersistenceHandler.SCSS_MODBUS_TYPE.equalsIgnoreCase(device.getProduct().getCode())) {
runModeMap = this.dictionaryService.getValueMapByType("ctlMode"); runModeMap = this.dictionaryService.getValueMapByType("ctlMode");
} else if (PersistenceHandler.WEPS_PLUG_MODBUS_TYPE.equalsIgnoreCase(device.getProduct().getCode())) { } else if (PersistenceHandler.WEPS_PLUG_MODBUS_TYPE.equalsIgnoreCase(device.getProduct().getCode())) {

2
src/main/resources/mapper/DeviceDao.xml
View File

@ -105,7 +105,7 @@
</when> </when>
<when test="deviceProduct!=null and deviceProduct=='etc'"> <when test="deviceProduct!=null and deviceProduct=='etc'">
,t.pre_pressure,'etc' as type,t.current_status_remaining_time as statusEndTime ,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 ,t.battery_voltage
</when> </when>
<when test="deviceProduct!=null and deviceProduct=='scss'"> <when test="deviceProduct!=null and deviceProduct=='scss'">