Commit 9c4e54a5ceaf965449f9328767bbe3153ed7b59a
Committed by
Gitee
!434 [新增]mybatis模块新增Mybaits-plus-join插件依赖
Merge pull request !434 from wangzhs/feature/mybatis-plus-join
Showing
4 changed files
with
18 additions
and
2 deletions
yudao-dependencies/pom.xml
| @@ -26,6 +26,7 @@ | @@ -26,6 +26,7 @@ | ||
| 26 | <mybatis-plus.version>3.5.3.1</mybatis-plus.version> | 26 | <mybatis-plus.version>3.5.3.1</mybatis-plus.version> |
| 27 | <mybatis-plus-generator.version>3.5.3.1</mybatis-plus-generator.version> | 27 | <mybatis-plus-generator.version>3.5.3.1</mybatis-plus-generator.version> |
| 28 | <dynamic-datasource.version>3.6.1</dynamic-datasource.version> | 28 | <dynamic-datasource.version>3.6.1</dynamic-datasource.version> |
| 29 | + <mybatis-plus-join-boot-starter.version>1.4.3.1</mybatis-plus-join-boot-starter.version> | ||
| 29 | <redisson.version>3.18.0</redisson.version> | 30 | <redisson.version>3.18.0</redisson.version> |
| 30 | <!-- 服务保障相关 --> | 31 | <!-- 服务保障相关 --> |
| 31 | <lock4j.version>2.2.3</lock4j.version> | 32 | <lock4j.version>2.2.3</lock4j.version> |
| @@ -210,6 +211,12 @@ | @@ -210,6 +211,12 @@ | ||
| 210 | </dependency> | 211 | </dependency> |
| 211 | 212 | ||
| 212 | <dependency> | 213 | <dependency> |
| 214 | + <groupId>com.github.yulichang</groupId> | ||
| 215 | + <artifactId>mybatis-plus-join-boot-starter</artifactId> | ||
| 216 | + <version>${mybatis-plus-join-boot-starter.version}</version> | ||
| 217 | + </dependency> | ||
| 218 | + | ||
| 219 | + <dependency> | ||
| 213 | <groupId>cn.iocoder.boot</groupId> | 220 | <groupId>cn.iocoder.boot</groupId> |
| 214 | <artifactId>yudao-spring-boot-starter-redis</artifactId> | 221 | <artifactId>yudao-spring-boot-starter-redis</artifactId> |
| 215 | <version>${revision}</version> | 222 | <version>${revision}</version> |
yudao-framework/yudao-spring-boot-starter-mybatis/pom.xml
| @@ -59,6 +59,11 @@ | @@ -59,6 +59,11 @@ | ||
| 59 | <artifactId>dynamic-datasource-spring-boot-starter</artifactId> <!-- 多数据源 --> | 59 | <artifactId>dynamic-datasource-spring-boot-starter</artifactId> <!-- 多数据源 --> |
| 60 | </dependency> | 60 | </dependency> |
| 61 | 61 | ||
| 62 | + <dependency> | ||
| 63 | + <groupId>com.github.yulichang</groupId> | ||
| 64 | + <artifactId>mybatis-plus-join-boot-starter</artifactId> | ||
| 65 | + </dependency> | ||
| 66 | + | ||
| 62 | </dependencies> | 67 | </dependencies> |
| 63 | 68 | ||
| 64 | </project> | 69 | </project> |
yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/mapper/BaseMapperX.java
| @@ -6,10 +6,10 @@ import cn.iocoder.yudao.framework.mybatis.core.util.MyBatisUtils; | @@ -6,10 +6,10 @@ import cn.iocoder.yudao.framework.mybatis.core.util.MyBatisUtils; | ||
| 6 | import com.baomidou.mybatisplus.core.conditions.Wrapper; | 6 | import com.baomidou.mybatisplus.core.conditions.Wrapper; |
| 7 | import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; | 7 | import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
| 8 | import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | 8 | import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
| 9 | -import com.baomidou.mybatisplus.core.mapper.BaseMapper; | ||
| 10 | import com.baomidou.mybatisplus.core.metadata.IPage; | 9 | import com.baomidou.mybatisplus.core.metadata.IPage; |
| 11 | import com.baomidou.mybatisplus.core.toolkit.support.SFunction; | 10 | import com.baomidou.mybatisplus.core.toolkit.support.SFunction; |
| 12 | import com.baomidou.mybatisplus.extension.toolkit.Db; | 11 | import com.baomidou.mybatisplus.extension.toolkit.Db; |
| 12 | +import com.github.yulichang.base.MPJBaseMapper; | ||
| 13 | import org.apache.ibatis.annotations.Param; | 13 | import org.apache.ibatis.annotations.Param; |
| 14 | 14 | ||
| 15 | import java.util.Collection; | 15 | import java.util.Collection; |
| @@ -17,8 +17,10 @@ import java.util.List; | @@ -17,8 +17,10 @@ import java.util.List; | ||
| 17 | 17 | ||
| 18 | /** | 18 | /** |
| 19 | * 在 MyBatis Plus 的 BaseMapper 的基础上拓展,提供更多的能力 | 19 | * 在 MyBatis Plus 的 BaseMapper 的基础上拓展,提供更多的能力 |
| 20 | + * <p> | ||
| 21 | + * 为什么继承 MPJBaseMapper 接口?支持 MyBatis Plus 多表 Join 的能力。 | ||
| 20 | */ | 22 | */ |
| 21 | -public interface BaseMapperX<T> extends BaseMapper<T> { | 23 | +public interface BaseMapperX<T> extends MPJBaseMapper<T> { |
| 22 | 24 | ||
| 23 | default PageResult<T> selectPage(PageParam pageParam, @Param("ew") Wrapper<T> queryWrapper) { | 25 | default PageResult<T> selectPage(PageParam pageParam, @Param("ew") Wrapper<T> queryWrapper) { |
| 24 | // MyBatis Plus 查询 | 26 | // MyBatis Plus 查询 |
yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/ut/BaseDbUnitTest.java
| @@ -5,6 +5,7 @@ import cn.iocoder.yudao.framework.mybatis.config.YudaoMybatisAutoConfiguration; | @@ -5,6 +5,7 @@ import cn.iocoder.yudao.framework.mybatis.config.YudaoMybatisAutoConfiguration; | ||
| 5 | import cn.iocoder.yudao.framework.test.config.SqlInitializationTestConfiguration; | 5 | import cn.iocoder.yudao.framework.test.config.SqlInitializationTestConfiguration; |
| 6 | import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure; | 6 | import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure; |
| 7 | import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration; | 7 | import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration; |
| 8 | +import com.github.yulichang.autoconfigure.MybatisPlusJoinAutoConfiguration; | ||
| 8 | import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; | 9 | import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; |
| 9 | import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration; | 10 | import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration; |
| 10 | import org.springframework.boot.test.context.SpringBootTest; | 11 | import org.springframework.boot.test.context.SpringBootTest; |
| @@ -34,6 +35,7 @@ public class BaseDbUnitTest { | @@ -34,6 +35,7 @@ public class BaseDbUnitTest { | ||
| 34 | // MyBatis 配置类 | 35 | // MyBatis 配置类 |
| 35 | YudaoMybatisAutoConfiguration.class, // 自己的 MyBatis 配置类 | 36 | YudaoMybatisAutoConfiguration.class, // 自己的 MyBatis 配置类 |
| 36 | MybatisPlusAutoConfiguration.class, // MyBatis 的自动配置类 | 37 | MybatisPlusAutoConfiguration.class, // MyBatis 的自动配置类 |
| 38 | + MybatisPlusJoinAutoConfiguration.class, // MyBatis 的Join配置类 | ||
| 37 | }) | 39 | }) |
| 38 | public static class Application { | 40 | public static class Application { |
| 39 | } | 41 | } |