build(deps): 更新 MyBatis-Plus 依赖版本并集成 MPJ

- 将 MyBatis-Plus 核心库版本升级到 3.5.7- 集成 MyBatis-Plus Join (MPJ)插件，版本为 1.5.1
- 更新相关模块的 Mapper 和 Service 接口，使用 MPJ 提供的基类
- 调整部分依赖以支持 MPJ 功能

pom.xml

@@ -21,6 +21,7 @@
         <spring-security.version>5.7.12</spring-security.version>
         <druid.version>1.2.23</druid.version>
         <mp.version>3.5.7</mp.version>
+        <mpj.version>1.5.1</mpj.version>
         <bitwalker.version>1.21</bitwalker.version>
         <swagger.version>3.0.0</swagger.version>
         <kaptcha.version>2.3.3</kaptcha.version>
@@ -80,6 +81,19 @@
                 <version>${mp.version}</version>
             </dependency>
 
+            <!-- mybatis-plus-join -->
+            <dependency>
+                <groupId>com.github.yulichang</groupId>
+                <artifactId>mybatis-plus-join-boot-starter</artifactId>
+                <version>${mpj.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>mybatis-plus-extension</artifactId>
+                <version>3.5.7</version>
+            </dependency>
+
 
             <!-- 解析客户端操作系统、浏览器等 -->
             <dependency>

sync-common/pom.xml

@@ -136,9 +136,14 @@
             <artifactId>guava</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.github.yulichang</groupId>
+            <artifactId>mybatis-plus-join-boot-starter</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <artifactId>mybatis-plus-extension</artifactId>
         </dependency>
 
     </dependencies>

sync-framework/pom.xml

@@ -35,11 +35,21 @@
             <artifactId>druid-spring-boot-starter</artifactId>
         </dependency>
 
+
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.github.yulichang</groupId>
+            <artifactId>mybatis-plus-join-boot-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-extension</artifactId>
+        </dependency>
 
         <!-- 验证码 -->
         <dependency>
@@ -70,6 +80,10 @@
             <artifactId>lombok</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jdbc</artifactId>
+        </dependency>
 
     </dependencies>
 

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<ConfigTask> {
+public interface ConfigTaskMapper extends MPJBaseMapper<ConfigTask> {
 }

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<ConfigDataSource> {
+public interface DataSourceConfigMapper extends MPJBaseMapper<ConfigDataSource> {
 
 
 }

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<ConfigTask> {
+public interface IConfigTaskService extends MPJBaseService<ConfigTask> {
 
 
     IPage<ConfigTaskPageVO> page(ConfigTaskReq req);

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<ConfigTaskMapper, ConfigTask> implements IConfigTaskService {
+public class ConfigTaskServiceImpl extends MPJBaseServiceImpl<ConfigTaskMapper, ConfigTask> implements IConfigTaskService {
 
-    @Resource
-    private ConfigTaskMapper configTaskMapper;
     @Resource
     private SyncServicesStrategyContext syncServicesStrategyContext;
     @Resource

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 {

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 {

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 {

sync-system/pom.xml

@@ -29,10 +29,18 @@
             <scope>provided</scope>
         </dependency>
 
+
+        <!-- mybatis-plus-join -->
+        <dependency>
+            <groupId>com.github.yulichang</groupId>
+            <artifactId>mybatis-plus-join-boot-starter</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <artifactId>mybatis-plus-extension</artifactId>
         </dependency>
+
     </dependencies>
 
 </project>