baifengji
/
separate-gold-service
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix:优化import

master
王梦远 2 months ago
parent
530928e24e
commit
1b52392eae
41 changed files with 27 additions and 100 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/main/java/com/iflytop/sgs/app/cmd/control/AnnealStartCommand.java
  2. 5
      src/main/java/com/iflytop/sgs/app/cmd/control/AnnealStopCommand.java
  3. 1
      src/main/java/com/iflytop/sgs/app/cmd/control/DryStartCommand.java
  4. 1
      src/main/java/com/iflytop/sgs/app/cmd/control/DryStopCommand.java
  5. 1
      src/main/java/com/iflytop/sgs/app/cmd/control/FanStartCommand.java
  6. 1
      src/main/java/com/iflytop/sgs/app/cmd/control/FanStopCommand.java
  7. 4
      src/main/java/com/iflytop/sgs/app/cmd/control/HeatStartCommand.java
  8. 1
      src/main/java/com/iflytop/sgs/app/cmd/control/HeatStopCommand.java
  9. 3
      src/main/java/com/iflytop/sgs/app/cmd/control/LiquidPreFillStartCommand.java
  10. 10
      src/main/java/com/iflytop/sgs/app/cmd/control/LiquidPreFillStopCommand.java
  11. 1
      src/main/java/com/iflytop/sgs/app/cmd/control/MoveToFeedAreaCommand.java
  12. 3
      src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLightOpenCommand.java
  13. 2
      src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidPumpAddCommand.java
  14. 1
      src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidPumpReduceCommand.java
  15. 1
      src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidPumpStartCommand.java
  16. 1
      src/main/java/com/iflytop/sgs/app/controller/DevicePointController.java
  17. 5
      src/main/java/com/iflytop/sgs/app/controller/MotorController.java
  18. 28
      src/main/java/com/iflytop/sgs/app/model/bo/status/SelfTestState.java
  19. 1
      src/main/java/com/iflytop/sgs/app/service/api/ContainerService.java
  20. 1
      src/main/java/com/iflytop/sgs/app/service/api/CraftsService.java
  21. 1
      src/main/java/com/iflytop/sgs/app/service/api/TrayService.java
  22. 2
      src/main/java/com/iflytop/sgs/app/service/device/DeviceSensorService.java
  23. 3
      src/main/java/com/iflytop/sgs/common/service/GDDeviceStatusService.java
  24. 5
      src/main/java/com/iflytop/sgs/hardware/comm/can/A8kCanBusConnection.java
  25. 2
      src/main/java/com/iflytop/sgs/hardware/comm/can/A8kCanBusService.java
  26. 1
      src/main/java/com/iflytop/sgs/hardware/comm/modbus/JSerialCommWrapper.java
  27. 3
      src/main/java/com/iflytop/sgs/hardware/comm/modbus/ModbusMasterService.java
  28. 2
      src/main/java/com/iflytop/sgs/hardware/command/handlers/ChimeBuzzerHandler.java
  29. 2
      src/main/java/com/iflytop/sgs/hardware/command/handlers/IOCtrlHandler.java
  30. 2
      src/main/java/com/iflytop/sgs/hardware/command/handlers/MotorHandler.java
  31. 1
      src/main/java/com/iflytop/sgs/hardware/constants/ActionOvertimeConstant.java
  32. 4
      src/main/java/com/iflytop/sgs/hardware/controller/ServoController.java
  33. 1
      src/main/java/com/iflytop/sgs/hardware/drivers/DIDriver/InputDetectDriver.java
  34. 2
      src/main/java/com/iflytop/sgs/hardware/drivers/LeiSaiServoWrapperDriver.java
  35. 4
      src/main/java/com/iflytop/sgs/hardware/drivers/MiniServoDriver/MiniServoDriver.java
  36. 4
      src/main/java/com/iflytop/sgs/hardware/drivers/StepMotorDriver/StepMotorCtrlDriver.java
  37. 3
      src/main/java/com/iflytop/sgs/hardware/exception/HardwareException.java
  38. 1
      src/main/java/com/iflytop/sgs/hardware/service/GDDeviceStatusServiceImpl.java
  39. 4
      src/main/java/com/iflytop/sgs/hardware/service/ServoService.java
  40. 6
      src/main/java/com/iflytop/sgs/hardware/service/StepMotorService.java
  41. 1
      src/main/java/com/iflytop/sgs/hardware/service/setup/A8kSubModuleRegInitService.java

