From a1a6e915ba0cc95a7c43caf00748310814e10979 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=A2=A6=E8=BF=9C?= <1063331231@qq.com> Date: Sat, 7 Jun 2025 10:35:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96import?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iflytop/sgs/app/controller/CraftsController.java | 7 ++++--- .../com/iflytop/sgs/app/mapper/CraftMonitorMapper.java | 2 -- .../java/com/iflytop/sgs/app/model/dto/PauseCraftsDTO.java | 14 -------------- .../java/com/iflytop/sgs/app/model/dto/PauseCraftsDto.java | 14 ++++++++++++++ .../com/iflytop/sgs/app/model/entity/CraftMonitor.java | 2 -- .../java/com/iflytop/sgs/app/service/api/TestService.java | 3 --- .../iflytop/sgs/app/service/device/DeviceStateService.java | 1 - .../sgs/app/service/device/module/DoorModuleService.java | 1 - .../app/service/device/module/SolutionModuleService.java | 5 ----- .../com/iflytop/sgs/common/enums/DeviceSensorCode.java | 2 -- 10 files changed, 18 insertions(+), 33 deletions(-) delete mode 100644 src/main/java/com/iflytop/sgs/app/model/dto/PauseCraftsDTO.java create mode 100644 src/main/java/com/iflytop/sgs/app/model/dto/PauseCraftsDto.java diff --git a/src/main/java/com/iflytop/sgs/app/controller/CraftsController.java b/src/main/java/com/iflytop/sgs/app/controller/CraftsController.java index f0ab135..cb149a2 100644 --- a/src/main/java/com/iflytop/sgs/app/controller/CraftsController.java +++ b/src/main/java/com/iflytop/sgs/app/controller/CraftsController.java @@ -1,14 +1,15 @@ package com.iflytop.sgs.app.controller; import cn.hutool.json.JSONUtil; -import com.iflytop.sgs.app.model.bo.CraftsStep; import com.iflytop.sgs.app.model.bo.status.device.DeviceState; -import com.iflytop.sgs.app.model.dto.*; +import com.iflytop.sgs.app.model.dto.PauseCraftsDto; +import com.iflytop.sgs.app.model.dto.ResumeCraftsDTO; +import com.iflytop.sgs.app.model.dto.StartCraftsDTO; +import com.iflytop.sgs.app.model.dto.StopCraftsDTO; import com.iflytop.sgs.app.model.entity.CraftMonitor; import com.iflytop.sgs.app.model.entity.Crafts; import com.iflytop.sgs.app.model.vo.CraftMonitorVO; import com.iflytop.sgs.app.model.vo.SetCraftsVO; -import com.iflytop.sgs.app.service.api.CraftMonitorService; import com.iflytop.sgs.app.service.api.CraftsService; import com.iflytop.sgs.app.service.device.DeviceStateService; import com.iflytop.sgs.common.result.Result; diff --git a/src/main/java/com/iflytop/sgs/app/mapper/CraftMonitorMapper.java b/src/main/java/com/iflytop/sgs/app/mapper/CraftMonitorMapper.java index fde89b4..9ded094 100644 --- a/src/main/java/com/iflytop/sgs/app/mapper/CraftMonitorMapper.java +++ b/src/main/java/com/iflytop/sgs/app/mapper/CraftMonitorMapper.java @@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.iflytop.sgs.app.model.entity.CraftMonitor; import org.apache.ibatis.annotations.Mapper; -import java.util.List; - /** * 工艺持久层接口 */ diff --git a/src/main/java/com/iflytop/sgs/app/model/dto/PauseCraftsDTO.java b/src/main/java/com/iflytop/sgs/app/model/dto/PauseCraftsDTO.java deleted file mode 100644 index 18d7e01..0000000 --- a/src/main/java/com/iflytop/sgs/app/model/dto/PauseCraftsDTO.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.iflytop.sgs.app.model.dto; - -import com.iflytop.sgs.common.enums.HeatModuleCode; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; -import lombok.Data; - -@Schema(description = "暂停执行工艺") -@Data -public class PauseCraftsDto { - @NotNull - @Schema(description = "加热区id") - private HeatModuleCode heatId; -} diff --git a/src/main/java/com/iflytop/sgs/app/model/dto/PauseCraftsDto.java b/src/main/java/com/iflytop/sgs/app/model/dto/PauseCraftsDto.java new file mode 100644 index 0000000..18d7e01 --- /dev/null +++ b/src/main/java/com/iflytop/sgs/app/model/dto/PauseCraftsDto.java @@ -0,0 +1,14 @@ +package com.iflytop.sgs.app.model.dto; + +import com.iflytop.sgs.common.enums.HeatModuleCode; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +@Schema(description = "暂停执行工艺") +@Data +public class PauseCraftsDto { + @NotNull + @Schema(description = "加热区id") + private HeatModuleCode heatId; +} diff --git a/src/main/java/com/iflytop/sgs/app/model/entity/CraftMonitor.java b/src/main/java/com/iflytop/sgs/app/model/entity/CraftMonitor.java index efc24f8..a586290 100644 --- a/src/main/java/com/iflytop/sgs/app/model/entity/CraftMonitor.java +++ b/src/main/java/com/iflytop/sgs/app/model/entity/CraftMonitor.java @@ -8,8 +8,6 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; -import java.beans.Transient; - @EqualsAndHashCode(callSuper = true) @Schema(description = "工艺执行监听") @TableName("craft_monitor") diff --git a/src/main/java/com/iflytop/sgs/app/service/api/TestService.java b/src/main/java/com/iflytop/sgs/app/service/api/TestService.java index d882f2b..c4db678 100644 --- a/src/main/java/com/iflytop/sgs/app/service/api/TestService.java +++ b/src/main/java/com/iflytop/sgs/app/service/api/TestService.java @@ -5,9 +5,6 @@ import com.iflytop.sgs.common.enums.HeatModuleCode; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.List; - /** * 测试用 */ diff --git a/src/main/java/com/iflytop/sgs/app/service/device/DeviceStateService.java b/src/main/java/com/iflytop/sgs/app/service/device/DeviceStateService.java index e4e46f6..aebadad 100644 --- a/src/main/java/com/iflytop/sgs/app/service/device/DeviceStateService.java +++ b/src/main/java/com/iflytop/sgs/app/service/device/DeviceStateService.java @@ -4,7 +4,6 @@ import com.iflytop.sgs.app.model.bo.status.CommandMutexState; import com.iflytop.sgs.app.model.bo.status.device.DeviceState; import lombok.Getter; import lombok.RequiredArgsConstructor; -import lombok.Setter; import org.springframework.stereotype.Service; import java.util.concurrent.atomic.AtomicReference; 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 1ecda08..0091ac9 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 @@ -5,7 +5,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.utils.CommandUtil; -import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/iflytop/sgs/app/service/device/module/SolutionModuleService.java b/src/main/java/com/iflytop/sgs/app/service/device/module/SolutionModuleService.java index 42dbaaa..d23bd02 100644 --- a/src/main/java/com/iflytop/sgs/app/service/device/module/SolutionModuleService.java +++ b/src/main/java/com/iflytop/sgs/app/service/device/module/SolutionModuleService.java @@ -11,11 +11,6 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import java.util.concurrent.ArrayBlockingQueue; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; - /** * 加液模块 */ diff --git a/src/main/java/com/iflytop/sgs/common/enums/DeviceSensorCode.java b/src/main/java/com/iflytop/sgs/common/enums/DeviceSensorCode.java index 2af6e63..0905ba6 100644 --- a/src/main/java/com/iflytop/sgs/common/enums/DeviceSensorCode.java +++ b/src/main/java/com/iflytop/sgs/common/enums/DeviceSensorCode.java @@ -1,7 +1,5 @@ package com.iflytop.sgs.common.enums; -import com.iflytop.sgs.common.enums.cmd.CmdDevice; -import com.iflytop.sgs.hardware.type.MId; import lombok.Getter; /**