From 4f3fc40ecf2966bf09dfcd18bbfc1deda347658d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=87=A4=E5=90=89?= Date: Sat, 12 Jul 2025 22:07:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=99=9A=E6=8B=9F=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/qyft/ms/app/controller/SprayTaskController.java | 14 ++++++++++++++ src/main/java/com/qyft/ms/app/device/status/SprayTask.java | 2 +- .../java/com/qyft/ms/app/service/SprayTaskService.java | 13 +++++++++++++ .../java/com/qyft/ms/app/service/VirtualDeviceService.java | 9 +++++++++ 4 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/qyft/ms/app/service/SprayTaskService.java diff --git a/src/main/java/com/qyft/ms/app/controller/SprayTaskController.java b/src/main/java/com/qyft/ms/app/controller/SprayTaskController.java index 67e9650..fbb966f 100644 --- a/src/main/java/com/qyft/ms/app/controller/SprayTaskController.java +++ b/src/main/java/com/qyft/ms/app/controller/SprayTaskController.java @@ -2,12 +2,14 @@ package com.qyft.ms.app.controller; import com.qyft.ms.app.device.status.SprayTask; import com.qyft.ms.app.model.vo.SprayTaskStatusVO; +import com.qyft.ms.app.service.SprayTaskService; import com.qyft.ms.system.common.result.Result; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -17,6 +19,7 @@ import org.springframework.web.bind.annotation.RestController; @RequiredArgsConstructor @Slf4j public class SprayTaskController { + private final SprayTaskService sprayTaskService; @Operation(summary = "获取喷涂状态") @GetMapping("/status") @@ -30,4 +33,15 @@ public class SprayTaskController { return Result.success(sprayTaskStatusVO); } + @Operation(summary = "设置喷涂参数") + @PostMapping("/set-params") + public Result setSprayParams() { + return Result.success(); + } + + @Operation(summary = "获取当前喷涂参数") + @GetMapping("/get-params") + public Result getSprayParams() { + return Result.success(); + } } diff --git a/src/main/java/com/qyft/ms/app/device/status/SprayTask.java b/src/main/java/com/qyft/ms/app/device/status/SprayTask.java index 268f9ea..2bd25c4 100644 --- a/src/main/java/com/qyft/ms/app/device/status/SprayTask.java +++ b/src/main/java/com/qyft/ms/app/device/status/SprayTask.java @@ -42,7 +42,7 @@ public class SprayTask { */ private volatile boolean closing = false; /** - * 设备是否正在进行的喷涂任务 + * 设备是否正在进行的喷涂 */ private volatile boolean spraying = false; /** diff --git a/src/main/java/com/qyft/ms/app/service/SprayTaskService.java b/src/main/java/com/qyft/ms/app/service/SprayTaskService.java new file mode 100644 index 0000000..99b6aed --- /dev/null +++ b/src/main/java/com/qyft/ms/app/service/SprayTaskService.java @@ -0,0 +1,13 @@ +package com.qyft.ms.app.service; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +/** + * 喷涂任务服务 + */ +@Service +@RequiredArgsConstructor +public class SprayTaskService { + +} diff --git a/src/main/java/com/qyft/ms/app/service/VirtualDeviceService.java b/src/main/java/com/qyft/ms/app/service/VirtualDeviceService.java index 80135c5..ab63e4b 100644 --- a/src/main/java/com/qyft/ms/app/service/VirtualDeviceService.java +++ b/src/main/java/com/qyft/ms/app/service/VirtualDeviceService.java @@ -35,7 +35,16 @@ public class VirtualDeviceService { data.putOnce("humidity", 26); jsonObject.putOnce("data", data); } + }else if (device.contains("device")) { + if (action.contains("get")) {//获取设备整体状态 + JSONObject data = new JSONObject(); + data.putOnce("xAxisAtOrigin", 10); + data.putOnce("yAxisAtOrigin", 10); + data.putOnce("zAxisAtOrigin", 10); + jsonObject.putOnce("data", data); + } } + } deviceCommandService.completeCommandResponse(jsonObject); } catch (InterruptedException e) {