fix:调整目录结构

src/main/java/com/iflytop/colortitration/app/controller/ColorController.java

@@ -2,7 +2,7 @@ package com.iflytop.colortitration.app.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.iflytop.colortitration.common.base.BasePageQuery;
-import com.iflytop.colortitration.common.entity.Color;
+import com.iflytop.colortitration.common.model.entity.Color;
 import com.iflytop.colortitration.common.result.PageResult;
 import com.iflytop.colortitration.common.result.Result;
 import com.iflytop.colortitration.common.service.ColorService;

src/main/java/com/iflytop/colortitration/app/controller/ContainerController.java

@@ -1,6 +1,6 @@
 package com.iflytop.colortitration.app.controller;
 
-import com.iflytop.colortitration.common.entity.Container;
+import com.iflytop.colortitration.common.model.entity.Container;
 import com.iflytop.colortitration.common.result.Result;
 import com.iflytop.colortitration.common.service.ContainerService;
 import io.swagger.v3.oas.annotations.Operation;

src/main/java/com/iflytop/colortitration/app/controller/PositionController.java

@@ -2,7 +2,7 @@ package com.iflytop.colortitration.app.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.iflytop.colortitration.common.base.BasePageQuery;
-import com.iflytop.colortitration.common.entity.Position;
+import com.iflytop.colortitration.common.model.entity.Position;
 import com.iflytop.colortitration.common.result.PageResult;
 import com.iflytop.colortitration.common.result.Result;
 import com.iflytop.colortitration.common.service.PositionService;

src/main/java/com/iflytop/colortitration/app/controller/PumpController.java

@@ -2,7 +2,7 @@ package com.iflytop.colortitration.app.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.iflytop.colortitration.common.base.BasePageQuery;
-import com.iflytop.colortitration.common.entity.Pump;
+import com.iflytop.colortitration.common.model.entity.Pump;
 import com.iflytop.colortitration.common.result.PageResult;
 import com.iflytop.colortitration.common.result.Result;
 import com.iflytop.colortitration.common.service.PumpService;

src/main/java/com/iflytop/colortitration/app/controller/SolutionsController.java

@@ -2,7 +2,7 @@ package com.iflytop.colortitration.app.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.iflytop.colortitration.common.base.BasePageQuery;
-import com.iflytop.colortitration.common.entity.Solutions;
+import com.iflytop.colortitration.common.model.entity.Solutions;
 import com.iflytop.colortitration.common.result.PageResult;
 import com.iflytop.colortitration.common.result.Result;
 import com.iflytop.colortitration.common.service.SolutionsService;

src/main/java/com/iflytop/colortitration/app/controller/SystemConfigController.java

@@ -2,7 +2,7 @@ package com.iflytop.colortitration.app.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.iflytop.colortitration.common.base.BasePageQuery;
-import com.iflytop.colortitration.common.entity.SystemConfig;
+import com.iflytop.colortitration.common.model.entity.SystemConfig;
 import com.iflytop.colortitration.common.result.PageResult;
 import com.iflytop.colortitration.common.result.Result;
 import com.iflytop.colortitration.common.service.SystemConfigService;

src/main/java/com/iflytop/colortitration/app/controller/SystemLogController.java

@@ -2,7 +2,7 @@ package com.iflytop.colortitration.app.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.iflytop.colortitration.common.base.BasePageQuery;
-import com.iflytop.colortitration.common.entity.SystemLog;
+import com.iflytop.colortitration.common.model.entity.SystemLog;
 import com.iflytop.colortitration.common.result.PageResult;
 import com.iflytop.colortitration.common.result.Result;
 import com.iflytop.colortitration.common.service.SystemLogService;

src/main/java/com/iflytop/colortitration/app/controller/UserController.java

@@ -2,7 +2,7 @@ package com.iflytop.colortitration.app.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.iflytop.colortitration.common.base.BasePageQuery;
-import com.iflytop.colortitration.common.entity.User;
+import com.iflytop.colortitration.common.model.entity.User;
 import com.iflytop.colortitration.common.result.PageResult;
 import com.iflytop.colortitration.common.result.Result;
 import com.iflytop.colortitration.common.service.UserService;

src/main/java/com/iflytop/colortitration/config/MybatisPlusConfig.java → src/main/java/com/iflytop/colortitration/common/config/MybatisPlusConfig.java

@@ -1,4 +1,4 @@
-package com.iflytop.colortitration.config;
+package com.iflytop.colortitration.common.config;
 
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.core.config.GlobalConfig;

