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 395faaa..b03a359 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 @@ -3,7 +3,6 @@ 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.Point3D; import com.iflytop.sgs.app.model.bo.status.device.HeatModuleState; import com.iflytop.sgs.app.model.dto.CmdDTO; import com.iflytop.sgs.app.service.api.DevicePositionService; @@ -13,7 +12,6 @@ import com.iflytop.sgs.app.service.device.module.TransferModuleService; 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.enums.data.DevicePositionCode; import com.iflytop.sgs.common.exception.AppException; import com.iflytop.sgs.common.result.ResultCode; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/iflytop/sgs/app/cmd/control/CleanStartCommand.java b/src/main/java/com/iflytop/sgs/app/cmd/control/CleanStartCommand.java index 66037ae..83d7799 100644 --- a/src/main/java/com/iflytop/sgs/app/cmd/control/CleanStartCommand.java +++ b/src/main/java/com/iflytop/sgs/app/cmd/control/CleanStartCommand.java @@ -6,11 +6,9 @@ import com.iflytop.sgs.app.model.bo.Point3D; import com.iflytop.sgs.app.model.bo.status.device.TrayState; import com.iflytop.sgs.app.model.bo.status.device.TubeState; import com.iflytop.sgs.app.model.dto.CmdDTO; -import com.iflytop.sgs.app.model.entity.SystemConfig; import com.iflytop.sgs.app.service.api.DevicePositionService; import com.iflytop.sgs.app.service.api.SystemConfigService; 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.SolutionModuleService; import com.iflytop.sgs.app.service.device.module.TransferModuleService; import com.iflytop.sgs.common.annotation.CommandMapping; diff --git a/src/main/java/com/iflytop/sgs/app/cmd/control/DoorCloseCommand.java b/src/main/java/com/iflytop/sgs/app/cmd/control/DoorCloseCommand.java index 7a4b38d..4d15784 100644 --- a/src/main/java/com/iflytop/sgs/app/cmd/control/DoorCloseCommand.java +++ b/src/main/java/com/iflytop/sgs/app/cmd/control/DoorCloseCommand.java @@ -1,8 +1,6 @@ package com.iflytop.sgs.app.cmd.control; -import cn.hutool.core.lang.Assert; import com.iflytop.sgs.app.core.BaseCommandHandler; -import com.iflytop.sgs.app.model.bo.status.device.DoorModuleState; import com.iflytop.sgs.app.model.dto.CmdDTO; import com.iflytop.sgs.app.service.device.DeviceStateService; import com.iflytop.sgs.app.service.device.module.DoorModuleService; diff --git a/src/main/java/com/iflytop/sgs/app/cmd/control/DoorOpenCommand.java b/src/main/java/com/iflytop/sgs/app/cmd/control/DoorOpenCommand.java index 5b8f7e6..d6f5237 100644 --- a/src/main/java/com/iflytop/sgs/app/cmd/control/DoorOpenCommand.java +++ b/src/main/java/com/iflytop/sgs/app/cmd/control/DoorOpenCommand.java @@ -1,8 +1,6 @@ package com.iflytop.sgs.app.cmd.control; -import cn.hutool.core.lang.Assert; import com.iflytop.sgs.app.core.BaseCommandHandler; -import com.iflytop.sgs.app.model.bo.status.device.DoorModuleState; import com.iflytop.sgs.app.model.dto.CmdDTO; import com.iflytop.sgs.app.service.api.DevicePositionService; import com.iflytop.sgs.app.service.device.DeviceStateService; 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 ccdb47b..7144568 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.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; 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 b53b889..dff8afd 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,9 +1,7 @@ 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; 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 6aff91b..887880f 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,6 +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; diff --git a/src/main/java/com/iflytop/sgs/app/cmd/control/LiquidReduceCommand.java b/src/main/java/com/iflytop/sgs/app/cmd/control/LiquidReduceCommand.java index 7bb0dad..c2ff6e6 100644 --- a/src/main/java/com/iflytop/sgs/app/cmd/control/LiquidReduceCommand.java +++ b/src/main/java/com/iflytop/sgs/app/cmd/control/LiquidReduceCommand.java @@ -1,10 +1,8 @@ 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.Point3D; -import com.iflytop.sgs.app.model.bo.status.device.TransferModuleState; import com.iflytop.sgs.app.model.bo.status.device.TrayState; import com.iflytop.sgs.app.model.bo.status.device.TubeState; import com.iflytop.sgs.app.model.dto.CmdDTO; diff --git a/src/main/java/com/iflytop/sgs/app/cmd/control/MoveToHeatAreaCommand.java b/src/main/java/com/iflytop/sgs/app/cmd/control/MoveToHeatAreaCommand.java index 96a1794..b7d3103 100644 --- a/src/main/java/com/iflytop/sgs/app/cmd/control/MoveToHeatAreaCommand.java +++ b/src/main/java/com/iflytop/sgs/app/cmd/control/MoveToHeatAreaCommand.java @@ -6,7 +6,6 @@ import com.iflytop.sgs.app.model.dto.CmdDTO; import com.iflytop.sgs.app.service.api.DevicePositionService; 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.SolutionModuleService; import com.iflytop.sgs.app.service.device.module.TransferModuleService; import com.iflytop.sgs.common.annotation.CommandMapping; import com.iflytop.sgs.common.enums.HeatModuleCode; diff --git a/src/main/java/com/iflytop/sgs/app/cmd/control/MoveToLiquidAreaCommand.java b/src/main/java/com/iflytop/sgs/app/cmd/control/MoveToLiquidAreaCommand.java index aa2c49d..e347e0a 100644 --- a/src/main/java/com/iflytop/sgs/app/cmd/control/MoveToLiquidAreaCommand.java +++ b/src/main/java/com/iflytop/sgs/app/cmd/control/MoveToLiquidAreaCommand.java @@ -6,7 +6,6 @@ import com.iflytop.sgs.app.model.dto.CmdDTO; import com.iflytop.sgs.app.service.api.DevicePositionService; 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.SolutionModuleService; import com.iflytop.sgs.app.service.device.module.TransferModuleService; import com.iflytop.sgs.common.annotation.CommandMapping; import com.iflytop.sgs.common.enums.HeatModuleCode; diff --git a/src/main/java/com/iflytop/sgs/app/cmd/debug/step/DebugStopAllMotorCommand.java b/src/main/java/com/iflytop/sgs/app/cmd/debug/step/DebugStopAllMotorCommand.java index 0afde06..5f979e1 100644 --- a/src/main/java/com/iflytop/sgs/app/cmd/debug/step/DebugStopAllMotorCommand.java +++ b/src/main/java/com/iflytop/sgs/app/cmd/debug/step/DebugStopAllMotorCommand.java @@ -4,10 +4,8 @@ import com.iflytop.sgs.app.core.BaseCommandHandler; import com.iflytop.sgs.app.model.dto.CmdDTO; import com.iflytop.sgs.app.service.device.DeviceCommandService; import com.iflytop.sgs.common.annotation.CommandDebugMapping; -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.utils.CommandUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/iflytop/sgs/app/controller/AuthController.java b/src/main/java/com/iflytop/sgs/app/controller/AuthController.java index e0d6525..ff78281 100644 --- a/src/main/java/com/iflytop/sgs/app/controller/AuthController.java +++ b/src/main/java/com/iflytop/sgs/app/controller/AuthController.java @@ -3,8 +3,8 @@ package com.iflytop.sgs.app.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.iflytop.sgs.app.model.dto.LoginDTO; import com.iflytop.sgs.app.model.entity.User; -import com.iflytop.sgs.app.service.device.DeviceStateService; import com.iflytop.sgs.app.service.api.UserService; +import com.iflytop.sgs.app.service.device.DeviceStateService; import com.iflytop.sgs.common.enums.data.Deleted; import com.iflytop.sgs.common.result.Result; import com.iflytop.sgs.common.result.ResultCode; diff --git a/src/main/java/com/iflytop/sgs/app/controller/CmdDebugController.java b/src/main/java/com/iflytop/sgs/app/controller/CmdDebugController.java index ea0a88c..94be75d 100644 --- a/src/main/java/com/iflytop/sgs/app/controller/CmdDebugController.java +++ b/src/main/java/com/iflytop/sgs/app/controller/CmdDebugController.java @@ -2,7 +2,6 @@ package com.iflytop.sgs.app.controller; import cn.hutool.json.JSONUtil; import com.iflytop.sgs.app.core.CommandDebugHandlerRegistry; -import com.iflytop.sgs.app.core.CommandHandlerRegistry; import com.iflytop.sgs.app.core.DebugGenerator; import com.iflytop.sgs.app.model.dto.CmdDTO; import com.iflytop.sgs.app.ws.server.WebSocketSender; diff --git a/src/main/java/com/iflytop/sgs/app/controller/SystemController.java b/src/main/java/com/iflytop/sgs/app/controller/SystemController.java index eb5995d..6863ca7 100644 --- a/src/main/java/com/iflytop/sgs/app/controller/SystemController.java +++ b/src/main/java/com/iflytop/sgs/app/controller/SystemController.java @@ -2,8 +2,8 @@ package com.iflytop.sgs.app.controller; import com.iflytop.sgs.app.model.bo.status.device.DeviceState; import com.iflytop.sgs.app.model.dto.SetSystemDatetimeDTO; -import com.iflytop.sgs.app.service.device.DeviceStateService; import com.iflytop.sgs.app.service.api.SystemConfigService; +import com.iflytop.sgs.app.service.device.DeviceStateService; import com.iflytop.sgs.common.result.Result; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/iflytop/sgs/app/core/CommandDebugHandlerRegistry.java b/src/main/java/com/iflytop/sgs/app/core/CommandDebugHandlerRegistry.java index 828c170..25019d7 100644 --- a/src/main/java/com/iflytop/sgs/app/core/CommandDebugHandlerRegistry.java +++ b/src/main/java/com/iflytop/sgs/app/core/CommandDebugHandlerRegistry.java @@ -1,7 +1,6 @@ package com.iflytop.sgs.app.core; import com.iflytop.sgs.common.annotation.CommandDebugMapping; -import com.iflytop.sgs.common.annotation.CommandMapping; import com.iflytop.sgs.common.cmd.CommandHandler; import com.iflytop.sgs.common.exception.AppException; import com.iflytop.sgs.common.exception.UnSupportCommandException; diff --git a/src/main/java/com/iflytop/sgs/app/model/vo/SetHeatModuleEnableVO.java b/src/main/java/com/iflytop/sgs/app/model/vo/SetHeatModuleEnableVO.java index b3acdfc..b70428f 100644 --- a/src/main/java/com/iflytop/sgs/app/model/vo/SetHeatModuleEnableVO.java +++ b/src/main/java/com/iflytop/sgs/app/model/vo/SetHeatModuleEnableVO.java @@ -2,8 +2,6 @@ package com.iflytop.sgs.app.model.vo; import com.iflytop.sgs.common.enums.HeatModuleCode; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.Max; -import jakarta.validation.constraints.Min; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/iflytop/sgs/app/service/api/SystemConfigService.java b/src/main/java/com/iflytop/sgs/app/service/api/SystemConfigService.java index 707e3d2..8f16b93 100644 --- a/src/main/java/com/iflytop/sgs/app/service/api/SystemConfigService.java +++ b/src/main/java/com/iflytop/sgs/app/service/api/SystemConfigService.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.mapper.SystemConfigMapper; import com.iflytop.sgs.app.model.entity.SystemConfig; -import com.iflytop.sgs.app.service.device.DeviceStateService; import com.iflytop.sgs.common.enums.SystemConfigCode; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/iflytop/sgs/app/service/device/DeviceCommandService.java b/src/main/java/com/iflytop/sgs/app/service/device/DeviceCommandService.java index 2b67812..5a9008e 100644 --- a/src/main/java/com/iflytop/sgs/app/service/device/DeviceCommandService.java +++ b/src/main/java/com/iflytop/sgs/app/service/device/DeviceCommandService.java @@ -8,17 +8,12 @@ import com.iflytop.sgs.common.cmd.CommandFuture; import com.iflytop.sgs.common.cmd.CyclicNumberGenerator; import com.iflytop.sgs.common.cmd.DeviceCommandBundle; import com.iflytop.sgs.common.constant.CommandStatus; -import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.BlockingQueue; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.LinkedBlockingQueue; @Slf4j @Service diff --git a/src/main/java/com/iflytop/sgs/app/service/device/module/DoorModuleService.java b/src/main/java/com/iflytop/sgs/app/service/device/module/DoorModuleService.java index d408cd7..bd58f9c 100644 --- a/src/main/java/com/iflytop/sgs/app/service/device/module/DoorModuleService.java +++ b/src/main/java/com/iflytop/sgs/app/service/device/module/DoorModuleService.java @@ -1,6 +1,5 @@ package com.iflytop.sgs.app.service.device.module; -import com.iflytop.sgs.app.service.api.DevicePositionService; import com.iflytop.sgs.app.service.device.DeviceCommandService; import com.iflytop.sgs.common.cmd.CommandFuture; import com.iflytop.sgs.common.cmd.DeviceCommandBundle;