2
src/main/java/com/iflytop/sgs/app/cmd/control/AnnealStartCommand.java
View File

@ -1,7 +1,5 @@
package com.iflytop.sgs.app.cmd.control;
import cn.hutool.core.lang.Assert;
import cn.hutool.json.JSONArray;
import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.bo.status.device.HeatModuleState;
import com.iflytop.sgs.app.model.dto.CmdDTO;

5
src/main/java/com/iflytop/sgs/app/cmd/control/AnnealStopCommand.java
View File

@ -1,17 +1,12 @@
package com.iflytop.sgs.app.cmd.control;
import cn.hutool.core.lang.Assert;
import cn.hutool.json.JSONArray;
import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.bo.status.device.HeatModuleState;
import com.iflytop.sgs.app.model.dto.CmdDTO;
import com.iflytop.sgs.app.service.device.DeviceStateService;
import com.iflytop.sgs.app.service.device.module.HeatModuleService;
import com.iflytop.sgs.common.annotation.CommandMapping;
import com.iflytop.sgs.common.enums.HeatModuleCode;
import com.iflytop.sgs.common.enums.HeatingType;
import com.iflytop.sgs.common.exception.AppException;
import com.iflytop.sgs.common.result.ResultCode;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

1
src/main/java/com/iflytop/sgs/app/cmd/control/DryStartCommand.java
View File

@ -1,6 +1,5 @@
package com.iflytop.sgs.app.cmd.control;
import cn.hutool.json.JSONArray;
import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.bo.status.device.HeatModuleState;
import com.iflytop.sgs.app.model.dto.CmdDTO;

1
src/main/java/com/iflytop/sgs/app/cmd/control/DryStopCommand.java
View File

@ -1,6 +1,5 @@
package com.iflytop.sgs.app.cmd.control;
import cn.hutool.json.JSONArray;
import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.dto.CmdDTO;
import com.iflytop.sgs.app.service.device.DeviceStateService;

1
src/main/java/com/iflytop/sgs/app/cmd/control/FanStartCommand.java
View File

@ -1,6 +1,5 @@
package com.iflytop.sgs.app.cmd.control;
import cn.hutool.json.JSONArray;
import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.bo.status.device.HeatModuleState;
import com.iflytop.sgs.app.model.dto.CmdDTO;

1
src/main/java/com/iflytop/sgs/app/cmd/control/FanStopCommand.java
View File

@ -1,6 +1,5 @@
package com.iflytop.sgs.app.cmd.control;
import cn.hutool.json.JSONArray;
import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.dto.CmdDTO;
import com.iflytop.sgs.app.service.device.DeviceStateService;

4
src/main/java/com/iflytop/sgs/app/cmd/control/HeatStartCommand.java
View File

@ -1,7 +1,5 @@
package com.iflytop.sgs.app.cmd.control;
import cn.hutool.core.lang.Assert;
import cn.hutool.json.JSONArray;
import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.bo.status.device.HeatModuleState;
import com.iflytop.sgs.app.model.dto.CmdDTO;
@ -10,8 +8,6 @@ import com.iflytop.sgs.app.service.device.module.HeatModuleService;
import com.iflytop.sgs.common.annotation.CommandMapping;
import com.iflytop.sgs.common.enums.HeatModuleCode;
import com.iflytop.sgs.common.enums.HeatingType;
import com.iflytop.sgs.common.exception.AppException;
import com.iflytop.sgs.common.result.ResultCode;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

