From 6a7984903367d5c74ac959932869b921645b574d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E5=87=A4=E5=90=89?= <baifengji@163.com>
Date: Thu, 20 Mar 2025 18:39:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81500=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/qyft/ms/app/controller/DeviceStatusController.java   |  5 +++--
 .../java/com/qyft/ms/app/device/status/DeviceStatus.java     |  2 ++
 .../com/qyft/ms/system/controller/FrontCmdController.java    | 12 ++++++------
 .../qyft/ms/system/service/device/DeviceCommandService.java  |  8 ++++----
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/qyft/ms/app/controller/DeviceStatusController.java b/src/main/java/com/qyft/ms/app/controller/DeviceStatusController.java
index 7591303..d55443a 100644
--- a/src/main/java/com/qyft/ms/app/controller/DeviceStatusController.java
+++ b/src/main/java/com/qyft/ms/app/controller/DeviceStatusController.java
@@ -1,5 +1,6 @@
 package com.qyft.ms.app.controller;
 
+import cn.hutool.json.JSONObject;
 import com.qyft.ms.app.device.status.DeviceStatus;
 import com.qyft.ms.app.model.vo.SelfTestVO;
 import com.qyft.ms.app.service.SelfTestService;
@@ -22,8 +23,8 @@ public class DeviceStatusController {
 
     @Operation(summary = "获取设备状态")
     @GetMapping("/")
-    public Result<DeviceStatus> getDeviceStatus() {
-        return Result.success(deviceStatus);
+    public Result<JSONObject> getDeviceStatus() {
+        return Result.success(deviceStatus.toJSON());
     }
 
 }
diff --git a/src/main/java/com/qyft/ms/app/device/status/DeviceStatus.java b/src/main/java/com/qyft/ms/app/device/status/DeviceStatus.java
index 0e24535..386e5e5 100644
--- a/src/main/java/com/qyft/ms/app/device/status/DeviceStatus.java
+++ b/src/main/java/com/qyft/ms/app/device/status/DeviceStatus.java
@@ -1,6 +1,7 @@
 package com.qyft.ms.app.device.status;
 
 import cn.hutool.json.JSONObject;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
 import org.springframework.stereotype.Component;
 
@@ -9,6 +10,7 @@ import org.springframework.stereotype.Component;
  */
 @Data
 @Component
+@JsonIgnoreProperties({"advisors", "declaredPointcut", "classFilter"})
 public class DeviceStatus {
 
     /**
diff --git a/src/main/java/com/qyft/ms/system/controller/FrontCmdController.java b/src/main/java/com/qyft/ms/system/controller/FrontCmdController.java
index e4a652b..dabbe1a 100644
--- a/src/main/java/com/qyft/ms/system/controller/FrontCmdController.java
+++ b/src/main/java/com/qyft/ms/system/controller/FrontCmdController.java
@@ -36,12 +36,12 @@ public class FrontCmdController {
         String cmdId = form.getCmdId();
         String cmdCode = form.getCmdCode();
         try {
-            if(!"motor_xyz_origin".equals(cmdCode)){
-                if (!deviceStatus.isSelfTestCompleted()) {
-                    log.error("未进行自检，无法执行业务指令");
-                    return Result.failed("未进行自检，无法执行业务指令");
-                }
-            }
+//            if(!"motor_xyz_origin".equals(cmdCode)){
+//                if (!deviceStatus.isSelfTestCompleted()) {
+//                    log.error("未进行自检，无法执行业务指令");
+//                    return Result.failed("未进行自检，无法执行业务指令");
+//                }
+//            }
             webSocketService.pushDebugMsg(FrontResponseGenerator.generateJson(cmdId, cmdCode, CommandStatus.RECEIVE, "已收到业务指令请求，开始处理"));
             CommandHandler commandHandler = registry.getHandler(cmdCode);
             if (commandHandler == null) {
diff --git a/src/main/java/com/qyft/ms/system/service/device/DeviceCommandService.java b/src/main/java/com/qyft/ms/system/service/device/DeviceCommandService.java
index 6efcfe3..8ceb1a0 100644
--- a/src/main/java/com/qyft/ms/system/service/device/DeviceCommandService.java
+++ b/src/main/java/com/qyft/ms/system/service/device/DeviceCommandService.java
@@ -96,18 +96,18 @@ public class DeviceCommandService {
 
     public void handleDeviceResult(JSONObject deviceResult) {
         String tag = deviceResult.getStr("tag");
-        if ("ack".equals(tag)) {
+        if ("ACK".equals(tag)) {
             completeCommandAck(deviceResult);
-        } else if ("response".equals(tag)) {
+        } else if ("RESPONSE".equals(tag)) {
             completeCommandResponse(deviceResult);
-        } else if ("event".equals(tag)) {
+        } else if ("EVENT".equals(tag)) {
             String eventType = deviceResult.getStr("event_type");
             if ("system_e_stop_pressed".equals(eventType)) {//系统急停按钮被按下
                 deviceStatus.setStopPressed(true);
             } else if ("system_e_stop_released".equals(eventType)) {//系统急停按钮被释放
                 deviceStatus.setStopPressed(false);
             }
-        } else if ("status".equals(tag)) {
+        } else if ("STATUS".equals(tag)) {
 
         }
     }