From 6bfef02b9b6c98a27985499302823f26da45b3aa Mon Sep 17 00:00:00 2001 From: 1iyc <5212514+liycone@user.noreply.gitee.com> Date: Mon, 11 Nov 2024 11:01:46 +0800 Subject: [PATCH] =?UTF-8?q?build(deps):=20=E6=9B=B4=E6=96=B0=20MyBatis-Plu?= =?UTF-8?q?s=20=E4=BE=9D=E8=B5=96=E7=89=88=E6=9C=AC=E5=B9=B6=E9=9B=86?= =?UTF-8?q?=E6=88=90=20MPJ?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 MyBatis-Plus 核心库版本升级到 3.5.7- 集成 MyBatis-Plus Join (MPJ)插件，版本为 1.5.1 - 更新相关模块的 Mapper 和 Service 接口，使用 MPJ 提供的基类 - 调整部分依赖以支持 MPJ 功能 --- pom.xml | 14 ++++++++++++++ sync-common/pom.xml | 7 ++++++- sync-framework/pom.xml | 14 ++++++++++++++ .../lyr/gather/local/mapper/ConfigTaskMapper.java | 4 ++-- .../local/mapper/DataSourceConfigMapper.java | 4 ++-- .../gather/local/service/IConfigTaskService.java | 4 ++-- .../local/service/impl/ConfigTaskServiceImpl.java | 5 ++--- .../gather/kis/convert/TSupplierConvertImpl.java | 2 +- .../local/convert/ConfigTaskConvertImpl.java | 2 +- .../local/convert/DataSourceConfigConvertImpl.java | 2 +- sync-system/pom.xml | 10 +++++++++- 11 files changed, 54 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index ff1cece..38e25e6 100644 --- a/pom.xml +++ b/pom.xml @@ -21,6 +21,7 @@ 5.7.12 1.2.23 3.5.7 + 1.5.1 1.21 3.0.0 2.3.3 @@ -80,6 +81,19 @@ ${mp.version} + + + com.github.yulichang + mybatis-plus-join-boot-starter + ${mpj.version} + + + + com.baomidou + mybatis-plus-extension + 3.5.7 + + diff --git a/sync-common/pom.xml b/sync-common/pom.xml index 991a7e0..84c9819 100644 --- a/sync-common/pom.xml +++ b/sync-common/pom.xml @@ -136,9 +136,14 @@ guava + + com.github.yulichang + mybatis-plus-join-boot-starter + + com.baomidou - mybatis-plus-boot-starter + mybatis-plus-extension diff --git a/sync-framework/pom.xml b/sync-framework/pom.xml index 7a3258f..a7deea6 100644 --- a/sync-framework/pom.xml +++ b/sync-framework/pom.xml @@ -35,11 +35,21 @@ druid-spring-boot-starter + com.baomidou mybatis-plus-boot-starter + + com.github.yulichang + mybatis-plus-join-boot-starter + + + + com.baomidou + mybatis-plus-extension + @@ -70,6 +80,10 @@ lombok provided + + org.springframework.boot + spring-boot-starter-jdbc + diff --git a/sync-gather/src/main/java/com/lyr/gather/local/mapper/ConfigTaskMapper.java b/sync-gather/src/main/java/com/lyr/gather/local/mapper/ConfigTaskMapper.java index d121a6f..4eb52c4 100644 --- a/sync-gather/src/main/java/com/lyr/gather/local/mapper/ConfigTaskMapper.java +++ b/sync-gather/src/main/java/com/lyr/gather/local/mapper/ConfigTaskMapper.java @@ -1,7 +1,7 @@ package com.lyr.gather.local.mapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; import com.lyr.gather.local.domain.model.ConfigTask; -public interface ConfigTaskMapper extends BaseMapper { +public interface ConfigTaskMapper extends MPJBaseMapper { } diff --git a/sync-gather/src/main/java/com/lyr/gather/local/mapper/DataSourceConfigMapper.java b/sync-gather/src/main/java/com/lyr/gather/local/mapper/DataSourceConfigMapper.java index 78d1d21..85800fc 100644 --- a/sync-gather/src/main/java/com/lyr/gather/local/mapper/DataSourceConfigMapper.java +++ b/sync-gather/src/main/java/com/lyr/gather/local/mapper/DataSourceConfigMapper.java @@ -1,9 +1,9 @@ package com.lyr.gather.local.mapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; import com.lyr.gather.local.domain.model.ConfigDataSource; -public interface DataSourceConfigMapper extends BaseMapper { +public interface DataSourceConfigMapper extends MPJBaseMapper { } diff --git a/sync-gather/src/main/java/com/lyr/gather/local/service/IConfigTaskService.java b/sync-gather/src/main/java/com/lyr/gather/local/service/IConfigTaskService.java index 74359fe..e932f60 100644 --- a/sync-gather/src/main/java/com/lyr/gather/local/service/IConfigTaskService.java +++ b/sync-gather/src/main/java/com/lyr/gather/local/service/IConfigTaskService.java @@ -1,7 +1,7 @@ package com.lyr.gather.local.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; +import com.github.yulichang.base.MPJBaseService; import com.lyr.gather.local.domain.model.ConfigTask; import com.lyr.gather.local.domain.req.ConfigTaskEditReq; import com.lyr.gather.local.domain.req.ConfigTaskReq; @@ -13,7 +13,7 @@ import com.lyr.gather.local.domain.vo.ConfigTaskPageVO; * @date 2024/11/5 * @description TODO **/ -public interface IConfigTaskService extends IService { +public interface IConfigTaskService extends MPJBaseService { IPage page(ConfigTaskReq req); diff --git a/sync-gather/src/main/java/com/lyr/gather/local/service/impl/ConfigTaskServiceImpl.java b/sync-gather/src/main/java/com/lyr/gather/local/service/impl/ConfigTaskServiceImpl.java index afcd0a3..c882669 100644 --- a/sync-gather/src/main/java/com/lyr/gather/local/service/impl/ConfigTaskServiceImpl.java +++ b/sync-gather/src/main/java/com/lyr/gather/local/service/impl/ConfigTaskServiceImpl.java @@ -3,6 +3,7 @@ package com.lyr.gather.local.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.yulichang.base.MPJBaseServiceImpl; import com.google.common.collect.ImmutableMap; import com.lyr.common.core.redis.RedisCache; import com.lyr.gather.kis.domain.model.TSupplier; @@ -27,10 +28,8 @@ import java.util.List; * @description TODO **/ @Service -public class ConfigTaskServiceImpl extends ServiceImpl implements IConfigTaskService { +public class ConfigTaskServiceImpl extends MPJBaseServiceImpl implements IConfigTaskService { - @Resource - private ConfigTaskMapper configTaskMapper; @Resource private SyncServicesStrategyContext syncServicesStrategyContext; @Resource diff --git a/sync-gather/target/generated-sources/annotations/com/lyr/gather/kis/convert/TSupplierConvertImpl.java b/sync-gather/target/generated-sources/annotations/com/lyr/gather/kis/convert/TSupplierConvertImpl.java index 5542912..47efa1c 100644 --- a/sync-gather/target/generated-sources/annotations/com/lyr/gather/kis/convert/TSupplierConvertImpl.java +++ b/sync-gather/target/generated-sources/annotations/com/lyr/gather/kis/convert/TSupplierConvertImpl.java @@ -6,7 +6,7 @@ import javax.annotation.Generated; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2024-11-11T09:40:40+0800", + date = "2024-11-11T11:01:13+0800", comments = "version: 1.6.2, compiler: javac, environment: Java 1.8.0_392 (Amazon.com Inc.)" ) public class TSupplierConvertImpl implements TSupplierConvert { diff --git a/sync-gather/target/generated-sources/annotations/com/lyr/gather/local/convert/ConfigTaskConvertImpl.java b/sync-gather/target/generated-sources/annotations/com/lyr/gather/local/convert/ConfigTaskConvertImpl.java index 7e5e771..bc83010 100644 --- a/sync-gather/target/generated-sources/annotations/com/lyr/gather/local/convert/ConfigTaskConvertImpl.java +++ b/sync-gather/target/generated-sources/annotations/com/lyr/gather/local/convert/ConfigTaskConvertImpl.java @@ -6,7 +6,7 @@ import javax.annotation.Generated; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2024-11-11T09:40:40+0800", + date = "2024-11-11T11:01:13+0800", comments = "version: 1.6.2, compiler: javac, environment: Java 1.8.0_392 (Amazon.com Inc.)" ) public class ConfigTaskConvertImpl implements ConfigTaskConvert { diff --git a/sync-gather/target/generated-sources/annotations/com/lyr/gather/local/convert/DataSourceConfigConvertImpl.java b/sync-gather/target/generated-sources/annotations/com/lyr/gather/local/convert/DataSourceConfigConvertImpl.java index d9bfbe7..27c72b5 100644 --- a/sync-gather/target/generated-sources/annotations/com/lyr/gather/local/convert/DataSourceConfigConvertImpl.java +++ b/sync-gather/target/generated-sources/annotations/com/lyr/gather/local/convert/DataSourceConfigConvertImpl.java @@ -8,7 +8,7 @@ import javax.annotation.Generated; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2024-11-11T09:40:40+0800", + date = "2024-11-11T11:01:13+0800", comments = "version: 1.6.2, compiler: javac, environment: Java 1.8.0_392 (Amazon.com Inc.)" ) public class DataSourceConfigConvertImpl implements DataSourceConfigConvert { diff --git a/sync-system/pom.xml b/sync-system/pom.xml index ced0814..7078df3 100644 --- a/sync-system/pom.xml +++ b/sync-system/pom.xml @@ -29,10 +29,18 @@ provided + + + + com.github.yulichang + mybatis-plus-join-boot-starter + + com.baomidou - mybatis-plus-boot-starter + mybatis-plus-extension + \ No newline at end of file