Browse Source

feat:整理格式

master
白凤吉 3 months ago
parent
commit
11d4be466c
  1. 7
      src/main/java/com/iflytop/gd/app/controller/SystemController.java
  2. 7
      src/main/java/com/iflytop/gd/app/service/DeviceInitService.java
  3. 6
      src/main/java/com/iflytop/gd/app/service/SystemConfigService.java
  4. 8
      src/main/java/com/iflytop/gd/hardware/drivers/MiniServoDriver/ClawDriver.java

7
src/main/java/com/iflytop/gd/app/controller/SystemController.java

@ -28,6 +28,13 @@ public class SystemController {
return Result.success(); return Result.success();
} }
@Operation(summary = "模拟向硬件写入完毕")
@GetMapping("/initComplete")
public Result<?> setInitComplete(Boolean initComplete) {
deviceStateService.setInitComplete(initComplete);
return Result.success();
}
@Operation(summary = "系统状态") @Operation(summary = "系统状态")
@GetMapping("/device-status") @GetMapping("/device-status")
public Result<DeviceState> getDeviceStatus() { public Result<DeviceState> getDeviceStatus() {

7
src/main/java/com/iflytop/gd/app/service/DeviceInitService.java

@ -34,15 +34,17 @@ public class DeviceInitService {
public void init() { public void init() {
new Thread(() -> { new Thread(() -> {
try { try {
initDeviceSetData();
initDeviceState(); initDeviceState();
initDeviceSetData();
deviceStateService.setInitComplete(true);
} catch (Exception ignored) { } catch (Exception ignored) {
} }
}).start(); }).start();
} }
public void initDeviceSetData() { public void initDeviceSetData() {
if (deviceStateService.getDeviceState().isVirtual()) {
if (deviceStateService.getDeviceState().isVirtual() || deviceStateService.getDeviceState().isInitComplete()) {
return; return;
} }
try { try {
@ -86,6 +88,5 @@ public class DeviceInitService {
solutionBucket.add(new SolutionContainerState(container.getId(), ContainerCode.valueOf(container.getCode()), ContainerType.neutralization)); solutionBucket.add(new SolutionContainerState(container.getId(), ContainerCode.valueOf(container.getCode()), ContainerType.neutralization));
} }
} }
deviceStateService.setInitComplete(true);
} }
} }

6
src/main/java/com/iflytop/gd/app/service/SystemConfigService.java

@ -19,6 +19,12 @@ import java.io.InputStreamReader;
public class SystemConfigService extends ServiceImpl<SystemConfigMapper, SystemConfig> { public class SystemConfigService extends ServiceImpl<SystemConfigMapper, SystemConfig> {
private final SystemConfigMapper systemConfigMapper; private final SystemConfigMapper systemConfigMapper;
private final DeviceStateService deviceStateService;
public void setInitComplete(boolean initComplete) {
deviceStateService.setInitComplete(initComplete);
}
/** /**
* 设置系统日期和时间 * 设置系统日期和时间

8
src/main/java/com/iflytop/gd/hardware/drivers/MiniServoDriver/ClawDriver.java

@ -1,5 +1,6 @@
package com.iflytop.gd.hardware.drivers.MiniServoDriver; package com.iflytop.gd.hardware.drivers.MiniServoDriver;
import com.iflytop.gd.hardware.exception.HardwareException;
import com.iflytop.gd.hardware.type.Servo.MiniServoMId; import com.iflytop.gd.hardware.type.Servo.MiniServoMId;
import com.iflytop.gd.hardware.utils.Math.ServoPositionConverter; import com.iflytop.gd.hardware.utils.Math.ServoPositionConverter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@ -81,13 +82,14 @@ public class ClawDriver {
} }
// ==== ==== ==== ==== ==== ==== Ctrl ==== ==== ==== ==== ==== ==== // ==== ==== ==== ==== ==== ==== Ctrl ==== ==== ==== ==== ==== ====
public void moveToHome(MiniServoMId servoMid) throws Exception
public void moveToHome(MiniServoMId servoMid) throws HardwareException
{ {
log.info("[ {} ] moveToHome", servoMid.mid.getDescription()); log.info("[ {} ] moveToHome", servoMid.mid.getDescription());
this.moveTo(servoMid, MIN_DISTANCE); this.moveTo(servoMid, MIN_DISTANCE);
} }
public void moveTo(MiniServoMId servoMid, double position) throws Exception
public void moveTo(MiniServoMId servoMid, double position) throws HardwareException
{ {
// 检查位置是否合法 // 检查位置是否合法
if (position < MIN_DISTANCE || position > MAX_DISTANCE) { if (position < MIN_DISTANCE || position > MAX_DISTANCE) {
@ -101,7 +103,7 @@ public class ClawDriver {
miniServoDriver.miniServoEnable(servoMid, 0); miniServoDriver.miniServoEnable(servoMid, 0);
} }
public void stop(MiniServoMId servoMid) throws Exception {
public void stop(MiniServoMId servoMid) throws HardwareException {
log.info("[ {} ] stop", servoMid.mid.getDescription()); log.info("[ {} ] stop", servoMid.mid.getDescription());
miniServoDriver.miniServoStop(servoMid); miniServoDriver.miniServoStop(servoMid);
miniServoDriver.miniServoEnable(servoMid, 0); miniServoDriver.miniServoEnable(servoMid, 0);

Loading…
Cancel
Save