Browse Source

停止加热方法增加一个加热盘id参数

master
白凤吉 6 months ago
parent
commit
68aeff7da6
  1. 4
      src/main/java/com/qyft/gd/device/controller/TestController.java
  2. 7
      src/main/java/com/qyft/gd/device/service/DeviceService.java

4
src/main/java/com/qyft/gd/device/controller/TestController.java

@ -211,8 +211,8 @@ public class TestController {
@Operation(summary = "停止加热") @Operation(summary = "停止加热")
@GetMapping("/stopHeating") @GetMapping("/stopHeating")
public Result<String> stopHeating() {
boolean success = deviceService.stopHeating();
public Result<String> stopHeating(@RequestParam String heaterId) {
boolean success = deviceService.stopHeating(heaterId);
if (success) { if (success) {
return Result.success(); return Result.success();
} else { } else {

7
src/main/java/com/qyft/gd/device/service/DeviceService.java

@ -288,9 +288,12 @@ public class DeviceService {
/** /**
* 停止加热 * 停止加热
* @param heaterId 加热器id
*/ */
public boolean stopHeating() {
DeviceFeedback deviceFeedback = tcpClient.sendCommand("stopHeating");
public boolean stopHeating(String heaterId) {
Map<String, Object> params = new HashMap<>();
params.put("heaterId", heaterId);
DeviceFeedback deviceFeedback = tcpClient.sendCommand("stopHeating", params);
if (deviceFeedback == null || deviceFeedback.getError() != null) { if (deviceFeedback == null || deviceFeedback.getError() != null) {
log.error("TCP stopHeating 指令执行错误 {}", JSONUtil.toJsonStr(deviceFeedback)); log.error("TCP stopHeating 指令执行错误 {}", JSONUtil.toJsonStr(deviceFeedback));
return false; return false;

Loading…
Cancel
Save