1
src/main/java/com/iflytop/sgs/app/cmd/control/HeatStopCommand.java
View File

@ -1,6 +1,5 @@
package com.iflytop.sgs.app.cmd.control;
import cn.hutool.json.JSONArray;
import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.dto.CmdDTO;
import com.iflytop.sgs.app.service.device.DeviceStateService;

3
src/main/java/com/iflytop/sgs/app/cmd/control/LiquidPreFillStartCommand.java
View File

@ -1,12 +1,9 @@
package com.iflytop.sgs.app.cmd.control;
import cn.hutool.core.lang.Assert;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.bo.Point3D;
import com.iflytop.sgs.app.model.bo.status.device.SolutionContainerState;
import com.iflytop.sgs.app.model.bo.status.device.TransferModuleState;
import com.iflytop.sgs.app.model.dto.CmdDTO;
import com.iflytop.sgs.app.model.entity.Solutions;
import com.iflytop.sgs.app.service.api.DevicePositionService;

10
src/main/java/com/iflytop/sgs/app/cmd/control/LiquidPreFillStopCommand.java
View File

@ -1,13 +1,7 @@
package com.iflytop.sgs.app.cmd.control;
import cn.hutool.core.lang.Assert;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.bo.Point3D;
import com.iflytop.sgs.app.model.bo.status.device.TransferModuleState;
import com.iflytop.sgs.app.model.dto.CmdDTO;
import com.iflytop.sgs.app.model.entity.Solutions;
import com.iflytop.sgs.app.service.api.DevicePositionService;
import com.iflytop.sgs.app.service.api.SolutionsService;
import com.iflytop.sgs.app.service.api.SystemConfigService;
@ -15,10 +9,6 @@ import com.iflytop.sgs.app.service.device.DeviceStateService;
import com.iflytop.sgs.app.service.device.module.SolutionModuleService;
import com.iflytop.sgs.app.service.device.module.TransferModuleService;
import com.iflytop.sgs.common.annotation.CommandMapping;
import com.iflytop.sgs.common.enums.ValveStateCode;
import com.iflytop.sgs.common.enums.data.DevicePositionCode;
import com.iflytop.sgs.common.exception.AppException;
import com.iflytop.sgs.common.result.ResultCode;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

1
src/main/java/com/iflytop/sgs/app/cmd/control/MoveToFeedAreaCommand.java
View File

@ -10,7 +10,6 @@ import com.iflytop.sgs.app.service.device.DeviceStateService;
import com.iflytop.sgs.app.service.device.module.HeatModuleService;
import com.iflytop.sgs.app.service.device.module.TransferModuleService;
import com.iflytop.sgs.common.annotation.CommandMapping;
import com.iflytop.sgs.common.enums.DeviceSensorCode;
import com.iflytop.sgs.common.enums.HeatModuleCode;
import com.iflytop.sgs.common.enums.data.DevicePositionCode;
import com.iflytop.sgs.common.exception.AppException;

3
src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLightOpenCommand.java
View File

@ -1,6 +1,5 @@
package com.iflytop.sgs.app.cmd.debug;
import cn.hutool.core.lang.Assert;
import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.dto.CmdDTO;
import com.iflytop.sgs.app.service.device.DeviceCommandService;
@ -9,8 +8,6 @@ import com.iflytop.sgs.common.cmd.CommandFuture;
import com.iflytop.sgs.common.cmd.DeviceCommandBundle;
import com.iflytop.sgs.common.cmd.DeviceCommandGenerator;
import com.iflytop.sgs.common.enums.cmd.CmdColor;
import com.iflytop.sgs.common.exception.AppException;
import com.iflytop.sgs.common.result.ResultCode;
import com.iflytop.sgs.common.utils.CommandUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

2
src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidPumpAddCommand.java
View File

