diff --git a/src/main/java/com/iflytop/sgs/app/cmd/control/AnnealStartCommand.java b/src/main/java/com/iflytop/sgs/app/cmd/control/AnnealStartCommand.java index bbd5eb4..748a6db 100644 --- a/src/main/java/com/iflytop/sgs/app/cmd/control/AnnealStartCommand.java +++ b/src/main/java/com/iflytop/sgs/app/cmd/control/AnnealStartCommand.java @@ -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; diff --git a/src/main/java/com/iflytop/sgs/app/cmd/control/AnnealStopCommand.java b/src/main/java/com/iflytop/sgs/app/cmd/control/AnnealStopCommand.java index 5ce45d5..6537d4d 100644 --- a/src/main/java/com/iflytop/sgs/app/cmd/control/AnnealStopCommand.java +++ b/src/main/java/com/iflytop/sgs/app/cmd/control/AnnealStopCommand.java @@ -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; diff --git a/src/main/java/com/iflytop/sgs/app/cmd/control/DryStartCommand.java b/src/main/java/com/iflytop/sgs/app/cmd/control/DryStartCommand.java index afae291..8be6b47 100644 --- a/src/main/java/com/iflytop/sgs/app/cmd/control/DryStartCommand.java +++ b/src/main/java/com/iflytop/sgs/app/cmd/control/DryStartCommand.java @@ -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; diff --git a/src/main/java/com/iflytop/sgs/app/cmd/control/DryStopCommand.java b/src/main/java/com/iflytop/sgs/app/cmd/control/DryStopCommand.java index 475dd1a..5d66004 100644 --- a/src/main/java/com/iflytop/sgs/app/cmd/control/DryStopCommand.java +++ b/src/main/java/com/iflytop/sgs/app/cmd/control/DryStopCommand.java @@ -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; diff --git a/src/main/java/com/iflytop/sgs/app/cmd/control/FanStartCommand.java b/src/main/java/com/iflytop/sgs/app/cmd/control/FanStartCommand.java index 7fcd6ca..0816d20 100644 --- a/src/main/java/com/iflytop/sgs/app/cmd/control/FanStartCommand.java +++ b/src/main/java/com/iflytop/sgs/app/cmd/control/FanStartCommand.java @@ -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; diff --git a/src/main/java/com/iflytop/sgs/app/cmd/control/FanStopCommand.java b/src/main/java/com/iflytop/sgs/app/cmd/control/FanStopCommand.java index 8c6ad85..cf586f2 100644 --- a/src/main/java/com/iflytop/sgs/app/cmd/control/FanStopCommand.java +++ b/src/main/java/com/iflytop/sgs/app/cmd/control/FanStopCommand.java @@ -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; diff --git a/src/main/java/com/iflytop/sgs/app/cmd/control/HeatStartCommand.java b/src/main/java/com/iflytop/sgs/app/cmd/control/HeatStartCommand.java index 9242217..71ddd82 100644 --- a/src/main/java/com/iflytop/sgs/app/cmd/control/HeatStartCommand.java +++ b/src/main/java/com/iflytop/sgs/app/cmd/control/HeatStartCommand.java @@ -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; diff --git a/src/main/java/com/iflytop/sgs/app/cmd/control/HeatStopCommand.java b/src/main/java/com/iflytop/sgs/app/cmd/control/HeatStopCommand.java index 9ea9917..cb98e86 100644 --- a/src/main/java/com/iflytop/sgs/app/cmd/control/HeatStopCommand.java +++ b/src/main/java/com/iflytop/sgs/app/cmd/control/HeatStopCommand.java @@ -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; diff --git a/src/main/java/com/iflytop/sgs/app/cmd/control/LiquidPreFillStartCommand.java b/src/main/java/com/iflytop/sgs/app/cmd/control/LiquidPreFillStartCommand.java index 480bda4..865dfd0 100644 --- a/src/main/java/com/iflytop/sgs/app/cmd/control/LiquidPreFillStartCommand.java +++ b/src/main/java/com/iflytop/sgs/app/cmd/control/LiquidPreFillStartCommand.java @@ -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; diff --git a/src/main/java/com/iflytop/sgs/app/cmd/control/LiquidPreFillStopCommand.java b/src/main/java/com/iflytop/sgs/app/cmd/control/LiquidPreFillStopCommand.java index f74ce49..c4416a8 100644 --- a/src/main/java/com/iflytop/sgs/app/cmd/control/LiquidPreFillStopCommand.java +++ b/src/main/java/com/iflytop/sgs/app/cmd/control/LiquidPreFillStopCommand.java @@ -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; diff --git a/src/main/java/com/iflytop/sgs/app/cmd/control/MoveToFeedAreaCommand.java b/src/main/java/com/iflytop/sgs/app/cmd/control/MoveToFeedAreaCommand.java index 3953da1..bac2c60 100644 --- a/src/main/java/com/iflytop/sgs/app/cmd/control/MoveToFeedAreaCommand.java +++ b/src/main/java/com/iflytop/sgs/app/cmd/control/MoveToFeedAreaCommand.java @@ -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; diff --git a/src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLightOpenCommand.java b/src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLightOpenCommand.java index 6848c43..2392d39 100644 --- a/src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLightOpenCommand.java +++ b/src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLightOpenCommand.java @@ -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; diff --git a/src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidPumpAddCommand.java b/src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidPumpAddCommand.java index 9e8e043..715f961 100644 --- a/src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidPumpAddCommand.java +++ b/src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidPumpAddCommand.java @@ -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; diff --git a/src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidPumpReduceCommand.java b/src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidPumpReduceCommand.java index b096126..d7190aa 100644 --- a/src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidPumpReduceCommand.java +++ b/src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidPumpReduceCommand.java @@ -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; diff --git a/src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidPumpStartCommand.java b/src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidPumpStartCommand.java index e1f01fa..7ab566c 100644 --- a/src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidPumpStartCommand.java +++ b/src/main/java/com/iflytop/sgs/app/cmd/debug/DebugLiquidPumpStartCommand.java @@ -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; diff --git a/src/main/java/com/iflytop/sgs/app/controller/DevicePointController.java b/src/main/java/com/iflytop/sgs/app/controller/DevicePointController.java index 5ca3606..7e632e4 100644 --- a/src/main/java/com/iflytop/sgs/app/controller/DevicePointController.java +++ b/src/main/java/com/iflytop/sgs/app/controller/DevicePointController.java @@ -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; diff --git a/src/main/java/com/iflytop/sgs/app/controller/MotorController.java b/src/main/java/com/iflytop/sgs/app/controller/MotorController.java index 0c757ca..db259f1 100644 --- a/src/main/java/com/iflytop/sgs/app/controller/MotorController.java +++ b/src/main/java/com/iflytop/sgs/app/controller/MotorController.java @@ -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; /** * 认证控制 diff --git a/src/main/java/com/iflytop/sgs/app/model/bo/status/SelfTestState.java b/src/main/java/com/iflytop/sgs/app/model/bo/status/SelfTestState.java index f8e0a39..cae2310 100644 --- a/src/main/java/com/iflytop/sgs/app/model/bo/status/SelfTestState.java +++ b/src/main/java/com/iflytop/sgs/app/model/bo/status/SelfTestState.java @@ -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; - - } diff --git a/src/main/java/com/iflytop/sgs/app/service/api/ContainerService.java b/src/main/java/com/iflytop/sgs/app/service/api/ContainerService.java index ac8aa70..f193334 100644 --- a/src/main/java/com/iflytop/sgs/app/service/api/ContainerService.java +++ b/src/main/java/com/iflytop/sgs/app/service/api/ContainerService.java @@ -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; diff --git a/src/main/java/com/iflytop/sgs/app/service/api/CraftsService.java b/src/main/java/com/iflytop/sgs/app/service/api/CraftsService.java index 05fff1d..a45e7e4 100644 --- a/src/main/java/com/iflytop/sgs/app/service/api/CraftsService.java +++ b/src/main/java/com/iflytop/sgs/app/service/api/CraftsService.java @@ -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; diff --git a/src/main/java/com/iflytop/sgs/app/service/api/TrayService.java b/src/main/java/com/iflytop/sgs/app/service/api/TrayService.java index a804559..d2c3a36 100644 --- a/src/main/java/com/iflytop/sgs/app/service/api/TrayService.java +++ b/src/main/java/com/iflytop/sgs/app/service/api/TrayService.java @@ -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; diff --git a/src/main/java/com/iflytop/sgs/app/service/device/DeviceSensorService.java b/src/main/java/com/iflytop/sgs/app/service/device/DeviceSensorService.java index 05095ef..e3306be 100644 --- a/src/main/java/com/iflytop/sgs/app/service/device/DeviceSensorService.java +++ b/src/main/java/com/iflytop/sgs/app/service/device/DeviceSensorService.java @@ -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 diff --git a/src/main/java/com/iflytop/sgs/common/service/GDDeviceStatusService.java b/src/main/java/com/iflytop/sgs/common/service/GDDeviceStatusService.java index 536cd8a..389d88d 100644 --- a/src/main/java/com/iflytop/sgs/common/service/GDDeviceStatusService.java +++ b/src/main/java/com/iflytop/sgs/common/service/GDDeviceStatusService.java @@ -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 { diff --git a/src/main/java/com/iflytop/sgs/hardware/comm/can/A8kCanBusConnection.java b/src/main/java/com/iflytop/sgs/hardware/comm/can/A8kCanBusConnection.java index 58e6a7c..efc6e05 100644 --- a/src/main/java/com/iflytop/sgs/hardware/comm/can/A8kCanBusConnection.java +++ b/src/main/java/com/iflytop/sgs/hardware/comm/can/A8kCanBusConnection.java @@ -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; diff --git a/src/main/java/com/iflytop/sgs/hardware/comm/can/A8kCanBusService.java b/src/main/java/com/iflytop/sgs/hardware/comm/can/A8kCanBusService.java index 1e62722..7eab70d 100644 --- a/src/main/java/com/iflytop/sgs/hardware/comm/can/A8kCanBusService.java +++ b/src/main/java/com/iflytop/sgs/hardware/comm/can/A8kCanBusService.java @@ -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; diff --git a/src/main/java/com/iflytop/sgs/hardware/comm/modbus/JSerialCommWrapper.java b/src/main/java/com/iflytop/sgs/hardware/comm/modbus/JSerialCommWrapper.java index 841be9f..49190b3 100644 --- a/src/main/java/com/iflytop/sgs/hardware/comm/modbus/JSerialCommWrapper.java +++ b/src/main/java/com/iflytop/sgs/hardware/comm/modbus/JSerialCommWrapper.java @@ -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; diff --git a/src/main/java/com/iflytop/sgs/hardware/comm/modbus/ModbusMasterService.java b/src/main/java/com/iflytop/sgs/hardware/comm/modbus/ModbusMasterService.java index 1f1bb5d..6d87e89 100644 --- a/src/main/java/com/iflytop/sgs/hardware/comm/modbus/ModbusMasterService.java +++ b/src/main/java/com/iflytop/sgs/hardware/comm/modbus/ModbusMasterService.java @@ -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; diff --git a/src/main/java/com/iflytop/sgs/hardware/command/handlers/ChimeBuzzerHandler.java b/src/main/java/com/iflytop/sgs/hardware/command/handlers/ChimeBuzzerHandler.java index e849dd1..e1a2346 100644 --- a/src/main/java/com/iflytop/sgs/hardware/command/handlers/ChimeBuzzerHandler.java +++ b/src/main/java/com/iflytop/sgs/hardware/command/handlers/ChimeBuzzerHandler.java @@ -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; diff --git a/src/main/java/com/iflytop/sgs/hardware/command/handlers/IOCtrlHandler.java b/src/main/java/com/iflytop/sgs/hardware/command/handlers/IOCtrlHandler.java index 83c6f60..402de82 100644 --- a/src/main/java/com/iflytop/sgs/hardware/command/handlers/IOCtrlHandler.java +++ b/src/main/java/com/iflytop/sgs/hardware/command/handlers/IOCtrlHandler.java @@ -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; diff --git a/src/main/java/com/iflytop/sgs/hardware/command/handlers/MotorHandler.java b/src/main/java/com/iflytop/sgs/hardware/command/handlers/MotorHandler.java index f34a835..97f4e76 100644 --- a/src/main/java/com/iflytop/sgs/hardware/command/handlers/MotorHandler.java +++ b/src/main/java/com/iflytop/sgs/hardware/command/handlers/MotorHandler.java @@ -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; diff --git a/src/main/java/com/iflytop/sgs/hardware/constants/ActionOvertimeConstant.java b/src/main/java/com/iflytop/sgs/hardware/constants/ActionOvertimeConstant.java index 5b7a56a..e711b91 100644 --- a/src/main/java/com/iflytop/sgs/hardware/constants/ActionOvertimeConstant.java +++ b/src/main/java/com/iflytop/sgs/hardware/constants/ActionOvertimeConstant.java @@ -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; diff --git a/src/main/java/com/iflytop/sgs/hardware/controller/ServoController.java b/src/main/java/com/iflytop/sgs/hardware/controller/ServoController.java index a0a8944..748d885 100644 --- a/src/main/java/com/iflytop/sgs/hardware/controller/ServoController.java +++ b/src/main/java/com/iflytop/sgs/hardware/controller/ServoController.java @@ -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; diff --git a/src/main/java/com/iflytop/sgs/hardware/drivers/DIDriver/InputDetectDriver.java b/src/main/java/com/iflytop/sgs/hardware/drivers/DIDriver/InputDetectDriver.java index d1d43e8..d57c843 100644 --- a/src/main/java/com/iflytop/sgs/hardware/drivers/DIDriver/InputDetectDriver.java +++ b/src/main/java/com/iflytop/sgs/hardware/drivers/DIDriver/InputDetectDriver.java @@ -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; diff --git a/src/main/java/com/iflytop/sgs/hardware/drivers/LeiSaiServoWrapperDriver.java b/src/main/java/com/iflytop/sgs/hardware/drivers/LeiSaiServoWrapperDriver.java index a4794fc..033af76 100644 --- a/src/main/java/com/iflytop/sgs/hardware/drivers/LeiSaiServoWrapperDriver.java +++ b/src/main/java/com/iflytop/sgs/hardware/drivers/LeiSaiServoWrapperDriver.java @@ -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; diff --git a/src/main/java/com/iflytop/sgs/hardware/drivers/MiniServoDriver/MiniServoDriver.java b/src/main/java/com/iflytop/sgs/hardware/drivers/MiniServoDriver/MiniServoDriver.java index b36f98c..2b114a4 100644 --- a/src/main/java/com/iflytop/sgs/hardware/drivers/MiniServoDriver/MiniServoDriver.java +++ b/src/main/java/com/iflytop/sgs/hardware/drivers/MiniServoDriver/MiniServoDriver.java @@ -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; diff --git a/src/main/java/com/iflytop/sgs/hardware/drivers/StepMotorDriver/StepMotorCtrlDriver.java b/src/main/java/com/iflytop/sgs/hardware/drivers/StepMotorDriver/StepMotorCtrlDriver.java index 9001975..44e2c96 100644 --- a/src/main/java/com/iflytop/sgs/hardware/drivers/StepMotorDriver/StepMotorCtrlDriver.java +++ b/src/main/java/com/iflytop/sgs/hardware/drivers/StepMotorDriver/StepMotorCtrlDriver.java @@ -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; diff --git a/src/main/java/com/iflytop/sgs/hardware/exception/HardwareException.java b/src/main/java/com/iflytop/sgs/hardware/exception/HardwareException.java index 5d4182c..b91257e 100644 --- a/src/main/java/com/iflytop/sgs/hardware/exception/HardwareException.java +++ b/src/main/java/com/iflytop/sgs/hardware/exception/HardwareException.java @@ -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; diff --git a/src/main/java/com/iflytop/sgs/hardware/service/GDDeviceStatusServiceImpl.java b/src/main/java/com/iflytop/sgs/hardware/service/GDDeviceStatusServiceImpl.java index c1a2755..25a73d9 100644 --- a/src/main/java/com/iflytop/sgs/hardware/service/GDDeviceStatusServiceImpl.java +++ b/src/main/java/com/iflytop/sgs/hardware/service/GDDeviceStatusServiceImpl.java @@ -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; diff --git a/src/main/java/com/iflytop/sgs/hardware/service/ServoService.java b/src/main/java/com/iflytop/sgs/hardware/service/ServoService.java index 139946b..83680a3 100644 --- a/src/main/java/com/iflytop/sgs/hardware/service/ServoService.java +++ b/src/main/java/com/iflytop/sgs/hardware/service/ServoService.java @@ -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; diff --git a/src/main/java/com/iflytop/sgs/hardware/service/StepMotorService.java b/src/main/java/com/iflytop/sgs/hardware/service/StepMotorService.java index 5db65d6..fb23169 100644 --- a/src/main/java/com/iflytop/sgs/hardware/service/StepMotorService.java +++ b/src/main/java/com/iflytop/sgs/hardware/service/StepMotorService.java @@ -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; diff --git a/src/main/java/com/iflytop/sgs/hardware/service/setup/A8kSubModuleRegInitService.java b/src/main/java/com/iflytop/sgs/hardware/service/setup/A8kSubModuleRegInitService.java index f5d27ab..5aa669c 100644 --- a/src/main/java/com/iflytop/sgs/hardware/service/setup/A8kSubModuleRegInitService.java +++ b/src/main/java/com/iflytop/sgs/hardware/service/setup/A8kSubModuleRegInitService.java @@ -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;