From 7e3ee68d73293a7e2d9d8b97d46e7a0b6904961b Mon Sep 17 00:00:00 2001 From: yulichang <570810310@qq.com> Date: Tue, 8 Oct 2024 10:56:13 +0800 Subject: [PATCH] 1.5.1 --- README-zh.md | 4 +- README.md | 4 +- .../config/MPJInterceptorConfig.java | 2 +- mybatis-plus-join-test/pom.xml | 2 +- .../solon/plugin/base/MPJBaseService.java | 89 +------------------ pom.xml | 2 +- 6 files changed, 9 insertions(+), 94 deletions(-) diff --git a/README-zh.md b/README-zh.md index 271ee0d..2c51921 100644 --- a/README-zh.md +++ b/README-zh.md @@ -47,12 +47,12 @@ QQ群:680016987 或者 com.github.yulichang mybatis-plus-join-boot-starter - 1.5.0 + 1.5.1 ``` - Gradle ``` - implementation 'com.github.yulichang:mybatis-plus-join-boot-starter:1.5.0' + implementation 'com.github.yulichang:mybatis-plus-join-boot-starter:1.5.1' ``` 或者clone代码到本地执行 mvn install, 再引入以上依赖
diff --git a/README.md b/README.md index c1fe4f6..f499b5d 100644 --- a/README.md +++ b/README.md @@ -47,12 +47,12 @@ QQ群:680016987 或者 com.github.yulichang mybatis-plus-join-boot-starter - 1.5.0 + 1.5.1 ``` - Gradle ``` - implementation 'com.github.yulichang:mybatis-plus-join-boot-starter:1.5.0' + implementation 'com.github.yulichang:mybatis-plus-join-boot-starter:1.5.1' ``` 或者clone代码到本地执行 mvn install, 再引入以上依赖
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java index 1456fea..1fa9b91 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java @@ -30,7 +30,7 @@ public class MPJInterceptorConfig { System.out.println(" _ _ |_ _ _|_. ___ _ | _ . _ . _ \n" + "| | |\\/|_)(_| | |_\\ |_)||_|_\\ | (_) | | | \n" + " / | /\n" + - " 1.5.0"); + " 1.5.1"); } } diff --git a/mybatis-plus-join-test/pom.xml b/mybatis-plus-join-test/pom.xml index 3e42694..b61189a 100644 --- a/mybatis-plus-join-test/pom.xml +++ b/mybatis-plus-join-test/pom.xml @@ -49,7 +49,7 @@ - 1.5.0 + 1.5.1 3.5.8 17 diff --git a/plugin/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/MPJBaseService.java b/plugin/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/MPJBaseService.java index 7074f5f..180563a 100644 --- a/plugin/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/MPJBaseService.java +++ b/plugin/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/MPJBaseService.java @@ -1,13 +1,7 @@ package com.github.yulichang.mybatisplusjoin.solon.plugin.base; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.solon.service.IService; -import com.baomidou.mybatisplus.solon.toolkit.SqlHelper; -import com.github.yulichang.base.MPJBaseMapper; -import com.github.yulichang.interfaces.MPJBaseJoin; - -import java.util.List; -import java.util.Map; +import com.github.yulichang.base.JoinService; /** * 基础service @@ -15,85 +9,6 @@ import java.util.Map; * * @author yulichang */ -@SuppressWarnings({"unused"}) -public interface MPJBaseService extends IService { +public interface MPJBaseService extends IService, JoinService { - - /** - * 根据 Wrapper 条件，连表删除 - * - * @param wrapper joinWrapper - */ - default boolean deleteJoin(MPJBaseJoin wrapper) { - return SqlHelper.retBool(((MPJBaseMapper) getBaseMapper()).deleteJoin(wrapper)); - } - - /** - * 根据 whereEntity 条件，更新记录 - * - * @param entity 实体对象 (set 条件值,可以为 null) - * @param wrapper 实体对象封装操作类（可以为 null,里面的 entity 用于生成 where 语句） - */ - default boolean updateJoin(T entity, MPJBaseJoin wrapper) { - return SqlHelper.retBool(((MPJBaseMapper) getBaseMapper()).updateJoin(entity, wrapper)); - } - - /** - * 根据 whereEntity 条件，更新记录 (null字段也会更新 !!!) - * - * @param entity 实体对象 (set 条件值,可以为 null) - * @param wrapper 实体对象封装操作类（可以为 null,里面的 entity 用于生成 where 语句） - */ - default boolean updateJoinAndNull(T entity, MPJBaseJoin wrapper) { - return SqlHelper.retBool(((MPJBaseMapper) getBaseMapper()).updateJoinAndNull(entity, wrapper)); - } - - /** - * 根据 Wrapper 条件，查询总记录数 - */ - default Long selectJoinCount(MPJBaseJoin wrapper) { - return ((MPJBaseMapper) getBaseMapper()).selectJoinCount(wrapper); - } - - /** - * 连接查询返回一条记录 - */ - default DTO selectJoinOne(Class clazz, MPJBaseJoin wrapper) { - return ((MPJBaseMapper) getBaseMapper()).selectJoinOne(clazz, wrapper); - } - - /** - * 连接查询返回集合 - */ - default List selectJoinList(Class clazz, MPJBaseJoin wrapper) { - return ((MPJBaseMapper) getBaseMapper()).selectJoinList(clazz, wrapper); - } - - /** - * 连接查询返回集合并分页 - */ - default > P selectJoinListPage(P page, Class clazz, MPJBaseJoin wrapper) { - return ((MPJBaseMapper) getBaseMapper()).selectJoinPage(page, clazz, wrapper); - } - - /** - * 连接查询返回Map - */ - default Map selectJoinMap(MPJBaseJoin wrapper) { - return ((MPJBaseMapper) getBaseMapper()).selectJoinMap(wrapper); - } - - /** - * 连接查询返回Map集合 - */ - default List> selectJoinMaps(MPJBaseJoin wrapper) { - return ((MPJBaseMapper) getBaseMapper()).selectJoinMaps(wrapper); - } - - /** - * 连接查询返回Map集合并分页 - */ - default

>> P selectJoinMapsPage(P page, MPJBaseJoin wrapper) { - return ((MPJBaseMapper) getBaseMapper()).selectJoinMapsPage(page, wrapper); - } } diff --git a/pom.xml b/pom.xml index 754cf67..6861d92 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ - 1.5.0 + 1.5.1 3.5.8 17