@ -3,7 +3,6 @@ package com.iflytop.sgs.app.cmd.debug;
import cn.hutool.core.lang.Assert;
import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.dto.CmdDTO;
import com.iflytop.sgs.app.model.entity.SystemConfig;
import com.iflytop.sgs.app.service.api.SystemConfigService;
import com.iflytop.sgs.app.service.device.DeviceCommandService;
import com.iflytop.sgs.common.annotation.CommandDebugMapping;
@ -11,7 +10,6 @@ import com.iflytop.sgs.common.cmd.CommandFuture;
import com.iflytop.sgs.common.cmd.DeviceCommandBundle;
import com.iflytop.sgs.common.cmd.DeviceCommandGenerator;
import com.iflytop.sgs.common.enums.SystemConfigCode;
import com.iflytop.sgs.common.enums.cmd.CmdDirection;
import com.iflytop.sgs.common.exception.AppException;
import com.iflytop.sgs.common.result.ResultCode;
import com.iflytop.sgs.common.utils.CommandUtil;

1
src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidPumpReduceCommand.java
View File

@ -10,7 +10,6 @@ import com.iflytop.sgs.common.cmd.CommandFuture;
import com.iflytop.sgs.common.cmd.DeviceCommandBundle;
import com.iflytop.sgs.common.cmd.DeviceCommandGenerator;
import com.iflytop.sgs.common.enums.SystemConfigCode;
import com.iflytop.sgs.common.enums.cmd.CmdDirection;
import com.iflytop.sgs.common.exception.AppException;
import com.iflytop.sgs.common.result.ResultCode;
import com.iflytop.sgs.common.utils.CommandUtil;

1
src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidPumpStartCommand.java
View File

@ -3,7 +3,6 @@ package com.iflytop.sgs.app.cmd.debug;
import cn.hutool.core.lang.Assert;
import com.iflytop.sgs.app.core.BaseCommandHandler;
import com.iflytop.sgs.app.model.dto.CmdDTO;
import com.iflytop.sgs.app.model.entity.SystemConfig;
import com.iflytop.sgs.app.service.api.SystemConfigService;
import com.iflytop.sgs.app.service.device.DeviceCommandService;
import com.iflytop.sgs.common.annotation.CommandDebugMapping;

1
src/main/java/com/iflytop/sgs/app/controller/DevicePointController.java
View File

@ -4,7 +4,6 @@ import com.iflytop.sgs.app.model.dto.AddDevicePositionDTO;
import com.iflytop.sgs.app.model.entity.DevicePosition;
import com.iflytop.sgs.app.model.vo.DevicePositionVO;
import com.iflytop.sgs.app.service.api.DevicePositionService;
import com.iflytop.sgs.common.enums.DevicePartId;
import com.iflytop.sgs.common.result.Result;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;

5
src/main/java/com/iflytop/sgs/app/controller/MotorController.java
View File

@ -8,7 +8,10 @@ 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.*;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* 认证控制

28
src/main/java/com/iflytop/sgs/app/model/bo/status/SelfTestState.java
View File

@ -9,41 +9,13 @@ public class SelfTestState {
@Schema(description = "门是否在原点")
private boolean doorOrigin = false;
@Schema(description = "摇匀是否在原点")
private boolean shakeOrigin = false;
@Schema(description = "转运机械臂x轴是否在原点")
private boolean transferXOrigin = false;
@Schema(description = "转运机械臂y轴是否在原点")
private boolean transferYOrigin = false;
@Schema(description = "转运机械臂z轴是否在原点")
private boolean transferZOrigin = false;
@Schema(description = "加液机械臂是否在原点")
private boolean dualRobotOrigin = false;
@Schema(description = "拍子升降是否在原点")
private boolean capLiftingOrigin = false;
@Schema(description = "加热模块01托盘升降是否在原点")
private boolean trayLifting01Origin = false;
@Schema(description = "加热模块02托盘升降是否在原点")
private boolean trayLifting02Origin = false;
@Schema(description = "加热模块03托盘升降是否在原点")
private boolean trayLifting03Origin = false;
@Schema(description = "加热模块04托盘升降是否在原点")
private boolean trayLifting04Origin = false;
@Schema(description = "加热模块05托盘升降是否在原点")
private boolean trayLifting05Origin = false;
@Schema(description = "加热模块06托盘升降是否在原点")
private boolean trayLifting06Origin = false;
}

