Browse Source

fix:虚拟模式完善

master
白凤吉 3 weeks ago
parent
commit
4f3fc40ecf
  1. 14
      src/main/java/com/qyft/ms/app/controller/SprayTaskController.java
  2. 2
      src/main/java/com/qyft/ms/app/device/status/SprayTask.java
  3. 13
      src/main/java/com/qyft/ms/app/service/SprayTaskService.java
  4. 9
      src/main/java/com/qyft/ms/app/service/VirtualDeviceService.java

14
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();
}
}

2
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;
/**

13
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 {
}

9
src/main/java/com/qyft/ms/app/service/VirtualDeviceService.java

@ -35,8 +35,17 @@ 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) {
// 处理中断异常

Loading…
Cancel
Save