From 06b8f6fbca4394adfe9a7025df700b72c79292a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E5=87=A4=E5=90=89?= <baifengji@163.com>
Date: Fri, 28 Feb 2025 19:00:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=A1=A5=E5=85=A8=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/qyft/gd/device/service/DeviceCtrlService.java    | 7 +++++++
 src/main/java/com/qyft/gd/device/service/DeviceStatusService.java  | 1 -
 .../java/com/qyft/gd/device/service/impl/CtrlFuncServiceImpl.java  | 1 +
 src/main/java/com/qyft/gd/service/CMDService.java                  | 6 +++++-
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/qyft/gd/device/service/DeviceCtrlService.java b/src/main/java/com/qyft/gd/device/service/DeviceCtrlService.java
index ea8c7eb..b9f7759 100644
--- a/src/main/java/com/qyft/gd/device/service/DeviceCtrlService.java
+++ b/src/main/java/com/qyft/gd/device/service/DeviceCtrlService.java
@@ -341,4 +341,11 @@ public class DeviceCtrlService {
     public boolean takePhoto(Map<String, Object> params) {
         return deviceTcpCMDService.takePhoto();
     }
+
+    /**
+     * 刷新传感器状态
+     */
+    public boolean refreshDeviceStatus(Map<String, Object> params){
+        return true;
+    }
 }
diff --git a/src/main/java/com/qyft/gd/device/service/DeviceStatusService.java b/src/main/java/com/qyft/gd/device/service/DeviceStatusService.java
index 6c1aa9f..0b52074 100644
--- a/src/main/java/com/qyft/gd/device/service/DeviceStatusService.java
+++ b/src/main/java/com/qyft/gd/device/service/DeviceStatusService.java
@@ -19,7 +19,6 @@ public class DeviceStatusService {
     private final DeviceStatus deviceStatus = new DeviceStatus();
     /**
      * 设备业务状态
-     * -- GETTER --
      * 更新设备业务操作状态
      */
     @Getter
diff --git a/src/main/java/com/qyft/gd/device/service/impl/CtrlFuncServiceImpl.java b/src/main/java/com/qyft/gd/device/service/impl/CtrlFuncServiceImpl.java
index 69e3a33..e0c2b2d 100644
--- a/src/main/java/com/qyft/gd/device/service/impl/CtrlFuncServiceImpl.java
+++ b/src/main/java/com/qyft/gd/device/service/impl/CtrlFuncServiceImpl.java
@@ -49,6 +49,7 @@ public class CtrlFuncServiceImpl extends ServiceImpl<CtrlFuncMapper, CtrlFunc> i
         ctrlFuncDeviceCMDList.add(new DeviceCtrlFuncCMD("开始摇匀", "startShaking", "{}"));
         ctrlFuncDeviceCMDList.add(new DeviceCtrlFuncCMD("停止摇匀", "stopShaking", "{}"));
         ctrlFuncDeviceCMDList.add(new DeviceCtrlFuncCMD("拍照", "takePhoto", "{}"));
+        ctrlFuncDeviceCMDList.add(new DeviceCtrlFuncCMD("刷新传感器状态", "refreshDeviceStatus", "{}"));
     }
 
     @Override
diff --git a/src/main/java/com/qyft/gd/service/CMDService.java b/src/main/java/com/qyft/gd/service/CMDService.java
index 6fcbaec..7410e8b 100644
--- a/src/main/java/com/qyft/gd/service/CMDService.java
+++ b/src/main/java/com/qyft/gd/service/CMDService.java
@@ -48,7 +48,11 @@ public class CMDService {
                 Map<String, Object> params;
                 if (ctrlFuncStep.getParams() == null) { // 如果没有参数定义，使用传入的参数
                     try {
-                        params = (Map<String, Object>) paramsList.get(index);
+                        if(paramsList.size() == 1){
+                            params = (Map<String, Object>) paramsList.get(0);
+                        }else{
+                            params = (Map<String, Object>) paramsList.get(index);
+                        }
                     } catch (IndexOutOfBoundsException e) {
                         log.error("指令执行错误，传参错误: {}", JSONUtil.toJsonStr(cmdForm));
                         executionResult.setStatus(CMDResultCode.FAILURE.getCode());