From 68aeff7da6f643b8b93726157338d0f050aecb3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E5=87=A4=E5=90=89?= <baifengji@163.com>
Date: Sat, 15 Feb 2025 14:54:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=81=9C=E6=AD=A2=E5=8A=A0=E7=83=AD=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=8A=A0=E7=83=AD?=
 =?UTF-8?q?=E7=9B=98id=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/qyft/gd/device/controller/TestController.java | 4 ++--
 src/main/java/com/qyft/gd/device/service/DeviceService.java     | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/qyft/gd/device/controller/TestController.java b/src/main/java/com/qyft/gd/device/controller/TestController.java
index efb0734..dc24dc3 100644
--- a/src/main/java/com/qyft/gd/device/controller/TestController.java
+++ b/src/main/java/com/qyft/gd/device/controller/TestController.java
@@ -211,8 +211,8 @@ public class TestController {
 
     @Operation(summary = "停止加热")
     @GetMapping("/stopHeating")
-    public Result<String> stopHeating() {
-        boolean success = deviceService.stopHeating();
+    public Result<String> stopHeating(@RequestParam String heaterId) {
+        boolean success = deviceService.stopHeating(heaterId);
         if (success) {
             return Result.success();
         } else {
diff --git a/src/main/java/com/qyft/gd/device/service/DeviceService.java b/src/main/java/com/qyft/gd/device/service/DeviceService.java
index 0c5d0fa..29eefbd 100644
--- a/src/main/java/com/qyft/gd/device/service/DeviceService.java
+++ b/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) {
             log.error("TCP stopHeating 指令执行错误 {}", JSONUtil.toJsonStr(deviceFeedback));
             return false;