Browse Source

增加获取设备是否完成启动接口

master
白凤吉 4 months ago
parent
commit
052229d95c
  1. 12
      src/main/java/a8k/app/controler/api/v1/app/ctrl/DeviceInitControler.java
  2. 1
      src/main/java/a8k/app/controler/api/v1/app/ws/AppWebSocketEndpointMgr.java

12
src/main/java/a8k/app/controler/api/v1/app/ctrl/DeviceInitControler.java

@ -2,11 +2,11 @@ package a8k.app.controler.api.v1.app.ctrl;
import a8k.app.service.lowerctrl.DeviceMoveToZeroCtrlService; import a8k.app.service.lowerctrl.DeviceMoveToZeroCtrlService;
import a8k.app.service.mainctrl.DeviceInitService; import a8k.app.service.mainctrl.DeviceInitService;
import a8k.app.type.ui.ApiRet;
import a8k.app.service.statemgr.GStateMgrService;
import a8k.app.type.exception.AppException; import a8k.app.type.exception.AppException;
import a8k.app.type.ui.ApiRet;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
@RequiredArgsConstructor @RequiredArgsConstructor
public class DeviceInitControler { public class DeviceInitControler {
private final DeviceInitService deviceInitService; private final DeviceInitService deviceInitService;
private final GStateMgrService gStateMgrService;
@Operation(description = "初始化设备") @Operation(description = "初始化设备")
@PostMapping("/initDevice") @PostMapping("/initDevice")
@ -36,4 +37,11 @@ public class DeviceInitControler {
public ApiRet<DeviceMoveToZeroCtrlService.State> getDeviceInitedTaskState() { public ApiRet<DeviceMoveToZeroCtrlService.State> getDeviceInitedTaskState() {
return ApiRet.success(deviceInitService.getDeviceInitedTaskState()); return ApiRet.success(deviceInitService.getDeviceInitedTaskState());
} }
@Operation(description = "获取设备是否完成启动")
@PostMapping("/isBoardParamInited")
public ApiRet<Boolean> isBoardParamInited() {
return ApiRet.success(gStateMgrService.getBoardParamInited());
}
} }

1
src/main/java/a8k/app/controler/api/v1/app/ws/AppWebSocketEndpointMgr.java

@ -156,7 +156,6 @@ public class AppWebSocketEndpointMgr {
reportState("TubeHolderSetting", tubeHolderSettingMgrService.getTubeHolderSettings()); reportState("TubeHolderSetting", tubeHolderSettingMgrService.getTubeHolderSettings());
} }
@Scheduled(fixedDelay = 200) @Scheduled(fixedDelay = 200)
public void reportDeviceState() { public void reportDeviceState() {
reportState("DeviceWorkState", deviceWorkStateMgrService.getDeviceWorkState()); reportState("DeviceWorkState", deviceWorkStateMgrService.getDeviceWorkState());

Loading…
Cancel
Save