Browse Source

fix:web socket推送type统一使用WebSocketMessageType

master
白凤吉 6 months ago
parent
commit
0d015d39e3
  1. 2
      src/main/java/com/qyft/gd/common/constant/WebSocketMessageType.java
  2. 5
      src/main/java/com/qyft/gd/service/CMDService.java
  3. 3
      src/main/java/com/qyft/gd/service/StatusService.java

2
src/main/java/com/qyft/gd/common/constant/WebSocketMessageType.java

@ -12,7 +12,7 @@ public class WebSocketMessageType {
/**
* 设备指令反馈
*/
public static final String FEEDBACK = "feedback";
public static final String CMD = "cmd";
/**
* 工艺执行反馈
*/

5
src/main/java/com/qyft/gd/service/CMDService.java

@ -2,6 +2,7 @@ package com.qyft.gd.service;
import cn.hutool.json.JSONUtil;
import com.qyft.gd.common.constant.Commands;
import com.qyft.gd.common.constant.WebSocketMessageType;
import com.qyft.gd.common.result.CMDResultCode;
import com.qyft.gd.device.service.DeviceService;
import com.qyft.gd.model.form.CMDForm;
@ -332,13 +333,13 @@ public class CMDService {
log.error("指令执行异常: {}", JSONUtil.toJsonStr(form));
executionResult.setStatus(CMDResultCode.FAILURE.getCode());
executionResult.setMessage(CMDResultCode.FAILURE.getMsg());
webSocketService.pushMsg("cmd", executionResult);
webSocketService.pushMsg(WebSocketMessageType.CMD, executionResult);
return;
}
}
executionResult.setStatus(CMDResultCode.SUCCESS.getCode());
executionResult.setMessage(CMDResultCode.SUCCESS.getMsg());
webSocketService.pushMsg("cmd", executionResult);
webSocketService.pushMsg(WebSocketMessageType.CMD, executionResult);
}
public boolean executeCommand(CMDForm cmdForm) {

3
src/main/java/com/qyft/gd/service/StatusService.java

@ -1,5 +1,6 @@
package com.qyft.gd.service;
import com.qyft.gd.common.constant.WebSocketMessageType;
import com.qyft.gd.device.model.bo.DeviceStatus;
import com.qyft.gd.device.service.DeviceStateService;
import jakarta.annotation.PostConstruct;
@ -31,7 +32,7 @@ public class StatusService {
@Override
public void run() {
DeviceStatus deviceStatus = deviceStateService.getDeviceStatus();
webSocketService.pushMsg("status", deviceStatus);
webSocketService.pushMsg(WebSocketMessageType.STATUS, deviceStatus);
}
};

Loading…
Cancel
Save