Browse Source

fix:补全设备操作方法

master
白凤吉 5 months ago
parent
commit
06b8f6fbca
  1. 7
      src/main/java/com/qyft/gd/device/service/DeviceCtrlService.java
  2. 1
      src/main/java/com/qyft/gd/device/service/DeviceStatusService.java
  3. 1
      src/main/java/com/qyft/gd/device/service/impl/CtrlFuncServiceImpl.java
  4. 6
      src/main/java/com/qyft/gd/service/CMDService.java

7
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;
}
}

1
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

1
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

6
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());

Loading…
Cancel
Save