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

Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
wangshilong 2024-12-11 14:03:46 +08:00
parent 140981b95a 4b64948710
commit b656b86725
1 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,6 +86,29 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceDao, Device> implements
Object online = this.redisTemplate.opsForHash().get(deviceKey, "online");
deviceVO.setOnline(online == null ? "" : online.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, "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());
@ -93,16 +116,12 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceDao, Device> implements
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());
}
Dictionary runMode1 = runModeMap.get(runMode.toString());
deviceVO.setRunMode(runMode1 == null ? "" : runMode1.getName());
}
}
Object plugStatus = this.redisTemplate.opsForHash().get(deviceKey, "plugStatus");
if (plugStatus == null) {
deviceVO.setPlugStatus("");