Browse Source

fix:推送当前目标湿度

master
guoapeng 5 months ago
parent
commit
fca630d548
  1. 8
      src/main/java/com/qyft/ms/app/service/CMDService.java
  2. 4
      src/main/java/com/qyft/ms/app/service/ISysSettingsService.java
  3. 2
      src/main/java/com/qyft/ms/app/service/StatusService.java
  4. 6
      src/main/java/com/qyft/ms/app/service/impl/ISysSettingsServiceImpl.java

8
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<Supplier<Boolean>> cmdList = new ArrayList<>();
cmdList.add(() -> deviceTcpCMDService.controlValve("Dehumidification", false));
cmdList.add(() -> {
sysSettingsService.updateWorkStatus("idle");
return true;
});
initExecutorThread(cmdList, form);
return true;
}

4
src/main/java/com/qyft/ms/app/service/ISysSettingsService.java

@ -19,4 +19,8 @@ public interface ISysSettingsService extends IService<SysSettings> {
void updateWorkStatus(String washing);
String getWorkStatus();
Double getTargetHumidity();
void updateTargetHumidity(Double humidity);
}

2
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<String, String> 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) {

6
src/main/java/com/qyft/ms/app/service/impl/ISysSettingsServiceImpl.java

@ -29,6 +29,9 @@ public class ISysSettingsServiceImpl extends ServiceImpl<SysSettingsMapper, SysS
@Getter
String workStatus = "idle";
@Getter
Double targetHumidity = 0.0;
@PostConstruct
public void init() {
QueryWrapper<SysSettings> queryWrapper = new QueryWrapper<>();
@ -41,4 +44,7 @@ public class ISysSettingsServiceImpl extends ServiceImpl<SysSettingsMapper, SysS
public void updateWorkStatus(String status) {
workStatus = status;
}
public void updateTargetHumidity(Double humidity) {
targetHumidity = humidity;
}
}
Loading…
Cancel
Save