From f74e9b9e04e0720f88f0e3378ad9bd47bd4edfc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=87=A4=E5=90=89?= Date: Tue, 22 Jul 2025 18:22:56 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/ColorController.java | 2 +- .../app/controller/ContainerController.java | 2 +- .../app/controller/PositionController.java | 2 +- .../app/controller/PumpController.java | 2 +- .../app/controller/SolutionsController.java | 2 +- .../app/controller/SystemConfigController.java | 2 +- .../app/controller/SystemLogController.java | 2 +- .../app/controller/UserController.java | 2 +- .../colortitration/common/base/Point2D.java | 20 ------- .../colortitration/common/base/Point3D.java | 22 ------- .../common/config/MybatisPlusConfig.java | 61 +++++++++++++++++++ .../common/config/SwaggerConfig.java | 68 ++++++++++++++++++++++ .../colortitration/common/config/WebConfig.java | 16 +++++ .../colortitration/common/entity/Color.java | 20 ------- .../colortitration/common/entity/Container.java | 26 --------- .../colortitration/common/entity/Position.java | 25 -------- .../iflytop/colortitration/common/entity/Pump.java | 27 --------- .../colortitration/common/entity/Solutions.java | 17 ------ .../colortitration/common/entity/SystemConfig.java | 21 ------- .../colortitration/common/entity/SystemLog.java | 20 ------- .../iflytop/colortitration/common/entity/User.java | 44 -------------- .../colortitration/common/mapper/ColorMapper.java | 2 +- .../common/mapper/ContainerMapper.java | 2 +- .../common/mapper/PositionMapper.java | 2 +- .../colortitration/common/mapper/PumpMapper.java | 2 +- .../common/mapper/SolutionsMapper.java | 2 +- .../common/mapper/SystemConfigMapper.java | 2 +- .../common/mapper/SystemLogMapper.java | 2 +- .../colortitration/common/mapper/UserMapper.java | 2 +- .../colortitration/common/model/bo/Point2D.java | 20 +++++++ .../colortitration/common/model/bo/Point3D.java | 22 +++++++ .../colortitration/common/model/entity/Color.java | 20 +++++++ .../common/model/entity/Container.java | 26 +++++++++ .../common/model/entity/Position.java | 25 ++++++++ .../colortitration/common/model/entity/Pump.java | 27 +++++++++ .../common/model/entity/Solutions.java | 17 ++++++ .../common/model/entity/SystemConfig.java | 21 +++++++ .../common/model/entity/SystemLog.java | 20 +++++++ .../colortitration/common/model/entity/User.java | 44 ++++++++++++++ .../common/service/ColorService.java | 2 +- .../common/service/ContainerService.java | 2 +- .../common/service/PositionService.java | 2 +- .../colortitration/common/service/PumpService.java | 2 +- .../common/service/SolutionsService.java | 2 +- .../common/service/SystemConfigService.java | 2 +- .../common/service/SystemLogService.java | 2 +- .../colortitration/common/service/UserService.java | 2 +- .../colortitration/config/MybatisPlusConfig.java | 61 ------------------- .../colortitration/config/SwaggerConfig.java | 68 ---------------------- .../iflytop/colortitration/config/WebConfig.java | 16 ----- 50 files changed, 411 insertions(+), 411 deletions(-) delete mode 100644 src/main/java/com/iflytop/colortitration/common/base/Point2D.java delete mode 100644 src/main/java/com/iflytop/colortitration/common/base/Point3D.java create mode 100644 src/main/java/com/iflytop/colortitration/common/config/MybatisPlusConfig.java create mode 100644 src/main/java/com/iflytop/colortitration/common/config/SwaggerConfig.java create mode 100644 src/main/java/com/iflytop/colortitration/common/config/WebConfig.java delete mode 100644 src/main/java/com/iflytop/colortitration/common/entity/Color.java delete mode 100644 src/main/java/com/iflytop/colortitration/common/entity/Container.java delete mode 100644 src/main/java/com/iflytop/colortitration/common/entity/Position.java delete mode 100644 src/main/java/com/iflytop/colortitration/common/entity/Pump.java delete mode 100644 src/main/java/com/iflytop/colortitration/common/entity/Solutions.java delete mode 100644 src/main/java/com/iflytop/colortitration/common/entity/SystemConfig.java delete mode 100644 src/main/java/com/iflytop/colortitration/common/entity/SystemLog.java delete mode 100644 src/main/java/com/iflytop/colortitration/common/entity/User.java create mode 100644 src/main/java/com/iflytop/colortitration/common/model/bo/Point2D.java create mode 100644 src/main/java/com/iflytop/colortitration/common/model/bo/Point3D.java create mode 100644 src/main/java/com/iflytop/colortitration/common/model/entity/Color.java create mode 100644 src/main/java/com/iflytop/colortitration/common/model/entity/Container.java create mode 100644 src/main/java/com/iflytop/colortitration/common/model/entity/Position.java create mode 100644 src/main/java/com/iflytop/colortitration/common/model/entity/Pump.java create mode 100644 src/main/java/com/iflytop/colortitration/common/model/entity/Solutions.java create mode 100644 src/main/java/com/iflytop/colortitration/common/model/entity/SystemConfig.java create mode 100644 src/main/java/com/iflytop/colortitration/common/model/entity/SystemLog.java create mode 100644 src/main/java/com/iflytop/colortitration/common/model/entity/User.java delete mode 100644 src/main/java/com/iflytop/colortitration/config/MybatisPlusConfig.java delete mode 100644 src/main/java/com/iflytop/colortitration/config/SwaggerConfig.java delete mode 100644 src/main/java/com/iflytop/colortitration/config/WebConfig.java diff --git a/src/main/java/com/iflytop/colortitration/app/controller/ColorController.java b/src/main/java/com/iflytop/colortitration/app/controller/ColorController.java index 5a72eb6..ffb0d32 100644 --- a/src/main/java/com/iflytop/colortitration/app/controller/ColorController.java +++ b/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; diff --git a/src/main/java/com/iflytop/colortitration/app/controller/ContainerController.java b/src/main/java/com/iflytop/colortitration/app/controller/ContainerController.java index daeddf3..21ee8b7 100644 --- a/src/main/java/com/iflytop/colortitration/app/controller/ContainerController.java +++ b/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; diff --git a/src/main/java/com/iflytop/colortitration/app/controller/PositionController.java b/src/main/java/com/iflytop/colortitration/app/controller/PositionController.java index 996bdee..54c0ffb 100644 --- a/src/main/java/com/iflytop/colortitration/app/controller/PositionController.java +++ b/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; diff --git a/src/main/java/com/iflytop/colortitration/app/controller/PumpController.java b/src/main/java/com/iflytop/colortitration/app/controller/PumpController.java index c3c7049..e8f063b 100644 --- a/src/main/java/com/iflytop/colortitration/app/controller/PumpController.java +++ b/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; diff --git a/src/main/java/com/iflytop/colortitration/app/controller/SolutionsController.java b/src/main/java/com/iflytop/colortitration/app/controller/SolutionsController.java index 3999b25..b4e4ecb 100644 --- a/src/main/java/com/iflytop/colortitration/app/controller/SolutionsController.java +++ b/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; diff --git a/src/main/java/com/iflytop/colortitration/app/controller/SystemConfigController.java b/src/main/java/com/iflytop/colortitration/app/controller/SystemConfigController.java index b958b81..18a5e67 100644 --- a/src/main/java/com/iflytop/colortitration/app/controller/SystemConfigController.java +++ b/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; diff --git a/src/main/java/com/iflytop/colortitration/app/controller/SystemLogController.java b/src/main/java/com/iflytop/colortitration/app/controller/SystemLogController.java index 2cabc0e..fab801d 100644 --- a/src/main/java/com/iflytop/colortitration/app/controller/SystemLogController.java +++ b/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; diff --git a/src/main/java/com/iflytop/colortitration/app/controller/UserController.java b/src/main/java/com/iflytop/colortitration/app/controller/UserController.java index 7e8aa2b..75de6ec 100644 --- a/src/main/java/com/iflytop/colortitration/app/controller/UserController.java +++ b/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; diff --git a/src/main/java/com/iflytop/colortitration/common/base/Point2D.java b/src/main/java/com/iflytop/colortitration/common/base/Point2D.java deleted file mode 100644 index f07ed0a..0000000 --- a/src/main/java/com/iflytop/colortitration/common/base/Point2D.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.iflytop.colortitration.common.base; - - -import lombok.Data; - -@Data -public class Point2D { - public Double x; - public Double y; - - public Point2D() { - } - - public Point2D(Double x, Double y) { - this.x = x; - this.y = y; - } - - -} diff --git a/src/main/java/com/iflytop/colortitration/common/base/Point3D.java b/src/main/java/com/iflytop/colortitration/common/base/Point3D.java deleted file mode 100644 index 74c47b0..0000000 --- a/src/main/java/com/iflytop/colortitration/common/base/Point3D.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.iflytop.colortitration.common.base; - - -import lombok.Data; - -@Data -public class Point3D { - public Double x; - public Double y; - public Double z; - - public Point3D() { - } - - public Point3D(Double x, Double y, Double z) { - this.x = x; - this.y = y; - this.z = z; - } - - -} diff --git a/src/main/java/com/iflytop/colortitration/common/config/MybatisPlusConfig.java b/src/main/java/com/iflytop/colortitration/common/config/MybatisPlusConfig.java new file mode 100644 index 0000000..ad5b65b --- /dev/null +++ b/src/main/java/com/iflytop/colortitration/common/config/MybatisPlusConfig.java @@ -0,0 +1,61 @@ +package com.iflytop.colortitration.common.config; + +import com.baomidou.mybatisplus.annotation.DbType; +import com.baomidou.mybatisplus.core.config.GlobalConfig; +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; +import com.iflytop.colortitration.app.common.handler.MyMetaObjectHandler; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +/** + * + */ +@EnableTransactionManagement +@Configuration +public class MybatisPlusConfig { + + @Bean + public MybatisPlusInterceptor mybatisPlusInterceptor() { + MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); + // 乐观锁插件 + interceptor.addInnerInterceptor(optimisticLockerInnerInterceptor()); + // 分页插件 + interceptor.addInnerInterceptor(paginationInnerInterceptor()); + + return interceptor; + } + + /** + * 分页插件，自动识别数据库类型 + * ... + */ + public PaginationInnerInterceptor paginationInnerInterceptor() { + PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor(); + // 设置数据库类型 + paginationInnerInterceptor.setDbType(DbType.SQLITE); + // 设置最大单页限制数量，默认 500 条，-1 不受限制 + paginationInnerInterceptor.setMaxLimit(-1L); + return paginationInnerInterceptor; + } + + /** + * 乐观锁插件 + * ... + */ + public OptimisticLockerInnerInterceptor optimisticLockerInnerInterceptor() { + return new OptimisticLockerInnerInterceptor(); + } + + /** + * 自动填充数据库创建人、创建时间、更新人、更新时间 + */ + @Bean + public GlobalConfig globalConfig() { + GlobalConfig globalConfig = new GlobalConfig(); + globalConfig.setMetaObjectHandler(new MyMetaObjectHandler()); + return globalConfig; + } +} diff --git a/src/main/java/com/iflytop/colortitration/common/config/SwaggerConfig.java b/src/main/java/com/iflytop/colortitration/common/config/SwaggerConfig.java new file mode 100644 index 0000000..faa95bd --- /dev/null +++ b/src/main/java/com/iflytop/colortitration/common/config/SwaggerConfig.java @@ -0,0 +1,68 @@ +package com.iflytop.colortitration.common.config; + +import cn.hutool.core.util.ArrayUtil; +import io.swagger.v3.oas.models.Components; +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.info.Info; +import io.swagger.v3.oas.models.security.SecurityScheme; +import org.springdoc.core.customizers.GlobalOpenApiCustomizer; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.HttpHeaders; +import org.springframework.util.AntPathMatcher; + +import java.util.stream.Stream; + +/*** + * 创建Swagger配置 + */ +@Configuration +public class SwaggerConfig { + + @Bean + public GlobalOpenApiCustomizer orderGlobalOpenApiCustomizer() { + return openApi -> { + // 全局添加Authorization + if (openApi.getPaths() != null) { + openApi.getPaths().forEach((path, pathItem) -> { + + // 忽略认证的请求无需携带 Authorization + String[] ignoreUrls = {"/api/auth/login"}; + if (ArrayUtil.isNotEmpty(ignoreUrls)) { + // Ant 匹配忽略的路径，不添加Authorization + AntPathMatcher antPathMatcher = new AntPathMatcher(); + if (Stream.of(ignoreUrls).anyMatch(ignoreUrl -> antPathMatcher.match(ignoreUrl, path))) { + return; + } + } + + // 其他接口统一添加Authorization +// pathItem.readOperations() +// .forEach(operation -> +// operation.addSecurityItem(new SecurityRequirement().addList(HttpHeaders.AUTHORIZATION)) +// ); + }); + } + }; + } + + @Bean + public OpenAPI customOpenAPI() { + return new OpenAPI() + .info(new Info() + .title("系统API") + .version("1.0")) // 配置全局鉴权参数-Authorize + .components(new Components() + .addSecuritySchemes(HttpHeaders.AUTHORIZATION, + new SecurityScheme() + .name(HttpHeaders.AUTHORIZATION) + .type(SecurityScheme.Type.APIKEY) + .in(SecurityScheme.In.HEADER) + .scheme("Bearer") + .bearerFormat("JWT") + ) + ); + } + + +} diff --git a/src/main/java/com/iflytop/colortitration/common/config/WebConfig.java b/src/main/java/com/iflytop/colortitration/common/config/WebConfig.java new file mode 100644 index 0000000..94d0a95 --- /dev/null +++ b/src/main/java/com/iflytop/colortitration/common/config/WebConfig.java @@ -0,0 +1,16 @@ +package com.iflytop.colortitration.common.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +public class WebConfig implements WebMvcConfigurer { + @Override + public void addCorsMappings(CorsRegistry registry) { + registry.addMapping("/api/**") + .allowedOrigins("*") + .allowedMethods("GET", "POST", "PUT", "DELETE") + .allowedHeaders("*"); + } +} \ No newline at end of file diff --git a/src/main/java/com/iflytop/colortitration/common/entity/Color.java b/src/main/java/com/iflytop/colortitration/common/entity/Color.java deleted file mode 100644 index 206a9b2..0000000 --- a/src/main/java/com/iflytop/colortitration/common/entity/Color.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.iflytop.colortitration.common.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.iflytop.colortitration.common.base.BaseEntity; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -@Data -@TableName("color") -@EqualsAndHashCode(callSuper = true) -@Schema(description = "颜色") -public class Color extends BaseEntity { - - @Schema(description = "颜色编码") - private String code; - - @Schema(description = "颜色名称") - private String name; -} \ No newline at end of file diff --git a/src/main/java/com/iflytop/colortitration/common/entity/Container.java b/src/main/java/com/iflytop/colortitration/common/entity/Container.java deleted file mode 100644 index cae6f14..0000000 --- a/src/main/java/com/iflytop/colortitration/common/entity/Container.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.iflytop.colortitration.common.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.iflytop.colortitration.common.base.BaseEntity; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -@Data -@TableName("container") -@EqualsAndHashCode(callSuper = true) -@Schema(description = "容器") -public class Container extends BaseEntity { - - @Schema(description = "容器名称") - private String name; - - @Schema(description = "关联的溶液ID") - private Integer solutionsId; - - @Schema(description = "总容量") - private Integer capacityTotal; - - @Schema(description = "已使用容量") - private Integer capacityUsed; -} \ No newline at end of file diff --git a/src/main/java/com/iflytop/colortitration/common/entity/Position.java b/src/main/java/com/iflytop/colortitration/common/entity/Position.java deleted file mode 100644 index e5ceb0e..0000000 --- a/src/main/java/com/iflytop/colortitration/common/entity/Position.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.iflytop.colortitration.common.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.iflytop.colortitration.common.base.BaseEntity; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -@Data -@TableName("position") -@EqualsAndHashCode(callSuper = true) -@Schema(description = "设备位置") -public class Position extends BaseEntity { - @Schema(description = "位置名称") - private String name; - - @Schema(description = "位置code") - private String code; - - @Schema(description = "数据类型") - private String type; - - @Schema(description = "位置信息") - private String position; -} diff --git a/src/main/java/com/iflytop/colortitration/common/entity/Pump.java b/src/main/java/com/iflytop/colortitration/common/entity/Pump.java deleted file mode 100644 index d4b52a5..0000000 --- a/src/main/java/com/iflytop/colortitration/common/entity/Pump.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.iflytop.colortitration.common.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.iflytop.colortitration.common.base.BaseEntity; -import com.iflytop.colortitration.common.enums.Device; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -@Data -@TableName("pump") -@EqualsAndHashCode(callSuper = true) -@Schema(description = "泵") -public class Pump extends BaseEntity { - - @Schema(description = "泵名称") - private String name; - - @Schema(description = "设备编码") - private Device deviceCode; - - @Schema(description = "关联容器ID") - private Integer containerId; - - @Schema(description = "所属模块") - private String solutionModule; -} \ No newline at end of file diff --git a/src/main/java/com/iflytop/colortitration/common/entity/Solutions.java b/src/main/java/com/iflytop/colortitration/common/entity/Solutions.java deleted file mode 100644 index 8b4d2e2..0000000 --- a/src/main/java/com/iflytop/colortitration/common/entity/Solutions.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.iflytop.colortitration.common.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.iflytop.colortitration.common.base.BaseEntity; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -@Data -@TableName("solutions") -@EqualsAndHashCode(callSuper = true) -@Schema(description = "溶液") -public class Solutions extends BaseEntity { - - @Schema(description = "溶液名称") - private String name; -} \ No newline at end of file diff --git a/src/main/java/com/iflytop/colortitration/common/entity/SystemConfig.java b/src/main/java/com/iflytop/colortitration/common/entity/SystemConfig.java deleted file mode 100644 index 3584dec..0000000 --- a/src/main/java/com/iflytop/colortitration/common/entity/SystemConfig.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.iflytop.colortitration.common.entity; - - -import com.baomidou.mybatisplus.annotation.TableName; -import com.iflytop.colortitration.common.base.BaseEntity; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -@Data -@TableName("system_config") -@EqualsAndHashCode(callSuper = true) -@Schema(description = "系统配置") -public class SystemConfig extends BaseEntity { - - @Schema(description = "配置键") - private String key; - - @Schema(description = "配置值") - private String value; -} \ No newline at end of file diff --git a/src/main/java/com/iflytop/colortitration/common/entity/SystemLog.java b/src/main/java/com/iflytop/colortitration/common/entity/SystemLog.java deleted file mode 100644 index 4b7c179..0000000 --- a/src/main/java/com/iflytop/colortitration/common/entity/SystemLog.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.iflytop.colortitration.common.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.iflytop.colortitration.common.base.BaseEntity; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -@Data -@TableName("system_log") -@EqualsAndHashCode(callSuper = true) -@Schema(description = "系统日志") -public class SystemLog extends BaseEntity { - - @Schema(description = "日志标题") - private String title; - - @Schema(description = "日志内容") - private String content; -} \ No newline at end of file diff --git a/src/main/java/com/iflytop/colortitration/common/entity/User.java b/src/main/java/com/iflytop/colortitration/common/entity/User.java deleted file mode 100644 index 295e028..0000000 --- a/src/main/java/com/iflytop/colortitration/common/entity/User.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.iflytop.colortitration.common.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.iflytop.colortitration.common.base.BaseEntity; -import com.iflytop.colortitration.common.enums.EnableStatus; -import com.iflytop.colortitration.app.common.enums.UserRole; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 用户实体 - */ -@EqualsAndHashCode(callSuper = true) -@Schema(description = "用户") -@TableName("user") -@Data -public class User extends BaseEntity { - - @NotNull - @Schema(description = "用户名") - private String username; - - @NotNull - @Schema(description = "昵称") - private String nickname; - - @NotNull - @Schema(description = "密码") - private String password; - - @NotNull - @Schema(description = "人员角色") - private UserRole role; - - @NotNull - @Schema(description = "是否删除") - private EnableStatus deleted; - - @Schema(description = "是否是系统固定用户") - private EnableStatus fixedUser; - -} \ No newline at end of file diff --git a/src/main/java/com/iflytop/colortitration/common/mapper/ColorMapper.java b/src/main/java/com/iflytop/colortitration/common/mapper/ColorMapper.java index c7dd416..f9020a2 100644 --- a/src/main/java/com/iflytop/colortitration/common/mapper/ColorMapper.java +++ b/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; /** diff --git a/src/main/java/com/iflytop/colortitration/common/mapper/ContainerMapper.java b/src/main/java/com/iflytop/colortitration/common/mapper/ContainerMapper.java index 4e31dde..6434269 100644 --- a/src/main/java/com/iflytop/colortitration/common/mapper/ContainerMapper.java +++ b/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; /** diff --git a/src/main/java/com/iflytop/colortitration/common/mapper/PositionMapper.java b/src/main/java/com/iflytop/colortitration/common/mapper/PositionMapper.java index 8b835e0..edcae9c 100644 --- a/src/main/java/com/iflytop/colortitration/common/mapper/PositionMapper.java +++ b/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; /** diff --git a/src/main/java/com/iflytop/colortitration/common/mapper/PumpMapper.java b/src/main/java/com/iflytop/colortitration/common/mapper/PumpMapper.java index 115c540..4330283 100644 --- a/src/main/java/com/iflytop/colortitration/common/mapper/PumpMapper.java +++ b/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; /** diff --git a/src/main/java/com/iflytop/colortitration/common/mapper/SolutionsMapper.java b/src/main/java/com/iflytop/colortitration/common/mapper/SolutionsMapper.java index 486e05d..6f4515e 100644 --- a/src/main/java/com/iflytop/colortitration/common/mapper/SolutionsMapper.java +++ b/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; /** diff --git a/src/main/java/com/iflytop/colortitration/common/mapper/SystemConfigMapper.java b/src/main/java/com/iflytop/colortitration/common/mapper/SystemConfigMapper.java index 6dcd0c6..0ef1803 100644 --- a/src/main/java/com/iflytop/colortitration/common/mapper/SystemConfigMapper.java +++ b/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; /** diff --git a/src/main/java/com/iflytop/colortitration/common/mapper/SystemLogMapper.java b/src/main/java/com/iflytop/colortitration/common/mapper/SystemLogMapper.java index 6666eab..6226f3d 100644 --- a/src/main/java/com/iflytop/colortitration/common/mapper/SystemLogMapper.java +++ b/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; /** diff --git a/src/main/java/com/iflytop/colortitration/common/mapper/UserMapper.java b/src/main/java/com/iflytop/colortitration/common/mapper/UserMapper.java index 1b4a3be..38b7624 100644 --- a/src/main/java/com/iflytop/colortitration/common/mapper/UserMapper.java +++ b/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; /** diff --git a/src/main/java/com/iflytop/colortitration/common/model/bo/Point2D.java b/src/main/java/com/iflytop/colortitration/common/model/bo/Point2D.java new file mode 100644 index 0000000..b8a9490 --- /dev/null +++ b/src/main/java/com/iflytop/colortitration/common/model/bo/Point2D.java @@ -0,0 +1,20 @@ +package com.iflytop.colortitration.common.model.bo; + + +import lombok.Data; + +@Data +public class Point2D { + public Double x; + public Double y; + + public Point2D() { + } + + public Point2D(Double x, Double y) { + this.x = x; + this.y = y; + } + + +} diff --git a/src/main/java/com/iflytop/colortitration/common/model/bo/Point3D.java b/src/main/java/com/iflytop/colortitration/common/model/bo/Point3D.java new file mode 100644 index 0000000..6158a16 --- /dev/null +++ b/src/main/java/com/iflytop/colortitration/common/model/bo/Point3D.java @@ -0,0 +1,22 @@ +package com.iflytop.colortitration.common.model.bo; + + +import lombok.Data; + +@Data +public class Point3D { + public Double x; + public Double y; + public Double z; + + public Point3D() { + } + + public Point3D(Double x, Double y, Double z) { + this.x = x; + this.y = y; + this.z = z; + } + + +} diff --git a/src/main/java/com/iflytop/colortitration/common/model/entity/Color.java b/src/main/java/com/iflytop/colortitration/common/model/entity/Color.java new file mode 100644 index 0000000..8857b1a --- /dev/null +++ b/src/main/java/com/iflytop/colortitration/common/model/entity/Color.java @@ -0,0 +1,20 @@ +package com.iflytop.colortitration.common.model.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.iflytop.colortitration.common.base.BaseEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@TableName("color") +@EqualsAndHashCode(callSuper = true) +@Schema(description = "颜色") +public class Color extends BaseEntity { + + @Schema(description = "颜色编码") + private String code; + + @Schema(description = "颜色名称") + private String name; +} \ No newline at end of file diff --git a/src/main/java/com/iflytop/colortitration/common/model/entity/Container.java b/src/main/java/com/iflytop/colortitration/common/model/entity/Container.java new file mode 100644 index 0000000..66e48bc --- /dev/null +++ b/src/main/java/com/iflytop/colortitration/common/model/entity/Container.java @@ -0,0 +1,26 @@ +package com.iflytop.colortitration.common.model.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.iflytop.colortitration.common.base.BaseEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@TableName("container") +@EqualsAndHashCode(callSuper = true) +@Schema(description = "容器") +public class Container extends BaseEntity { + + @Schema(description = "容器名称") + private String name; + + @Schema(description = "关联的溶液ID") + private Integer solutionsId; + + @Schema(description = "总容量") + private Integer capacityTotal; + + @Schema(description = "已使用容量") + private Integer capacityUsed; +} \ No newline at end of file diff --git a/src/main/java/com/iflytop/colortitration/common/model/entity/Position.java b/src/main/java/com/iflytop/colortitration/common/model/entity/Position.java new file mode 100644 index 0000000..e7621c7 --- /dev/null +++ b/src/main/java/com/iflytop/colortitration/common/model/entity/Position.java @@ -0,0 +1,25 @@ +package com.iflytop.colortitration.common.model.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.iflytop.colortitration.common.base.BaseEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@TableName("position") +@EqualsAndHashCode(callSuper = true) +@Schema(description = "设备位置") +public class Position extends BaseEntity { + @Schema(description = "位置名称") + private String name; + + @Schema(description = "位置code") + private String code; + + @Schema(description = "数据类型") + private String type; + + @Schema(description = "位置信息") + private String position; +} diff --git a/src/main/java/com/iflytop/colortitration/common/model/entity/Pump.java b/src/main/java/com/iflytop/colortitration/common/model/entity/Pump.java new file mode 100644 index 0000000..60539f6 --- /dev/null +++ b/src/main/java/com/iflytop/colortitration/common/model/entity/Pump.java @@ -0,0 +1,27 @@ +package com.iflytop.colortitration.common.model.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.iflytop.colortitration.common.base.BaseEntity; +import com.iflytop.colortitration.common.enums.Device; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@TableName("pump") +@EqualsAndHashCode(callSuper = true) +@Schema(description = "泵") +public class Pump extends BaseEntity { + + @Schema(description = "泵名称") + private String name; + + @Schema(description = "设备编码") + private Device deviceCode; + + @Schema(description = "关联容器ID") + private Integer containerId; + + @Schema(description = "所属模块") + private String solutionModule; +} \ No newline at end of file diff --git a/src/main/java/com/iflytop/colortitration/common/model/entity/Solutions.java b/src/main/java/com/iflytop/colortitration/common/model/entity/Solutions.java new file mode 100644 index 0000000..075d9a0 --- /dev/null +++ b/src/main/java/com/iflytop/colortitration/common/model/entity/Solutions.java @@ -0,0 +1,17 @@ +package com.iflytop.colortitration.common.model.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.iflytop.colortitration.common.base.BaseEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@TableName("solutions") +@EqualsAndHashCode(callSuper = true) +@Schema(description = "溶液") +public class Solutions extends BaseEntity { + + @Schema(description = "溶液名称") + private String name; +} \ No newline at end of file diff --git a/src/main/java/com/iflytop/colortitration/common/model/entity/SystemConfig.java b/src/main/java/com/iflytop/colortitration/common/model/entity/SystemConfig.java new file mode 100644 index 0000000..9a09df5 --- /dev/null +++ b/src/main/java/com/iflytop/colortitration/common/model/entity/SystemConfig.java @@ -0,0 +1,21 @@ +package com.iflytop.colortitration.common.model.entity; + + +import com.baomidou.mybatisplus.annotation.TableName; +import com.iflytop.colortitration.common.base.BaseEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@TableName("system_config") +@EqualsAndHashCode(callSuper = true) +@Schema(description = "系统配置") +public class SystemConfig extends BaseEntity { + + @Schema(description = "配置键") + private String key; + + @Schema(description = "配置值") + private String value; +} \ No newline at end of file diff --git a/src/main/java/com/iflytop/colortitration/common/model/entity/SystemLog.java b/src/main/java/com/iflytop/colortitration/common/model/entity/SystemLog.java new file mode 100644 index 0000000..e82125a --- /dev/null +++ b/src/main/java/com/iflytop/colortitration/common/model/entity/SystemLog.java @@ -0,0 +1,20 @@ +package com.iflytop.colortitration.common.model.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.iflytop.colortitration.common.base.BaseEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@TableName("system_log") +@EqualsAndHashCode(callSuper = true) +@Schema(description = "系统日志") +public class SystemLog extends BaseEntity { + + @Schema(description = "日志标题") + private String title; + + @Schema(description = "日志内容") + private String content; +} \ No newline at end of file diff --git a/src/main/java/com/iflytop/colortitration/common/model/entity/User.java b/src/main/java/com/iflytop/colortitration/common/model/entity/User.java new file mode 100644 index 0000000..0788836 --- /dev/null +++ b/src/main/java/com/iflytop/colortitration/common/model/entity/User.java @@ -0,0 +1,44 @@ +package com.iflytop.colortitration.common.model.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.iflytop.colortitration.common.base.BaseEntity; +import com.iflytop.colortitration.common.enums.EnableStatus; +import com.iflytop.colortitration.app.common.enums.UserRole; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 用户实体 + */ +@EqualsAndHashCode(callSuper = true) +@Schema(description = "用户") +@TableName("user") +@Data +public class User extends BaseEntity { + + @NotNull + @Schema(description = "用户名") + private String username; + + @NotNull + @Schema(description = "昵称") + private String nickname; + + @NotNull + @Schema(description = "密码") + private String password; + + @NotNull + @Schema(description = "人员角色") + private UserRole role; + + @NotNull + @Schema(description = "是否删除") + private EnableStatus deleted; + + @Schema(description = "是否是系统固定用户") + private EnableStatus fixedUser; + +} \ No newline at end of file diff --git a/src/main/java/com/iflytop/colortitration/common/service/ColorService.java b/src/main/java/com/iflytop/colortitration/common/service/ColorService.java index 9562300..963db79 100644 --- a/src/main/java/com/iflytop/colortitration/common/service/ColorService.java +++ b/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; diff --git a/src/main/java/com/iflytop/colortitration/common/service/ContainerService.java b/src/main/java/com/iflytop/colortitration/common/service/ContainerService.java index ca61e72..4dd7eb2 100644 --- a/src/main/java/com/iflytop/colortitration/common/service/ContainerService.java +++ b/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; diff --git a/src/main/java/com/iflytop/colortitration/common/service/PositionService.java b/src/main/java/com/iflytop/colortitration/common/service/PositionService.java index 8d9a453..1bd2597 100644 --- a/src/main/java/com/iflytop/colortitration/common/service/PositionService.java +++ b/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; diff --git a/src/main/java/com/iflytop/colortitration/common/service/PumpService.java b/src/main/java/com/iflytop/colortitration/common/service/PumpService.java index 975f543..ce324a8 100644 --- a/src/main/java/com/iflytop/colortitration/common/service/PumpService.java +++ b/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; diff --git a/src/main/java/com/iflytop/colortitration/common/service/SolutionsService.java b/src/main/java/com/iflytop/colortitration/common/service/SolutionsService.java index 0062691..cf542b0 100644 --- a/src/main/java/com/iflytop/colortitration/common/service/SolutionsService.java +++ b/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; diff --git a/src/main/java/com/iflytop/colortitration/common/service/SystemConfigService.java b/src/main/java/com/iflytop/colortitration/common/service/SystemConfigService.java index 677b076..292cf3a 100644 --- a/src/main/java/com/iflytop/colortitration/common/service/SystemConfigService.java +++ b/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; diff --git a/src/main/java/com/iflytop/colortitration/common/service/SystemLogService.java b/src/main/java/com/iflytop/colortitration/common/service/SystemLogService.java index fe406f7..bc3f3e1 100644 --- a/src/main/java/com/iflytop/colortitration/common/service/SystemLogService.java +++ b/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; diff --git a/src/main/java/com/iflytop/colortitration/common/service/UserService.java b/src/main/java/com/iflytop/colortitration/common/service/UserService.java index 073a12e..837e234 100644 --- a/src/main/java/com/iflytop/colortitration/common/service/UserService.java +++ b/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; diff --git a/src/main/java/com/iflytop/colortitration/config/MybatisPlusConfig.java b/src/main/java/com/iflytop/colortitration/config/MybatisPlusConfig.java deleted file mode 100644 index 756a0c3..0000000 --- a/src/main/java/com/iflytop/colortitration/config/MybatisPlusConfig.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.iflytop.colortitration.config; - -import com.baomidou.mybatisplus.annotation.DbType; -import com.baomidou.mybatisplus.core.config.GlobalConfig; -import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; -import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor; -import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; -import com.iflytop.colortitration.app.common.handler.MyMetaObjectHandler; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.transaction.annotation.EnableTransactionManagement; - -/** - * - */ -@EnableTransactionManagement -@Configuration -public class MybatisPlusConfig { - - @Bean - public MybatisPlusInterceptor mybatisPlusInterceptor() { - MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); - // 乐观锁插件 - interceptor.addInnerInterceptor(optimisticLockerInnerInterceptor()); - // 分页插件 - interceptor.addInnerInterceptor(paginationInnerInterceptor()); - - return interceptor; - } - - /** - * 分页插件，自动识别数据库类型 - * ... - */ - public PaginationInnerInterceptor paginationInnerInterceptor() { - PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor(); - // 设置数据库类型 - paginationInnerInterceptor.setDbType(DbType.SQLITE); - // 设置最大单页限制数量，默认 500 条，-1 不受限制 - paginationInnerInterceptor.setMaxLimit(-1L); - return paginationInnerInterceptor; - } - - /** - * 乐观锁插件 - * ... - */ - public OptimisticLockerInnerInterceptor optimisticLockerInnerInterceptor() { - return new OptimisticLockerInnerInterceptor(); - } - - /** - * 自动填充数据库创建人、创建时间、更新人、更新时间 - */ - @Bean - public GlobalConfig globalConfig() { - GlobalConfig globalConfig = new GlobalConfig(); - globalConfig.setMetaObjectHandler(new MyMetaObjectHandler()); - return globalConfig; - } -} diff --git a/src/main/java/com/iflytop/colortitration/config/SwaggerConfig.java b/src/main/java/com/iflytop/colortitration/config/SwaggerConfig.java deleted file mode 100644 index 7eb605a..0000000 --- a/src/main/java/com/iflytop/colortitration/config/SwaggerConfig.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.iflytop.colortitration.config; - -import cn.hutool.core.util.ArrayUtil; -import io.swagger.v3.oas.models.Components; -import io.swagger.v3.oas.models.OpenAPI; -import io.swagger.v3.oas.models.info.Info; -import io.swagger.v3.oas.models.security.SecurityScheme; -import org.springdoc.core.customizers.GlobalOpenApiCustomizer; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.http.HttpHeaders; -import org.springframework.util.AntPathMatcher; - -import java.util.stream.Stream; - -/*** - * 创建Swagger配置 - */ -@Configuration -public class SwaggerConfig { - - @Bean - public GlobalOpenApiCustomizer orderGlobalOpenApiCustomizer() { - return openApi -> { - // 全局添加Authorization - if (openApi.getPaths() != null) { - openApi.getPaths().forEach((path, pathItem) -> { - - // 忽略认证的请求无需携带 Authorization - String[] ignoreUrls = {"/api/auth/login"}; - if (ArrayUtil.isNotEmpty(ignoreUrls)) { - // Ant 匹配忽略的路径，不添加Authorization - AntPathMatcher antPathMatcher = new AntPathMatcher(); - if (Stream.of(ignoreUrls).anyMatch(ignoreUrl -> antPathMatcher.match(ignoreUrl, path))) { - return; - } - } - - // 其他接口统一添加Authorization -// pathItem.readOperations() -// .forEach(operation -> -// operation.addSecurityItem(new SecurityRequirement().addList(HttpHeaders.AUTHORIZATION)) -// ); - }); - } - }; - } - - @Bean - public OpenAPI customOpenAPI() { - return new OpenAPI() - .info(new Info() - .title("系统API") - .version("1.0")) // 配置全局鉴权参数-Authorize - .components(new Components() - .addSecuritySchemes(HttpHeaders.AUTHORIZATION, - new SecurityScheme() - .name(HttpHeaders.AUTHORIZATION) - .type(SecurityScheme.Type.APIKEY) - .in(SecurityScheme.In.HEADER) - .scheme("Bearer") - .bearerFormat("JWT") - ) - ); - } - - -} diff --git a/src/main/java/com/iflytop/colortitration/config/WebConfig.java b/src/main/java/com/iflytop/colortitration/config/WebConfig.java deleted file mode 100644 index 3003ad0..0000000 --- a/src/main/java/com/iflytop/colortitration/config/WebConfig.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.iflytop.colortitration.config; - -import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.config.annotation.CorsRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; - -@Configuration -public class WebConfig implements WebMvcConfigurer { - @Override - public void addCorsMappings(CorsRegistry registry) { - registry.addMapping("/api/**") - .allowedOrigins("*") - .allowedMethods("GET", "POST", "PUT", "DELETE") - .allowedHeaders("*"); - } -} \ No newline at end of file