src/main/java/com/iflytop/colortitration/config/SwaggerConfig.java → src/main/java/com/iflytop/colortitration/common/config/SwaggerConfig.java

@@ -1,4 +1,4 @@
-package com.iflytop.colortitration.config;
+package com.iflytop.colortitration.common.config;
 
 import cn.hutool.core.util.ArrayUtil;
 import io.swagger.v3.oas.models.Components;

src/main/java/com/iflytop/colortitration/config/WebConfig.java → src/main/java/com/iflytop/colortitration/common/config/WebConfig.java

@@ -1,4 +1,4 @@
-package com.iflytop.colortitration.config;
+package com.iflytop.colortitration.common.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;

src/main/java/com/iflytop/colortitration/common/mapper/ColorMapper.java

@@ -1,7 +1,7 @@
 package com.iflytop.colortitration.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.iflytop.colortitration.common.entity.Color;
+import com.iflytop.colortitration.common.model.entity.Color;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

src/main/java/com/iflytop/colortitration/common/mapper/ContainerMapper.java

@@ -1,7 +1,7 @@
 package com.iflytop.colortitration.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.iflytop.colortitration.common.entity.Container;
+import com.iflytop.colortitration.common.model.entity.Container;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

src/main/java/com/iflytop/colortitration/common/mapper/PositionMapper.java

@@ -1,7 +1,7 @@
 package com.iflytop.colortitration.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.iflytop.colortitration.common.entity.Position;
+import com.iflytop.colortitration.common.model.entity.Position;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

src/main/java/com/iflytop/colortitration/common/mapper/PumpMapper.java

@@ -1,7 +1,7 @@
 package com.iflytop.colortitration.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.iflytop.colortitration.common.entity.Pump;
+import com.iflytop.colortitration.common.model.entity.Pump;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

src/main/java/com/iflytop/colortitration/common/mapper/SolutionsMapper.java

@@ -2,7 +2,7 @@ package com.iflytop.colortitration.common.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.iflytop.colortitration.common.entity.Solutions;
+import com.iflytop.colortitration.common.model.entity.Solutions;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

src/main/java/com/iflytop/colortitration/common/mapper/SystemConfigMapper.java

@@ -1,7 +1,7 @@
 package com.iflytop.colortitration.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.iflytop.colortitration.common.entity.SystemConfig;
+import com.iflytop.colortitration.common.model.entity.SystemConfig;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

src/main/java/com/iflytop/colortitration/common/mapper/SystemLogMapper.java

@@ -1,7 +1,7 @@
 package com.iflytop.colortitration.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.iflytop.colortitration.common.entity.SystemLog;
+import com.iflytop.colortitration.common.model.entity.SystemLog;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

src/main/java/com/iflytop/colortitration/common/mapper/UserMapper.java

@@ -1,7 +1,7 @@
 package com.iflytop.colortitration.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.iflytop.colortitration.common.entity.User;
+import com.iflytop.colortitration.common.model.entity.User;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

src/main/java/com/iflytop/colortitration/common/base/Point2D.java → src/main/java/com/iflytop/colortitration/common/model/bo/Point2D.java

@@ -1,4 +1,4 @@
-package com.iflytop.colortitration.common.base;
+package com.iflytop.colortitration.common.model.bo;
 
 
 import lombok.Data;

src/main/java/com/iflytop/colortitration/common/base/Point3D.java → src/main/java/com/iflytop/colortitration/common/model/bo/Point3D.java

@@ -1,4 +1,4 @@
-package com.iflytop.colortitration.common.base;
+package com.iflytop.colortitration.common.model.bo;
 
 
 import lombok.Data;

src/main/java/com/iflytop/colortitration/common/entity/Color.java → src/main/java/com/iflytop/colortitration/common/model/entity/Color.java

@@ -1,4 +1,4 @@
-package com.iflytop.colortitration.common.entity;
+package com.iflytop.colortitration.common.model.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.iflytop.colortitration.common.base.BaseEntity;

src/main/java/com/iflytop/colortitration/common/entity/Container.java → src/main/java/com/iflytop/colortitration/common/model/entity/Container.java

@@ -1,4 +1,4 @@
-package com.iflytop.colortitration.common.entity;
+package com.iflytop.colortitration.common.model.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.iflytop.colortitration.common.base.BaseEntity;

src/main/java/com/iflytop/colortitration/common/entity/Position.java → src/main/java/com/iflytop/colortitration/common/model/entity/Position.java

@@ -1,4 +1,4 @@
-package com.iflytop.colortitration.common.entity;
+package com.iflytop.colortitration.common.model.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.iflytop.colortitration.common.base.BaseEntity;

