diff --git a/src/main/java/com/qyft/ms/common/constant/Commands.java b/src/main/java/com/qyft/ms/app/common/constant/Commands.java similarity index 98% rename from src/main/java/com/qyft/ms/common/constant/Commands.java rename to src/main/java/com/qyft/ms/app/common/constant/Commands.java index 2391464..9c71b80 100644 --- a/src/main/java/com/qyft/ms/common/constant/Commands.java +++ b/src/main/java/com/qyft/ms/app/common/constant/Commands.java @@ -1,4 +1,4 @@ -package com.qyft.ms.common.constant; +package com.qyft.ms.app.common.constant; /** * 操作指令 diff --git a/src/main/java/com/qyft/ms/common/constant/SysSettings.java b/src/main/java/com/qyft/ms/app/common/constant/SysSettings.java similarity index 91% rename from src/main/java/com/qyft/ms/common/constant/SysSettings.java rename to src/main/java/com/qyft/ms/app/common/constant/SysSettings.java index 63c3be3..b8d11a0 100644 --- a/src/main/java/com/qyft/ms/common/constant/SysSettings.java +++ b/src/main/java/com/qyft/ms/app/common/constant/SysSettings.java @@ -1,4 +1,4 @@ -package com.qyft.ms.common.constant; +package com.qyft.ms.app.common.constant; /** * 操作指令 diff --git a/src/main/java/com/qyft/ms/common/constant/WebSocketMessageType.java b/src/main/java/com/qyft/ms/app/common/constant/WebSocketMessageType.java similarity index 92% rename from src/main/java/com/qyft/ms/common/constant/WebSocketMessageType.java rename to src/main/java/com/qyft/ms/app/common/constant/WebSocketMessageType.java index d3835e5..362f700 100644 --- a/src/main/java/com/qyft/ms/common/constant/WebSocketMessageType.java +++ b/src/main/java/com/qyft/ms/app/common/constant/WebSocketMessageType.java @@ -1,4 +1,4 @@ -package com.qyft.ms.common.constant; +package com.qyft.ms.app.common.constant; public class WebSocketMessageType { /** diff --git a/src/main/java/com/qyft/ms/enums/DirectiveTypeEnum.java b/src/main/java/com/qyft/ms/app/common/enums/DirectiveTypeEnum.java similarity index 95% rename from src/main/java/com/qyft/ms/enums/DirectiveTypeEnum.java rename to src/main/java/com/qyft/ms/app/common/enums/DirectiveTypeEnum.java index 833c2f4..44abccc 100644 --- a/src/main/java/com/qyft/ms/enums/DirectiveTypeEnum.java +++ b/src/main/java/com/qyft/ms/app/common/enums/DirectiveTypeEnum.java @@ -1,4 +1,4 @@ -package com.qyft.ms.enums; +package com.qyft.ms.app.common.enums; import cn.hutool.core.util.StrUtil; diff --git a/src/main/java/com/qyft/ms/common/result/CMDResultCode.java b/src/main/java/com/qyft/ms/app/common/result/CMDResultCode.java similarity index 92% rename from src/main/java/com/qyft/ms/common/result/CMDResultCode.java rename to src/main/java/com/qyft/ms/app/common/result/CMDResultCode.java index cbf3392..60355fb 100644 --- a/src/main/java/com/qyft/ms/common/result/CMDResultCode.java +++ b/src/main/java/com/qyft/ms/app/common/result/CMDResultCode.java @@ -1,4 +1,4 @@ -package com.qyft.ms.common.result; +package com.qyft.ms.app.common.result; import com.qyft.ms.system.common.result.IResultCode; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/qyft/ms/config/WebSocketConfig.java b/src/main/java/com/qyft/ms/app/config/WebSocketConfig.java similarity index 91% rename from src/main/java/com/qyft/ms/config/WebSocketConfig.java rename to src/main/java/com/qyft/ms/app/config/WebSocketConfig.java index cedfe03..e85a031 100644 --- a/src/main/java/com/qyft/ms/config/WebSocketConfig.java +++ b/src/main/java/com/qyft/ms/app/config/WebSocketConfig.java @@ -1,4 +1,4 @@ -package com.qyft.ms.config; +package com.qyft.ms.app.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/qyft/ms/config/WebSocketServer.java b/src/main/java/com/qyft/ms/app/config/WebSocketServer.java similarity index 92% rename from src/main/java/com/qyft/ms/config/WebSocketServer.java rename to src/main/java/com/qyft/ms/app/config/WebSocketServer.java index 1dc430f..710d4a7 100644 --- a/src/main/java/com/qyft/ms/config/WebSocketServer.java +++ b/src/main/java/com/qyft/ms/app/config/WebSocketServer.java @@ -1,9 +1,8 @@ -package com.qyft.ms.config; +package com.qyft.ms.app.config; -import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.qyft.ms.model.dto.WebsocketDTO; +import com.qyft.ms.app.model.dto.WebsocketDTO; import jakarta.websocket.*; import jakarta.websocket.server.ServerEndpoint; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/qyft/ms/controller/CMDController.java b/src/main/java/com/qyft/ms/app/controller/CMDController.java similarity index 92% rename from src/main/java/com/qyft/ms/controller/CMDController.java rename to src/main/java/com/qyft/ms/app/controller/CMDController.java index 29181f1..d440e4e 100644 --- a/src/main/java/com/qyft/ms/controller/CMDController.java +++ b/src/main/java/com/qyft/ms/app/controller/CMDController.java @@ -1,8 +1,8 @@ -package com.qyft.ms.controller; +package com.qyft.ms.app.controller; import cn.hutool.json.JSONUtil; -import com.qyft.ms.model.form.CMDForm; -import com.qyft.ms.service.CMDService; +import com.qyft.ms.app.model.form.CMDForm; +import com.qyft.ms.app.service.CMDService; import com.qyft.ms.system.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/qyft/ms/controller/LogsController.java b/src/main/java/com/qyft/ms/app/controller/LogsController.java similarity index 93% rename from src/main/java/com/qyft/ms/controller/LogsController.java rename to src/main/java/com/qyft/ms/app/controller/LogsController.java index b5e461a..379eeba 100644 --- a/src/main/java/com/qyft/ms/controller/LogsController.java +++ b/src/main/java/com/qyft/ms/app/controller/LogsController.java @@ -1,8 +1,8 @@ -package com.qyft.ms.controller; +package com.qyft.ms.app.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.qyft.ms.model.entity.Logs; -import com.qyft.ms.service.ILogsService; +import com.qyft.ms.app.model.entity.Logs; +import com.qyft.ms.app.service.ILogsService; import com.qyft.ms.system.common.base.BasePageQuery; import com.qyft.ms.system.common.result.PageResult; import com.qyft.ms.system.common.result.Result; diff --git a/src/main/java/com/qyft/ms/controller/SysSettingsController.java b/src/main/java/com/qyft/ms/app/controller/SysSettingsController.java similarity index 92% rename from src/main/java/com/qyft/ms/controller/SysSettingsController.java rename to src/main/java/com/qyft/ms/app/controller/SysSettingsController.java index 309dea5..c3e1830 100644 --- a/src/main/java/com/qyft/ms/controller/SysSettingsController.java +++ b/src/main/java/com/qyft/ms/app/controller/SysSettingsController.java @@ -1,7 +1,7 @@ -package com.qyft.ms.controller; +package com.qyft.ms.app.controller; -import com.qyft.ms.model.dto.SysSettingsDTO; -import com.qyft.ms.service.ISysSettingsService; +import com.qyft.ms.app.model.dto.SysSettingsDTO; +import com.qyft.ms.app.service.ISysSettingsService; import com.qyft.ms.system.common.result.Result; import io.micrometer.common.lang.Nullable; import io.swagger.v3.oas.annotations.Operation; diff --git a/src/main/java/com/qyft/ms/mapper/LogsMapper.java b/src/main/java/com/qyft/ms/app/mapper/LogsMapper.java similarity index 73% rename from src/main/java/com/qyft/ms/mapper/LogsMapper.java rename to src/main/java/com/qyft/ms/app/mapper/LogsMapper.java index ad0f32f..2f2aef1 100644 --- a/src/main/java/com/qyft/ms/mapper/LogsMapper.java +++ b/src/main/java/com/qyft/ms/app/mapper/LogsMapper.java @@ -1,7 +1,7 @@ -package com.qyft.ms.mapper; +package com.qyft.ms.app.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.qyft.ms.model.entity.Logs; +import com.qyft.ms.app.model.entity.Logs; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/com/qyft/ms/mapper/SysSettingsMapper.java b/src/main/java/com/qyft/ms/app/mapper/SysSettingsMapper.java similarity index 70% rename from src/main/java/com/qyft/ms/mapper/SysSettingsMapper.java rename to src/main/java/com/qyft/ms/app/mapper/SysSettingsMapper.java index b0960c5..a51cf26 100644 --- a/src/main/java/com/qyft/ms/mapper/SysSettingsMapper.java +++ b/src/main/java/com/qyft/ms/app/mapper/SysSettingsMapper.java @@ -1,9 +1,9 @@ -package com.qyft.ms.mapper; +package com.qyft.ms.app.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.qyft.ms.model.dto.SysSettingsDTO; -import com.qyft.ms.model.entity.SysSettings; -import com.qyft.ms.model.vo.SysSettingVO; +import com.qyft.ms.app.model.dto.SysSettingsDTO; +import com.qyft.ms.app.model.entity.SysSettings; +import com.qyft.ms.app.model.vo.SysSettingVO; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/qyft/ms/model/bo/CraftsStepMethod.java b/src/main/java/com/qyft/ms/app/model/bo/CraftsStepMethod.java similarity index 96% rename from src/main/java/com/qyft/ms/model/bo/CraftsStepMethod.java rename to src/main/java/com/qyft/ms/app/model/bo/CraftsStepMethod.java index 3eb335b..2639654 100644 --- a/src/main/java/com/qyft/ms/model/bo/CraftsStepMethod.java +++ b/src/main/java/com/qyft/ms/app/model/bo/CraftsStepMethod.java @@ -1,4 +1,4 @@ -package com.qyft.ms.model.bo; +package com.qyft.ms.app.model.bo; import lombok.Data; diff --git a/src/main/java/com/qyft/ms/model/bo/CraftsStepStatus.java b/src/main/java/com/qyft/ms/app/model/bo/CraftsStepStatus.java similarity index 94% rename from src/main/java/com/qyft/ms/model/bo/CraftsStepStatus.java rename to src/main/java/com/qyft/ms/app/model/bo/CraftsStepStatus.java index 21cfa85..5627610 100644 --- a/src/main/java/com/qyft/ms/model/bo/CraftsStepStatus.java +++ b/src/main/java/com/qyft/ms/app/model/bo/CraftsStepStatus.java @@ -1,4 +1,4 @@ -package com.qyft.ms.model.bo; +package com.qyft.ms.app.model.bo; import lombok.Data; diff --git a/src/main/java/com/qyft/ms/model/bo/TubeSol.java b/src/main/java/com/qyft/ms/app/model/bo/TubeSol.java similarity index 89% rename from src/main/java/com/qyft/ms/model/bo/TubeSol.java rename to src/main/java/com/qyft/ms/app/model/bo/TubeSol.java index c0d37d6..765475b 100644 --- a/src/main/java/com/qyft/ms/model/bo/TubeSol.java +++ b/src/main/java/com/qyft/ms/app/model/bo/TubeSol.java @@ -1,4 +1,4 @@ -package com.qyft.ms.model.bo; +package com.qyft.ms.app.model.bo; import lombok.Data; diff --git a/src/main/java/com/qyft/ms/model/dto/BaseDataDTO.java b/src/main/java/com/qyft/ms/app/model/dto/BaseDataDTO.java similarity index 89% rename from src/main/java/com/qyft/ms/model/dto/BaseDataDTO.java rename to src/main/java/com/qyft/ms/app/model/dto/BaseDataDTO.java index 93e7f85..ee518e3 100644 --- a/src/main/java/com/qyft/ms/model/dto/BaseDataDTO.java +++ b/src/main/java/com/qyft/ms/app/model/dto/BaseDataDTO.java @@ -1,4 +1,4 @@ -package com.qyft.ms.model.dto; +package com.qyft.ms.app.model.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/qyft/ms/model/dto/CmdInjectFluidDTO.java b/src/main/java/com/qyft/ms/app/model/dto/CmdInjectFluidDTO.java similarity index 88% rename from src/main/java/com/qyft/ms/model/dto/CmdInjectFluidDTO.java rename to src/main/java/com/qyft/ms/app/model/dto/CmdInjectFluidDTO.java index 6f7986d..40f67a5 100644 --- a/src/main/java/com/qyft/ms/model/dto/CmdInjectFluidDTO.java +++ b/src/main/java/com/qyft/ms/app/model/dto/CmdInjectFluidDTO.java @@ -1,4 +1,4 @@ -package com.qyft.ms.model.dto; +package com.qyft.ms.app.model.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/qyft/ms/model/dto/ContainerDTO.java b/src/main/java/com/qyft/ms/app/model/dto/ContainerDTO.java similarity index 89% rename from src/main/java/com/qyft/ms/model/dto/ContainerDTO.java rename to src/main/java/com/qyft/ms/app/model/dto/ContainerDTO.java index 75441cd..f1d88e4 100644 --- a/src/main/java/com/qyft/ms/model/dto/ContainerDTO.java +++ b/src/main/java/com/qyft/ms/app/model/dto/ContainerDTO.java @@ -1,4 +1,4 @@ -package com.qyft.ms.model.dto; +package com.qyft.ms.app.model.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/qyft/ms/model/dto/InjectFluid.java b/src/main/java/com/qyft/ms/app/model/dto/InjectFluid.java similarity index 89% rename from src/main/java/com/qyft/ms/model/dto/InjectFluid.java rename to src/main/java/com/qyft/ms/app/model/dto/InjectFluid.java index 192216f..829880c 100644 --- a/src/main/java/com/qyft/ms/model/dto/InjectFluid.java +++ b/src/main/java/com/qyft/ms/app/model/dto/InjectFluid.java @@ -1,4 +1,4 @@ -package com.qyft.ms.model.dto; +package com.qyft.ms.app.model.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/qyft/ms/model/dto/LogDTO.java b/src/main/java/com/qyft/ms/app/model/dto/LogDTO.java similarity index 82% rename from src/main/java/com/qyft/ms/model/dto/LogDTO.java rename to src/main/java/com/qyft/ms/app/model/dto/LogDTO.java index 3533b3b..c0d605b 100644 --- a/src/main/java/com/qyft/ms/model/dto/LogDTO.java +++ b/src/main/java/com/qyft/ms/app/model/dto/LogDTO.java @@ -1,4 +1,4 @@ -package com.qyft.ms.model.dto; +package com.qyft.ms.app.model.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/qyft/ms/model/dto/PauseCraftsDto.java b/src/main/java/com/qyft/ms/app/model/dto/PauseCraftsDto.java similarity index 86% rename from src/main/java/com/qyft/ms/model/dto/PauseCraftsDto.java rename to src/main/java/com/qyft/ms/app/model/dto/PauseCraftsDto.java index d4a5914..ddcdf19 100644 --- a/src/main/java/com/qyft/ms/model/dto/PauseCraftsDto.java +++ b/src/main/java/com/qyft/ms/app/model/dto/PauseCraftsDto.java @@ -1,4 +1,4 @@ -package com.qyft.ms.model.dto; +package com.qyft.ms.app.model.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/qyft/ms/model/dto/ResumeCraftsDto.java b/src/main/java/com/qyft/ms/app/model/dto/ResumeCraftsDto.java similarity index 86% rename from src/main/java/com/qyft/ms/model/dto/ResumeCraftsDto.java rename to src/main/java/com/qyft/ms/app/model/dto/ResumeCraftsDto.java index d3da8a6..f188234 100644 --- a/src/main/java/com/qyft/ms/model/dto/ResumeCraftsDto.java +++ b/src/main/java/com/qyft/ms/app/model/dto/ResumeCraftsDto.java @@ -1,4 +1,4 @@ -package com.qyft.ms.model.dto; +package com.qyft.ms.app.model.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/qyft/ms/model/dto/StartCraftsDTO.java b/src/main/java/com/qyft/ms/app/model/dto/StartCraftsDTO.java similarity index 88% rename from src/main/java/com/qyft/ms/model/dto/StartCraftsDTO.java rename to src/main/java/com/qyft/ms/app/model/dto/StartCraftsDTO.java index 11c40fb..7df26a8 100644 --- a/src/main/java/com/qyft/ms/model/dto/StartCraftsDTO.java +++ b/src/main/java/com/qyft/ms/app/model/dto/StartCraftsDTO.java @@ -1,4 +1,4 @@ -package com.qyft.ms.model.dto; +package com.qyft.ms.app.model.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/qyft/ms/model/dto/StartHeatDTO.java b/src/main/java/com/qyft/ms/app/model/dto/StartHeatDTO.java similarity index 87% rename from src/main/java/com/qyft/ms/model/dto/StartHeatDTO.java rename to src/main/java/com/qyft/ms/app/model/dto/StartHeatDTO.java index 449c038..87a341b 100644 --- a/src/main/java/com/qyft/ms/model/dto/StartHeatDTO.java +++ b/src/main/java/com/qyft/ms/app/model/dto/StartHeatDTO.java @@ -1,4 +1,4 @@ -package com.qyft.ms.model.dto; +package com.qyft.ms.app.model.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/qyft/ms/model/dto/StopCraftsDto.java b/src/main/java/com/qyft/ms/app/model/dto/StopCraftsDto.java similarity index 86% rename from src/main/java/com/qyft/ms/model/dto/StopCraftsDto.java rename to src/main/java/com/qyft/ms/app/model/dto/StopCraftsDto.java index 051fb51..e13bac4 100644 --- a/src/main/java/com/qyft/ms/model/dto/StopCraftsDto.java +++ b/src/main/java/com/qyft/ms/app/model/dto/StopCraftsDto.java @@ -1,4 +1,4 @@ -package com.qyft.ms.model.dto; +package com.qyft.ms.app.model.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/qyft/ms/model/dto/StopTaskDTO.java b/src/main/java/com/qyft/ms/app/model/dto/StopTaskDTO.java similarity index 83% rename from src/main/java/com/qyft/ms/model/dto/StopTaskDTO.java rename to src/main/java/com/qyft/ms/app/model/dto/StopTaskDTO.java index 07c4538..e5a1be7 100644 --- a/src/main/java/com/qyft/ms/model/dto/StopTaskDTO.java +++ b/src/main/java/com/qyft/ms/app/model/dto/StopTaskDTO.java @@ -1,4 +1,4 @@ -package com.qyft.ms.model.dto; +package com.qyft.ms.app.model.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/qyft/ms/model/dto/SysSettingsDTO.java b/src/main/java/com/qyft/ms/app/model/dto/SysSettingsDTO.java similarity index 91% rename from src/main/java/com/qyft/ms/model/dto/SysSettingsDTO.java rename to src/main/java/com/qyft/ms/app/model/dto/SysSettingsDTO.java index f1c45ef..bc88167 100644 --- a/src/main/java/com/qyft/ms/model/dto/SysSettingsDTO.java +++ b/src/main/java/com/qyft/ms/app/model/dto/SysSettingsDTO.java @@ -1,4 +1,4 @@ -package com.qyft.ms.model.dto; +package com.qyft.ms.app.model.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/qyft/ms/model/dto/TaskDTO.java b/src/main/java/com/qyft/ms/app/model/dto/TaskDTO.java similarity index 83% rename from src/main/java/com/qyft/ms/model/dto/TaskDTO.java rename to src/main/java/com/qyft/ms/app/model/dto/TaskDTO.java index 890c697..f43b1a1 100644 --- a/src/main/java/com/qyft/ms/model/dto/TaskDTO.java +++ b/src/main/java/com/qyft/ms/app/model/dto/TaskDTO.java @@ -1,4 +1,4 @@ -package com.qyft.ms.model.dto; +package com.qyft.ms.app.model.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/qyft/ms/model/dto/WebsocketDTO.java b/src/main/java/com/qyft/ms/app/model/dto/WebsocketDTO.java similarity index 93% rename from src/main/java/com/qyft/ms/model/dto/WebsocketDTO.java rename to src/main/java/com/qyft/ms/app/model/dto/WebsocketDTO.java index b380586..0a31b67 100644 --- a/src/main/java/com/qyft/ms/model/dto/WebsocketDTO.java +++ b/src/main/java/com/qyft/ms/app/model/dto/WebsocketDTO.java @@ -1,4 +1,4 @@ -package com.qyft.ms.model.dto; +package com.qyft.ms.app.model.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/com/qyft/ms/model/entity/Container.java b/src/main/java/com/qyft/ms/app/model/entity/Container.java similarity index 95% rename from src/main/java/com/qyft/ms/model/entity/Container.java rename to src/main/java/com/qyft/ms/app/model/entity/Container.java index 3a83cd8..b824cbf 100644 --- a/src/main/java/com/qyft/ms/model/entity/Container.java +++ b/src/main/java/com/qyft/ms/app/model/entity/Container.java @@ -1,4 +1,4 @@ -package com.qyft.ms.model.entity; +package com.qyft.ms.app.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/qyft/ms/model/entity/Crafts.java b/src/main/java/com/qyft/ms/app/model/entity/Crafts.java similarity index 94% rename from src/main/java/com/qyft/ms/model/entity/Crafts.java rename to src/main/java/com/qyft/ms/app/model/entity/Crafts.java index d600bb3..bc2d7d5 100644 --- a/src/main/java/com/qyft/ms/model/entity/Crafts.java +++ b/src/main/java/com/qyft/ms/app/model/entity/Crafts.java @@ -1,4 +1,4 @@ -package com.qyft.ms.model.entity; +package com.qyft.ms.app.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.qyft.ms.system.common.base.BaseEntity; diff --git a/src/main/java/com/qyft/ms/model/entity/Logs.java b/src/main/java/com/qyft/ms/app/model/entity/Logs.java similarity index 94% rename from src/main/java/com/qyft/ms/model/entity/Logs.java rename to src/main/java/com/qyft/ms/app/model/entity/Logs.java index 5011ce8..db601cc 100644 --- a/src/main/java/com/qyft/ms/model/entity/Logs.java +++ b/src/main/java/com/qyft/ms/app/model/entity/Logs.java @@ -1,4 +1,4 @@ -package com.qyft.ms.model.entity; +package com.qyft.ms.app.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/qyft/ms/model/entity/Ores.java b/src/main/java/com/qyft/ms/app/model/entity/Ores.java similarity index 92% rename from src/main/java/com/qyft/ms/model/entity/Ores.java rename to src/main/java/com/qyft/ms/app/model/entity/Ores.java index 0de00ad..a1f6918 100644 --- a/src/main/java/com/qyft/ms/model/entity/Ores.java +++ b/src/main/java/com/qyft/ms/app/model/entity/Ores.java @@ -1,4 +1,4 @@ -package com.qyft.ms.model.entity; +package com.qyft.ms.app.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.qyft.ms.system.common.base.BaseEntity; diff --git a/src/main/java/com/qyft/ms/model/entity/Solutions.java b/src/main/java/com/qyft/ms/app/model/entity/Solutions.java similarity index 92% rename from src/main/java/com/qyft/ms/model/entity/Solutions.java rename to src/main/java/com/qyft/ms/app/model/entity/Solutions.java index eb26aa5..2595f4c 100644 --- a/src/main/java/com/qyft/ms/model/entity/Solutions.java +++ b/src/main/java/com/qyft/ms/app/model/entity/Solutions.java @@ -1,4 +1,4 @@ -package com.qyft.ms.model.entity; +package com.qyft.ms.app.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.qyft.ms.system.common.base.BaseEntity; diff --git a/src/main/java/com/qyft/ms/model/entity/SysSettings.java b/src/main/java/com/qyft/ms/app/model/entity/SysSettings.java similarity index 95% rename from src/main/java/com/qyft/ms/model/entity/SysSettings.java rename to src/main/java/com/qyft/ms/app/model/entity/SysSettings.java index c9f0cf7..847e363 100644 --- a/src/main/java/com/qyft/ms/model/entity/SysSettings.java +++ b/src/main/java/com/qyft/ms/app/model/entity/SysSettings.java @@ -1,4 +1,4 @@ -package com.qyft.ms.model.entity; +package com.qyft.ms.app.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/qyft/ms/model/entity/TaskSteps.java b/src/main/java/com/qyft/ms/app/model/entity/TaskSteps.java similarity index 94% rename from src/main/java/com/qyft/ms/model/entity/TaskSteps.java rename to src/main/java/com/qyft/ms/app/model/entity/TaskSteps.java index e307e91..8a07607 100644 --- a/src/main/java/com/qyft/ms/model/entity/TaskSteps.java +++ b/src/main/java/com/qyft/ms/app/model/entity/TaskSteps.java @@ -1,4 +1,4 @@ -package com.qyft.ms.model.entity; +package com.qyft.ms.app.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/qyft/ms/model/entity/Tasks.java b/src/main/java/com/qyft/ms/app/model/entity/Tasks.java similarity index 95% rename from src/main/java/com/qyft/ms/model/entity/Tasks.java rename to src/main/java/com/qyft/ms/app/model/entity/Tasks.java index d66f85c..2e0c361 100644 --- a/src/main/java/com/qyft/ms/model/entity/Tasks.java +++ b/src/main/java/com/qyft/ms/app/model/entity/Tasks.java @@ -1,4 +1,4 @@ -package com.qyft.ms.model.entity; +package com.qyft.ms.app.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.qyft.ms.system.common.base.BaseEntity; diff --git a/src/main/java/com/qyft/ms/model/form/CMDForm.java b/src/main/java/com/qyft/ms/app/model/form/CMDForm.java similarity index 93% rename from src/main/java/com/qyft/ms/model/form/CMDForm.java rename to src/main/java/com/qyft/ms/app/model/form/CMDForm.java index ac29491..b4c77ea 100644 --- a/src/main/java/com/qyft/ms/model/form/CMDForm.java +++ b/src/main/java/com/qyft/ms/app/model/form/CMDForm.java @@ -1,4 +1,4 @@ -package com.qyft.ms.model.form; +package com.qyft.ms.app.model.form; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/com/qyft/ms/model/vo/BaseDataVO.java b/src/main/java/com/qyft/ms/app/model/vo/BaseDataVO.java similarity index 94% rename from src/main/java/com/qyft/ms/model/vo/BaseDataVO.java rename to src/main/java/com/qyft/ms/app/model/vo/BaseDataVO.java index 493f55a..6281ec0 100644 --- a/src/main/java/com/qyft/ms/model/vo/BaseDataVO.java +++ b/src/main/java/com/qyft/ms/app/model/vo/BaseDataVO.java @@ -1,4 +1,4 @@ -package com.qyft.ms.model.vo; +package com.qyft.ms.app.model.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/qyft/ms/model/vo/ContainerListVO.java b/src/main/java/com/qyft/ms/app/model/vo/ContainerListVO.java similarity index 74% rename from src/main/java/com/qyft/ms/model/vo/ContainerListVO.java rename to src/main/java/com/qyft/ms/app/model/vo/ContainerListVO.java index ea46104..5dd65b4 100644 --- a/src/main/java/com/qyft/ms/model/vo/ContainerListVO.java +++ b/src/main/java/com/qyft/ms/app/model/vo/ContainerListVO.java @@ -1,6 +1,6 @@ -package com.qyft.ms.model.vo; +package com.qyft.ms.app.model.vo; -import com.qyft.ms.model.entity.Container; +import com.qyft.ms.app.model.entity.Container; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/qyft/ms/model/vo/CraftsStepResult.java b/src/main/java/com/qyft/ms/app/model/vo/CraftsStepResult.java similarity index 92% rename from src/main/java/com/qyft/ms/model/vo/CraftsStepResult.java rename to src/main/java/com/qyft/ms/app/model/vo/CraftsStepResult.java index 8a641ee..d989aa4 100644 --- a/src/main/java/com/qyft/ms/model/vo/CraftsStepResult.java +++ b/src/main/java/com/qyft/ms/app/model/vo/CraftsStepResult.java @@ -1,4 +1,4 @@ -package com.qyft.ms.model.vo; +package com.qyft.ms.app.model.vo; import lombok.Data; diff --git a/src/main/java/com/qyft/ms/model/vo/ExecutionResult.java b/src/main/java/com/qyft/ms/app/model/vo/ExecutionResult.java similarity index 89% rename from src/main/java/com/qyft/ms/model/vo/ExecutionResult.java rename to src/main/java/com/qyft/ms/app/model/vo/ExecutionResult.java index a5abd34..6c31729 100644 --- a/src/main/java/com/qyft/ms/model/vo/ExecutionResult.java +++ b/src/main/java/com/qyft/ms/app/model/vo/ExecutionResult.java @@ -1,4 +1,4 @@ -package com.qyft.ms.model.vo; +package com.qyft.ms.app.model.vo; import lombok.Data; diff --git a/src/main/java/com/qyft/ms/model/vo/OresCraftsListVO.java b/src/main/java/com/qyft/ms/app/model/vo/OresCraftsListVO.java similarity index 89% rename from src/main/java/com/qyft/ms/model/vo/OresCraftsListVO.java rename to src/main/java/com/qyft/ms/app/model/vo/OresCraftsListVO.java index ea44716..7e66940 100644 --- a/src/main/java/com/qyft/ms/model/vo/OresCraftsListVO.java +++ b/src/main/java/com/qyft/ms/app/model/vo/OresCraftsListVO.java @@ -1,7 +1,7 @@ -package com.qyft.ms.model.vo; +package com.qyft.ms.app.model.vo; import com.fasterxml.jackson.annotation.JsonFormat; -import com.qyft.ms.model.entity.Crafts; +import com.qyft.ms.app.model.entity.Crafts; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/qyft/ms/model/vo/SysSettingResult.java b/src/main/java/com/qyft/ms/app/model/vo/SysSettingResult.java similarity index 86% rename from src/main/java/com/qyft/ms/model/vo/SysSettingResult.java rename to src/main/java/com/qyft/ms/app/model/vo/SysSettingResult.java index 1a7b422..7d714ea 100644 --- a/src/main/java/com/qyft/ms/model/vo/SysSettingResult.java +++ b/src/main/java/com/qyft/ms/app/model/vo/SysSettingResult.java @@ -1,4 +1,4 @@ -package com.qyft.ms.model.vo; +package com.qyft.ms.app.model.vo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/qyft/ms/model/vo/SysSettingVO.java b/src/main/java/com/qyft/ms/app/model/vo/SysSettingVO.java similarity index 96% rename from src/main/java/com/qyft/ms/model/vo/SysSettingVO.java rename to src/main/java/com/qyft/ms/app/model/vo/SysSettingVO.java index 828eb08..a32d7c7 100644 --- a/src/main/java/com/qyft/ms/model/vo/SysSettingVO.java +++ b/src/main/java/com/qyft/ms/app/model/vo/SysSettingVO.java @@ -1,4 +1,4 @@ -package com.qyft.ms.model.vo; +package com.qyft.ms.app.model.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/qyft/ms/model/vo/TaskListVO.java b/src/main/java/com/qyft/ms/app/model/vo/TaskListVO.java similarity index 90% rename from src/main/java/com/qyft/ms/model/vo/TaskListVO.java rename to src/main/java/com/qyft/ms/app/model/vo/TaskListVO.java index acb0e83..8713039 100644 --- a/src/main/java/com/qyft/ms/model/vo/TaskListVO.java +++ b/src/main/java/com/qyft/ms/app/model/vo/TaskListVO.java @@ -1,6 +1,6 @@ -package com.qyft.ms.model.vo; +package com.qyft.ms.app.model.vo; -import com.qyft.ms.model.entity.TaskSteps; +import com.qyft.ms.app.model.entity.TaskSteps; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/src/main/java/com/qyft/ms/model/vo/WebsocketResult.java b/src/main/java/com/qyft/ms/app/model/vo/WebsocketResult.java similarity index 91% rename from src/main/java/com/qyft/ms/model/vo/WebsocketResult.java rename to src/main/java/com/qyft/ms/app/model/vo/WebsocketResult.java index 07ef459..574828a 100644 --- a/src/main/java/com/qyft/ms/model/vo/WebsocketResult.java +++ b/src/main/java/com/qyft/ms/app/model/vo/WebsocketResult.java @@ -1,4 +1,4 @@ -package com.qyft.ms.model.vo; +package com.qyft.ms.app.model.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/qyft/ms/service/CMDService.java b/src/main/java/com/qyft/ms/app/service/CMDService.java similarity index 89% rename from src/main/java/com/qyft/ms/service/CMDService.java rename to src/main/java/com/qyft/ms/app/service/CMDService.java index e5c5cd8..ca60a50 100644 --- a/src/main/java/com/qyft/ms/service/CMDService.java +++ b/src/main/java/com/qyft/ms/app/service/CMDService.java @@ -1,12 +1,12 @@ -package com.qyft.ms.service; +package com.qyft.ms.app.service; import cn.hutool.json.JSONUtil; -import com.qyft.ms.common.constant.WebSocketMessageType; -import com.qyft.ms.common.result.CMDResultCode; +import com.qyft.ms.app.common.constant.WebSocketMessageType; +import com.qyft.ms.app.common.result.CMDResultCode; import com.qyft.ms.device.model.bo.DeviceCtrlFuncCMD; import com.qyft.ms.device.service.ICtrlFuncService; -import com.qyft.ms.model.form.CMDForm; -import com.qyft.ms.model.vo.ExecutionResult; +import com.qyft.ms.app.model.form.CMDForm; +import com.qyft.ms.app.model.vo.ExecutionResult; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/qyft/ms/service/ILogsService.java b/src/main/java/com/qyft/ms/app/service/ILogsService.java similarity index 70% rename from src/main/java/com/qyft/ms/service/ILogsService.java rename to src/main/java/com/qyft/ms/app/service/ILogsService.java index 8a5534a..391691f 100644 --- a/src/main/java/com/qyft/ms/service/ILogsService.java +++ b/src/main/java/com/qyft/ms/app/service/ILogsService.java @@ -1,7 +1,7 @@ -package com.qyft.ms.service; +package com.qyft.ms.app.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.qyft.ms.model.entity.Logs; +import com.qyft.ms.app.model.entity.Logs; /** * 日志业务接口 diff --git a/src/main/java/com/qyft/ms/service/ISysSettingsService.java b/src/main/java/com/qyft/ms/app/service/ISysSettingsService.java similarity index 62% rename from src/main/java/com/qyft/ms/service/ISysSettingsService.java rename to src/main/java/com/qyft/ms/app/service/ISysSettingsService.java index 50291ca..6683690 100644 --- a/src/main/java/com/qyft/ms/service/ISysSettingsService.java +++ b/src/main/java/com/qyft/ms/app/service/ISysSettingsService.java @@ -1,11 +1,11 @@ -package com.qyft.ms.service; +package com.qyft.ms.app.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.qyft.ms.model.dto.SysSettingsDTO; -import com.qyft.ms.model.entity.SysSettings; -import com.qyft.ms.model.vo.SysSettingResult; -import com.qyft.ms.model.vo.SysSettingVO; +import com.qyft.ms.app.model.dto.SysSettingsDTO; +import com.qyft.ms.app.model.entity.SysSettings; +import com.qyft.ms.app.model.vo.SysSettingResult; +import com.qyft.ms.app.model.vo.SysSettingVO; import java.util.List; diff --git a/src/main/java/com/qyft/ms/service/StatusService.java b/src/main/java/com/qyft/ms/app/service/StatusService.java similarity index 90% rename from src/main/java/com/qyft/ms/service/StatusService.java rename to src/main/java/com/qyft/ms/app/service/StatusService.java index 0aea4ed..fb36e11 100644 --- a/src/main/java/com/qyft/ms/service/StatusService.java +++ b/src/main/java/com/qyft/ms/app/service/StatusService.java @@ -1,9 +1,8 @@ -package com.qyft.ms.service; +package com.qyft.ms.app.service; -import com.qyft.ms.common.constant.WebSocketMessageType; +import com.qyft.ms.app.common.constant.WebSocketMessageType; import com.qyft.ms.device.model.bo.DeviceStatus; import com.qyft.ms.device.service.DeviceStatusService; -import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/qyft/ms/service/WebSocketService.java b/src/main/java/com/qyft/ms/app/service/WebSocketService.java similarity index 87% rename from src/main/java/com/qyft/ms/service/WebSocketService.java rename to src/main/java/com/qyft/ms/app/service/WebSocketService.java index 686f939..7f7d051 100644 --- a/src/main/java/com/qyft/ms/service/WebSocketService.java +++ b/src/main/java/com/qyft/ms/app/service/WebSocketService.java @@ -1,8 +1,8 @@ -package com.qyft.ms.service; +package com.qyft.ms.app.service; import cn.hutool.json.JSONUtil; -import com.qyft.ms.config.WebSocketServer; -import com.qyft.ms.model.vo.WebsocketResult; +import com.qyft.ms.app.config.WebSocketServer; +import com.qyft.ms.app.model.vo.WebsocketResult; import jakarta.annotation.PostConstruct; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/qyft/ms/service/impl/ILogsServiceImpl.java b/src/main/java/com/qyft/ms/app/service/impl/ILogsServiceImpl.java similarity index 81% rename from src/main/java/com/qyft/ms/service/impl/ILogsServiceImpl.java rename to src/main/java/com/qyft/ms/app/service/impl/ILogsServiceImpl.java index edb305e..f4de979 100644 --- a/src/main/java/com/qyft/ms/service/impl/ILogsServiceImpl.java +++ b/src/main/java/com/qyft/ms/app/service/impl/ILogsServiceImpl.java @@ -1,9 +1,9 @@ -package com.qyft.ms.service.impl; +package com.qyft.ms.app.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qyft.ms.mapper.LogsMapper; -import com.qyft.ms.model.entity.Logs; -import com.qyft.ms.service.ILogsService; +import com.qyft.ms.app.mapper.LogsMapper; +import com.qyft.ms.app.model.entity.Logs; +import com.qyft.ms.app.service.ILogsService; import com.qyft.ms.system.model.entity.User; import com.qyft.ms.system.service.IUserService; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/qyft/ms/service/impl/ISysSettingsServiceImpl.java b/src/main/java/com/qyft/ms/app/service/impl/ISysSettingsServiceImpl.java similarity index 86% rename from src/main/java/com/qyft/ms/service/impl/ISysSettingsServiceImpl.java rename to src/main/java/com/qyft/ms/app/service/impl/ISysSettingsServiceImpl.java index 4aae49a..a917814 100644 --- a/src/main/java/com/qyft/ms/service/impl/ISysSettingsServiceImpl.java +++ b/src/main/java/com/qyft/ms/app/service/impl/ISysSettingsServiceImpl.java @@ -1,12 +1,12 @@ -package com.qyft.ms.service.impl; +package com.qyft.ms.app.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qyft.ms.mapper.SysSettingsMapper; -import com.qyft.ms.model.dto.SysSettingsDTO; -import com.qyft.ms.model.entity.SysSettings; -import com.qyft.ms.model.vo.SysSettingResult; -import com.qyft.ms.model.vo.SysSettingVO; -import com.qyft.ms.service.ISysSettingsService; +import com.qyft.ms.app.mapper.SysSettingsMapper; +import com.qyft.ms.app.model.dto.SysSettingsDTO; +import com.qyft.ms.app.model.entity.SysSettings; +import com.qyft.ms.app.model.vo.SysSettingResult; +import com.qyft.ms.app.model.vo.SysSettingVO; +import com.qyft.ms.app.service.ISysSettingsService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/qyft/ms/device/handler/DeviceMessageHandler.java b/src/main/java/com/qyft/ms/device/handler/DeviceMessageHandler.java index aa00420..be0ef98 100644 --- a/src/main/java/com/qyft/ms/device/handler/DeviceMessageHandler.java +++ b/src/main/java/com/qyft/ms/device/handler/DeviceMessageHandler.java @@ -1,14 +1,14 @@ package com.qyft.ms.device.handler; import cn.hutool.json.JSONUtil; -import com.qyft.ms.common.constant.WebSocketMessageType; +import com.qyft.ms.app.common.constant.WebSocketMessageType; import com.qyft.ms.device.common.constant.TcpMessageType; import com.qyft.ms.device.common.jsonrpc.JsonRpcResponse; import com.qyft.ms.device.model.bo.DeviceAlarm; import com.qyft.ms.device.model.bo.DeviceFeedback; import com.qyft.ms.device.model.bo.DeviceStatus; import com.qyft.ms.device.service.DeviceStatusService; -import com.qyft.ms.service.WebSocketService; +import com.qyft.ms.app.service.WebSocketService; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; diff --git a/src/main/java/com/qyft/ms/device/service/DeviceStepService.java b/src/main/java/com/qyft/ms/device/service/DeviceStepService.java index ef0f78e..cb2bd16 100644 --- a/src/main/java/com/qyft/ms/device/service/DeviceStepService.java +++ b/src/main/java/com/qyft/ms/device/service/DeviceStepService.java @@ -1,7 +1,7 @@ package com.qyft.ms.device.service; -import com.qyft.ms.model.bo.TubeSol; -import com.qyft.ms.service.CMDService; +import com.qyft.ms.app.model.bo.TubeSol; +import com.qyft.ms.app.service.CMDService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/src/main/resources/mapper/SysSettingsMapper.xml b/src/main/resources/mapper/SysSettingsMapper.xml index d5effbb..8101127 100644 --- a/src/main/resources/mapper/SysSettingsMapper.xml +++ b/src/main/resources/mapper/SysSettingsMapper.xml @@ -1,7 +1,7 @@ - - select id, parent_id,