fix:调整项目目录结构

src/main/java/com/qyft/ms/common/constant/Commands.java → 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;
 
 /**
  * 操作指令

src/main/java/com/qyft/ms/common/constant/SysSettings.java → 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;
 
 /**
  * 操作指令

src/main/java/com/qyft/ms/common/constant/WebSocketMessageType.java → 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 {
     /**

src/main/java/com/qyft/ms/enums/DirectiveTypeEnum.java → 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;
 

src/main/java/com/qyft/ms/common/result/CMDResultCode.java → 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;

src/main/java/com/qyft/ms/config/WebSocketConfig.java → 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;

src/main/java/com/qyft/ms/config/WebSocketServer.java → 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;

src/main/java/com/qyft/ms/controller/CMDController.java → 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;

src/main/java/com/qyft/ms/controller/LogsController.java → 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;

src/main/java/com/qyft/ms/controller/SysSettingsController.java → 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;

src/main/java/com/qyft/ms/mapper/LogsMapper.java → 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;
 
 /**

src/main/java/com/qyft/ms/mapper/SysSettingsMapper.java → 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;

src/main/java/com/qyft/ms/model/bo/CraftsStepMethod.java → 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;
 

src/main/java/com/qyft/ms/model/bo/CraftsStepStatus.java → 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;
 

src/main/java/com/qyft/ms/model/bo/TubeSol.java → 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;
 

src/main/java/com/qyft/ms/model/dto/BaseDataDTO.java → 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;

src/main/java/com/qyft/ms/model/dto/CmdInjectFluidDTO.java → 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;

src/main/java/com/qyft/ms/model/dto/ContainerDTO.java → 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;

src/main/java/com/qyft/ms/model/dto/InjectFluid.java → 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;

src/main/java/com/qyft/ms/model/dto/LogDTO.java → 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;

src/main/java/com/qyft/ms/model/dto/PauseCraftsDto.java → 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;

src/main/java/com/qyft/ms/model/dto/ResumeCraftsDto.java → 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;

src/main/java/com/qyft/ms/model/dto/StartCraftsDTO.java → 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;

src/main/java/com/qyft/ms/model/dto/StartHeatDTO.java → 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;

src/main/java/com/qyft/ms/model/dto/StopCraftsDto.java → 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;

src/main/java/com/qyft/ms/model/dto/StopTaskDTO.java → 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;

src/main/java/com/qyft/ms/model/dto/SysSettingsDTO.java → 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;

src/main/java/com/qyft/ms/model/dto/TaskDTO.java → 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;

src/main/java/com/qyft/ms/model/dto/WebsocketDTO.java → 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;

src/main/java/com/qyft/ms/model/entity/Container.java → 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;

src/main/java/com/qyft/ms/model/entity/Crafts.java → 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;

src/main/java/com/qyft/ms/model/entity/Logs.java → 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;

src/main/java/com/qyft/ms/model/entity/Ores.java → 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;

src/main/java/com/qyft/ms/model/entity/Solutions.java → 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;

src/main/java/com/qyft/ms/model/entity/SysSettings.java → 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;

src/main/java/com/qyft/ms/model/entity/TaskSteps.java → 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;

src/main/java/com/qyft/ms/model/entity/Tasks.java → 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;

src/main/java/com/qyft/ms/model/form/CMDForm.java → 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;

src/main/java/com/qyft/ms/model/vo/BaseDataVO.java → 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;

src/main/java/com/qyft/ms/model/vo/ContainerListVO.java → 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;

src/main/java/com/qyft/ms/model/vo/CraftsStepResult.java → 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;
 

src/main/java/com/qyft/ms/model/vo/ExecutionResult.java → 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;
 

src/main/java/com/qyft/ms/model/vo/OresCraftsListVO.java → 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;
 

src/main/java/com/qyft/ms/model/vo/SysSettingResult.java → 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;

src/main/java/com/qyft/ms/model/vo/SysSettingVO.java → 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;

src/main/java/com/qyft/ms/model/vo/TaskListVO.java → 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;

src/main/java/com/qyft/ms/model/vo/WebsocketResult.java → 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;

src/main/java/com/qyft/ms/service/CMDService.java → 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;

src/main/java/com/qyft/ms/service/ILogsService.java → 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;
 
 /**
  * 日志业务接口

src/main/java/com/qyft/ms/service/ISysSettingsService.java → 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;
 

src/main/java/com/qyft/ms/service/StatusService.java → 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;

src/main/java/com/qyft/ms/service/WebSocketService.java → 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;
 

src/main/java/com/qyft/ms/service/impl/ILogsServiceImpl.java → 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;

src/main/java/com/qyft/ms/service/impl/ISysSettingsServiceImpl.java → 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;
 

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;

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;

src/main/resources/mapper/SysSettingsMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.qyft.ms.mapper.SysSettingsMapper">
-    <select id="getConfig" resultType="com.qyft.ms.model.vo.SysSettingVO">
+<mapper namespace="com.qyft.ms.app.mapper.SysSettingsMapper">
+    <select id="getConfig" resultType="com.qyft.ms.app.model.vo.SysSettingVO">
         select
             id,
             parent_id,