1
src/main/java/com/iflytop/sgs/app/service/api/ContainerService.java
View File

@ -1,6 +1,5 @@
package com.iflytop.sgs.app.service.api;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.iflytop.sgs.app.mapper.ContainerMapper;
import com.iflytop.sgs.app.model.entity.Container;

1
src/main/java/com/iflytop/sgs/app/service/api/CraftsService.java
View File

@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.iflytop.sgs.app.core.CraftsContext;
import com.iflytop.sgs.app.mapper.CraftsMapper;
import com.iflytop.sgs.app.model.bo.status.crafts.CraftsState;
import com.iflytop.sgs.app.model.bo.status.device.HeatModuleState;
import com.iflytop.sgs.app.model.entity.Crafts;
import com.iflytop.sgs.app.model.entity.Ores;

1
src/main/java/com/iflytop/sgs/app/service/api/TrayService.java
View File

@ -4,7 +4,6 @@ import com.iflytop.sgs.app.model.bo.status.device.TrayState;
import com.iflytop.sgs.app.model.vo.SetTrayTubeVO;
import com.iflytop.sgs.app.service.device.DeviceStateService;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.stereotype.Service;

2
src/main/java/com/iflytop/sgs/app/service/device/DeviceSensorService.java
View File

@ -14,8 +14,6 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
import java.util.List;
@Slf4j
@Service
@RequiredArgsConstructor

3
src/main/java/com/iflytop/sgs/common/service/GDDeviceStatusService.java
View File

