diff --git a/src/main/java/com/qyft/ms/app/service/CMDService.java b/src/main/java/com/qyft/ms/app/service/CMDService.java index 4c55948..6564f6b 100644 --- a/src/main/java/com/qyft/ms/app/service/CMDService.java +++ b/src/main/java/com/qyft/ms/app/service/CMDService.java @@ -469,16 +469,22 @@ public class CMDService { .orElse(0.0); cmdList.add(() -> deviceTcpCMDService.startDehumidify(humidity)); cmdList.add(() -> { - sysSettingsService.updateWorkStatus("idle"); + sysSettingsService.updateTargetHumidity(humidity); return true; }); + initExecutorThread(cmdList, form); return true; } + // 结束除湿 public boolean stopDehumidify(CMDForm form) { List> cmdList = new ArrayList<>(); cmdList.add(() -> deviceTcpCMDService.controlValve("Dehumidification", false)); + cmdList.add(() -> { + sysSettingsService.updateWorkStatus("idle"); + return true; + }); initExecutorThread(cmdList, form); return true; } diff --git a/src/main/java/com/qyft/ms/app/service/ISysSettingsService.java b/src/main/java/com/qyft/ms/app/service/ISysSettingsService.java index 2cbb74d..d15e23e 100644 --- a/src/main/java/com/qyft/ms/app/service/ISysSettingsService.java +++ b/src/main/java/com/qyft/ms/app/service/ISysSettingsService.java @@ -19,4 +19,8 @@ public interface ISysSettingsService extends IService { void updateWorkStatus(String washing); String getWorkStatus(); + + Double getTargetHumidity(); + + void updateTargetHumidity(Double humidity); } diff --git a/src/main/java/com/qyft/ms/app/service/StatusService.java b/src/main/java/com/qyft/ms/app/service/StatusService.java index 0a728da..e3fa1eb 100644 --- a/src/main/java/com/qyft/ms/app/service/StatusService.java +++ b/src/main/java/com/qyft/ms/app/service/StatusService.java @@ -30,8 +30,10 @@ public class StatusService { try { DeviceStatus deviceStatus = deviceStatusService.getDeviceStatus(); String workStatus = sysSettingsService.getWorkStatus(); + Double targetHumidity = sysSettingsService.getTargetHumidity(); Map ingData = new HashMap<>(); ingData.put("workStatus", workStatus); + ingData.put("targetHumidity", String.valueOf(targetHumidity)); webSocketService.pushMsg(WebSocketMessageType.STATUS, deviceStatus); webSocketService.pushMsg(WebSocketMessageType.ING, ingData); } catch (Exception e) { diff --git a/src/main/java/com/qyft/ms/app/service/impl/ISysSettingsServiceImpl.java b/src/main/java/com/qyft/ms/app/service/impl/ISysSettingsServiceImpl.java index ada8abc..e6a9bf5 100644 --- a/src/main/java/com/qyft/ms/app/service/impl/ISysSettingsServiceImpl.java +++ b/src/main/java/com/qyft/ms/app/service/impl/ISysSettingsServiceImpl.java @@ -29,6 +29,9 @@ public class ISysSettingsServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); @@ -41,4 +44,7 @@ public class ISysSettingsServiceImpl extends ServiceImpl