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 params) { return deviceTcpCMDService.takePhoto(); } + + /** + * 刷新传感器状态 + */ + public boolean refreshDeviceStatus(Map 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 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 params; if (ctrlFuncStep.getParams() == null) { // 如果没有参数定义,使用传入的参数 try { - params = (Map) paramsList.get(index); + if(paramsList.size() == 1){ + params = (Map) paramsList.get(0); + }else{ + params = (Map) paramsList.get(index); + } } catch (IndexOutOfBoundsException e) { log.error("指令执行错误,传参错误: {}", JSONUtil.toJsonStr(cmdForm)); executionResult.setStatus(CMDResultCode.FAILURE.getCode());