@ -1,11 +1,8 @@
package com.iflytop.sgs.common.service;
import com.iflytop.sgs.hardware.exception.HardwareException;
import com.iflytop.sgs.hardware.type.IO.InputIOMId;
import com.iflytop.sgs.hardware.type.Servo.LeisaiServoMId;
import com.iflytop.sgs.hardware.type.StepMotor.StepMotorMId;
import com.iflytop.sgs.hardware.type.driver.HeaterRodSlavedId;
import com.iflytop.sgs.hardware.type.driver.LiquidValveMId;
public interface GDDeviceStatusService {

5
src/main/java/com/iflytop/sgs/hardware/comm/can/A8kCanBusConnection.java
View File

@ -4,7 +4,10 @@ import com.iflytop.sgs.common.utils.ByteArray;
import com.iflytop.sgs.hardware.exception.HardwareException;
import com.iflytop.sgs.hardware.factory.A8kPacketFactory;
import com.iflytop.sgs.hardware.service.AppEventBusService;
import com.iflytop.sgs.hardware.type.*;
import com.iflytop.sgs.hardware.type.A8kPacket;
import com.iflytop.sgs.hardware.type.CmdId;
import com.iflytop.sgs.hardware.type.MId;
import com.iflytop.sgs.hardware.type.ModuleStatus;
import com.iflytop.sgs.hardware.type.appevent.A8kCanBusOnConnectEvent;
import com.iflytop.sgs.hardware.type.error.A8kEcode;
import com.iflytop.sgs.hardware.type.error.AEHardwareError;

2
src/main/java/com/iflytop/sgs/hardware/comm/can/A8kCanBusService.java
View File

@ -4,6 +4,7 @@ import com.iflytop.sgs.common.service.CanBusService;
import com.iflytop.sgs.hardware.constants.ActionOvertimeConstant;
import com.iflytop.sgs.hardware.exception.HardwareException;
import com.iflytop.sgs.hardware.type.*;
import com.iflytop.sgs.hardware.type.StepMotor.StepMotorMId;
import com.iflytop.sgs.hardware.type.error.A8kEcode;
import com.iflytop.sgs.hardware.type.error.AEHardwareError;
import com.iflytop.sgs.hardware.utils.OS;
@ -12,7 +13,6 @@ import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import com.iflytop.sgs.hardware.type.StepMotor.StepMotorMId;
import java.net.URISyntaxException;

1
src/main/java/com/iflytop/sgs/hardware/comm/modbus/JSerialCommWrapper.java
View File

@ -2,7 +2,6 @@ package com.iflytop.sgs.hardware.comm.modbus;
import com.fazecast.jSerialComm.SerialPort;
import com.serotonin.modbus4j.serial.SerialPortWrapper;
import lombok.extern.slf4j.Slf4j;
import java.io.IOException;

3
src/main/java/com/iflytop/sgs/hardware/comm/modbus/ModbusMasterService.java
View File

@ -5,10 +5,9 @@ import com.serotonin.modbus4j.msg.*;
import jakarta.annotation.PostConstruct;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.jboss.logging.BasicLogger;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.util.concurrent.locks.ReentrantLock;

2
src/main/java/com/iflytop/sgs/hardware/command/handlers/ChimeBuzzerHandler.java
View File

@ -6,8 +6,6 @@ import com.iflytop.sgs.common.enums.cmd.CmdBeepMode;
import com.iflytop.sgs.common.enums.cmd.CmdDevice;
import com.iflytop.sgs.hardware.command.CommandHandler;
import com.iflytop.sgs.hardware.drivers.ChimeBuzzerDriver;
import com.iflytop.sgs.hardware.drivers.DODriver.OutputIOCtrlDriver;
import com.iflytop.sgs.hardware.type.IO.OutputIOMId;
import com.iflytop.sgs.hardware.type.MId;
import com.iflytop.sgs.hardware.type.driver.ChimeBuzzerMId;
import lombok.RequiredArgsConstructor;

2
src/main/java/com/iflytop/sgs/hardware/command/handlers/IOCtrlHandler.java
View File

@ -5,8 +5,8 @@ import com.iflytop.sgs.common.enums.cmd.CmdAction;
import com.iflytop.sgs.common.enums.cmd.CmdDevice;
import com.iflytop.sgs.hardware.command.CommandHandler;
import com.iflytop.sgs.hardware.drivers.DODriver.OutputIOCtrlDriver;
import com.iflytop.sgs.hardware.type.MId;
import com.iflytop.sgs.hardware.type.IO.OutputIOMId;
import com.iflytop.sgs.hardware.type.MId;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

2
src/main/java/com/iflytop/sgs/hardware/command/handlers/MotorHandler.java
View File

@ -6,9 +6,9 @@ import com.iflytop.sgs.common.enums.cmd.CmdDevice;
import com.iflytop.sgs.common.enums.cmd.CmdDirection;
import com.iflytop.sgs.hardware.command.CommandHandler;
import com.iflytop.sgs.hardware.drivers.StepMotorDriver.MotorWrapperDriver;
import com.iflytop.sgs.hardware.type.MId;
import com.iflytop.sgs.hardware.type.StepMotor.MotorDirect;
import com.iflytop.sgs.hardware.type.StepMotor.StepMotorMId;
import com.iflytop.sgs.hardware.type.MId;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

1
src/main/java/com/iflytop/sgs/hardware/constants/ActionOvertimeConstant.java
View File

@ -6,7 +6,6 @@ import com.iflytop.sgs.hardware.type.MId;
import com.iflytop.sgs.hardware.type.Servo.LeisaiServoMId;
import com.iflytop.sgs.hardware.type.Servo.LiquidArmMId;
import com.iflytop.sgs.hardware.type.StepMotor.StepMotorMId;
import jakarta.annotation.PostConstruct;
import org.springframework.stereotype.Component;
import java.util.ArrayList;

4
src/main/java/com/iflytop/sgs/hardware/controller/ServoController.java
View File

@ -2,10 +2,10 @@ package com.iflytop.sgs.hardware.controller;
import com.iflytop.sgs.app.service.api.DeviceParamConfigService;
import com.iflytop.sgs.common.result.Result;
import com.iflytop.sgs.hardware.type.Servo.DeviceServoId;
import com.iflytop.sgs.hardware.type.Servo.MiniServoRegIndex;
import com.iflytop.sgs.hardware.exception.HardwareException;
import com.iflytop.sgs.hardware.service.ServoService;
import com.iflytop.sgs.hardware.type.Servo.DeviceServoId;
import com.iflytop.sgs.hardware.type.Servo.MiniServoRegIndex;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;

1
src/main/java/com/iflytop/sgs/hardware/drivers/DIDriver/InputDetectDriver.java
View File

@ -4,7 +4,6 @@ import com.iflytop.sgs.hardware.comm.can.A8kCanBusService;
import com.iflytop.sgs.hardware.exception.HardwareException;
import com.iflytop.sgs.hardware.type.CmdId;
import com.iflytop.sgs.hardware.type.IO.InputIOMId;
import com.iflytop.sgs.hardware.type.ModuleType;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

2
src/main/java/com/iflytop/sgs/hardware/drivers/LeiSaiServoWrapperDriver.java
View File

@ -2,9 +2,9 @@ package com.iflytop.sgs.hardware.drivers;
import com.iflytop.sgs.hardware.config.LeiSaiServoConfig;
import com.iflytop.sgs.hardware.exception.HardwareException;
import com.iflytop.sgs.hardware.type.Servo.LeisaiRegIndex;
import com.iflytop.sgs.hardware.type.Servo.LeisaiServoMId;
import com.iflytop.sgs.hardware.type.Servo.LeisaiServoSpeedLevel;
import com.iflytop.sgs.hardware.type.Servo.LeisaiRegIndex;
import com.iflytop.sgs.hardware.type.StepMotor.MotorDirect;
import com.iflytop.sgs.hardware.utils.Math.StepMotorConverter;
import lombok.RequiredArgsConstructor;

4
src/main/java/com/iflytop/sgs/hardware/drivers/MiniServoDriver/MiniServoDriver.java
View File

@ -3,12 +3,12 @@ package com.iflytop.sgs.hardware.drivers.MiniServoDriver;
import com.iflytop.sgs.hardware.comm.can.A8kCanBusService;
import com.iflytop.sgs.hardware.constants.MiniServoConstant;
import com.iflytop.sgs.hardware.exception.HardwareException;
import com.iflytop.sgs.hardware.type.error.A8kEcode;
import com.iflytop.sgs.hardware.type.error.AEHardwareError;
import com.iflytop.sgs.hardware.type.CmdId;
import com.iflytop.sgs.hardware.type.RegIndex;
import com.iflytop.sgs.hardware.type.Servo.MiniServoMId;
import com.iflytop.sgs.hardware.type.Servo.MiniServoRegIndex;
import com.iflytop.sgs.hardware.type.error.A8kEcode;
import com.iflytop.sgs.hardware.type.error.AEHardwareError;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

4
src/main/java/com/iflytop/sgs/hardware/drivers/StepMotorDriver/StepMotorCtrlDriver.java
View File

@ -3,7 +3,9 @@ package com.iflytop.sgs.hardware.drivers.StepMotorDriver;
import com.iflytop.sgs.hardware.comm.can.A8kCanBusService;
import com.iflytop.sgs.hardware.constants.ActionOvertimeConstant;
import com.iflytop.sgs.hardware.exception.HardwareException;
import com.iflytop.sgs.hardware.type.*;
import com.iflytop.sgs.hardware.type.A8kPacket;
import com.iflytop.sgs.hardware.type.CmdId;
import com.iflytop.sgs.hardware.type.RegIndex;
import com.iflytop.sgs.hardware.type.StepMotor.StepMotorMId;
import com.iflytop.sgs.hardware.type.StepMotor.StepMotorRegIndex;
import com.iflytop.sgs.hardware.type.StepMotor.StepMotorSpeedLevel;

3
src/main/java/com/iflytop/sgs/hardware/exception/HardwareException.java
View File

@ -1,7 +1,8 @@
package com.iflytop.sgs.hardware.exception;
import com.iflytop.sgs.hardware.type.*;
import com.iflytop.sgs.hardware.type.CmdId;
import com.iflytop.sgs.hardware.type.MId;
import com.iflytop.sgs.hardware.type.error.A8kEcode;
import com.iflytop.sgs.hardware.type.error.AECodeError;
import com.iflytop.sgs.hardware.type.error.AEHardwareError;

1
src/main/java/com/iflytop/sgs/hardware/service/GDDeviceStatusServiceImpl.java
View File

@ -5,7 +5,6 @@ import com.iflytop.sgs.hardware.drivers.DIDriver.InputDetectDriver;
import com.iflytop.sgs.hardware.drivers.HeaterRodDriver;
import com.iflytop.sgs.hardware.drivers.LeiSaiServoDriver;
import com.iflytop.sgs.hardware.drivers.LiquidValveDriver;
import com.iflytop.sgs.hardware.drivers.MiniServoDriver.MiniServoDriver;
import com.iflytop.sgs.hardware.drivers.StepMotorDriver.StepMotorCtrlDriver;
import com.iflytop.sgs.hardware.exception.HardwareException;
import com.iflytop.sgs.hardware.type.IO.InputIOMId;

4
src/main/java/com/iflytop/sgs/hardware/service/ServoService.java
View File

@ -1,10 +1,10 @@
package com.iflytop.sgs.hardware.service;
import com.iflytop.sgs.hardware.type.Servo.DeviceServoId;
import com.iflytop.sgs.hardware.drivers.MiniServoDriver.MiniServoDriver;
import com.iflytop.sgs.hardware.exception.HardwareException;
import com.iflytop.sgs.hardware.type.Servo.DeviceServoId;
import com.iflytop.sgs.hardware.type.Servo.MiniServoMId;
import com.iflytop.sgs.hardware.type.Servo.MiniServoRegIndex;
import com.iflytop.sgs.hardware.exception.HardwareException;
import com.iflytop.sgs.hardware.type.error.A8kEcode;
import com.iflytop.sgs.hardware.type.error.AppError;
import lombok.RequiredArgsConstructor;

6
src/main/java/com/iflytop/sgs/hardware/service/StepMotorService.java
View File

@ -1,13 +1,13 @@
package com.iflytop.sgs.hardware.service;
import com.iflytop.sgs.hardware.drivers.StepMotorDriver.*;
import com.iflytop.sgs.hardware.drivers.StepMotorDriver.StepMotorCtrlDriver;
import com.iflytop.sgs.hardware.exception.HardwareException;
import com.iflytop.sgs.hardware.type.error.A8kEcode;
import com.iflytop.sgs.hardware.type.error.AppError;
import com.iflytop.sgs.hardware.type.StepMotor.DeviceStepMotorId;
import com.iflytop.sgs.hardware.type.StepMotor.StepMotorMId;
import com.iflytop.sgs.hardware.type.StepMotor.StepMotorRegIndex;
import com.iflytop.sgs.hardware.type.StepMotor.StepMotorSpeedLevel;
import com.iflytop.sgs.hardware.type.error.A8kEcode;
import com.iflytop.sgs.hardware.type.error.AppError;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

1
src/main/java/com/iflytop/sgs/hardware/service/setup/A8kSubModuleRegInitService.java
View File

@ -11,7 +11,6 @@ import com.iflytop.sgs.hardware.type.RegIndex;
import com.iflytop.sgs.hardware.type.appevent.A8kCanBusOnConnectEvent;
import com.iflytop.sgs.hardware.type.appevent.AppEvent;
import com.iflytop.sgs.hardware.type.db.SubModuleRegInitialValue;
import com.iflytop.sgs.hardware.utils.OS;
import jakarta.annotation.PostConstruct;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

Write Preview
Loading…
Cancel
Save