src/main/java/com/iflytop/colortitration/common/entity/Pump.java → src/main/java/com/iflytop/colortitration/common/model/entity/Pump.java

@@ -1,4 +1,4 @@
-package com.iflytop.colortitration.common.entity;
+package com.iflytop.colortitration.common.model.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.iflytop.colortitration.common.base.BaseEntity;

src/main/java/com/iflytop/colortitration/common/entity/Solutions.java → src/main/java/com/iflytop/colortitration/common/model/entity/Solutions.java

@@ -1,4 +1,4 @@
-package com.iflytop.colortitration.common.entity;
+package com.iflytop.colortitration.common.model.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.iflytop.colortitration.common.base.BaseEntity;

src/main/java/com/iflytop/colortitration/common/entity/SystemConfig.java → src/main/java/com/iflytop/colortitration/common/model/entity/SystemConfig.java

@@ -1,4 +1,4 @@
-package com.iflytop.colortitration.common.entity;
+package com.iflytop.colortitration.common.model.entity;
 
 
 import com.baomidou.mybatisplus.annotation.TableName;

src/main/java/com/iflytop/colortitration/common/entity/SystemLog.java → src/main/java/com/iflytop/colortitration/common/model/entity/SystemLog.java

@@ -1,4 +1,4 @@
-package com.iflytop.colortitration.common.entity;
+package com.iflytop.colortitration.common.model.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.iflytop.colortitration.common.base.BaseEntity;

src/main/java/com/iflytop/colortitration/common/entity/User.java → src/main/java/com/iflytop/colortitration/common/model/entity/User.java

@@ -1,4 +1,4 @@
-package com.iflytop.colortitration.common.entity;
+package com.iflytop.colortitration.common.model.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.iflytop.colortitration.common.base.BaseEntity;

src/main/java/com/iflytop/colortitration/common/service/ColorService.java

@@ -1,7 +1,7 @@
 package com.iflytop.colortitration.common.service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.iflytop.colortitration.common.entity.Color;
+import com.iflytop.colortitration.common.model.entity.Color;
 import com.iflytop.colortitration.common.mapper.ColorMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;

src/main/java/com/iflytop/colortitration/common/service/ContainerService.java

@@ -1,7 +1,7 @@
 package com.iflytop.colortitration.common.service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.iflytop.colortitration.common.entity.Container;
+import com.iflytop.colortitration.common.model.entity.Container;
 import com.iflytop.colortitration.common.mapper.ContainerMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;

src/main/java/com/iflytop/colortitration/common/service/PositionService.java

@@ -1,7 +1,7 @@
 package com.iflytop.colortitration.common.service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.iflytop.colortitration.common.entity.Position;
+import com.iflytop.colortitration.common.model.entity.Position;
 import com.iflytop.colortitration.common.mapper.PositionMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;

src/main/java/com/iflytop/colortitration/common/service/PumpService.java

@@ -1,7 +1,7 @@
 package com.iflytop.colortitration.common.service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.iflytop.colortitration.common.entity.Pump;
+import com.iflytop.colortitration.common.model.entity.Pump;
 import com.iflytop.colortitration.common.mapper.PumpMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;

src/main/java/com/iflytop/colortitration/common/service/SolutionsService.java

@@ -1,7 +1,7 @@
 package com.iflytop.colortitration.common.service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.iflytop.colortitration.common.entity.Solutions;
+import com.iflytop.colortitration.common.model.entity.Solutions;
 import com.iflytop.colortitration.common.mapper.SolutionsMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;

src/main/java/com/iflytop/colortitration/common/service/SystemConfigService.java

@@ -1,7 +1,7 @@
 package com.iflytop.colortitration.common.service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.iflytop.colortitration.common.entity.SystemConfig;
+import com.iflytop.colortitration.common.model.entity.SystemConfig;
 import com.iflytop.colortitration.common.mapper.SystemConfigMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;

src/main/java/com/iflytop/colortitration/common/service/SystemLogService.java

@@ -2,7 +2,7 @@ package com.iflytop.colortitration.common.service;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.iflytop.colortitration.common.entity.SystemLog;
+import com.iflytop.colortitration.common.model.entity.SystemLog;
 import com.iflytop.colortitration.common.mapper.SystemLogMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;

src/main/java/com/iflytop/colortitration/common/service/UserService.java

@@ -1,7 +1,7 @@
 package com.iflytop.colortitration.common.service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.iflytop.colortitration.common.entity.User;
+import com.iflytop.colortitration.common.model.entity.User;
 import com.iflytop.colortitration.common.mapper.UserMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;