diff --git a/README.md b/README.md
index 135e4df..d759206 100644
--- a/README.md
+++ b/README.md
@@ -16,11 +16,11 @@
com.github.yulichang
mybatis-plus-join
- 1.0.6
+ 1.0.7
```
-2. 配置插件,添加MyJoinInterceptor
+2. 配置插件,添加MPJInterceptor
```java
@Configuration
@@ -34,20 +34,19 @@
//分页插件
interceptor.addInnerInterceptor(new PaginationInnerInterceptor());
//连表插件
- interceptor.addInnerInterceptor(new MyJoinInterceptor());
- //可以添加多租户或其他插件
- return mybatisPlusInterceptor;
+ interceptor.addInnerInterceptor(new MPJInterceptor());
+ return interceptor;
}
}
```
### 使用
-* mapper继承MyBaseMapper (必选)
-* service继承MyBaseService (可选)
-* serviceImpl继承MyBaseServiceImpl (可选)
+* mapper继承MPJBaseMapper (必选)
+* service继承MPJBaseService (可选)
+* serviceImpl继承MPJBaseServiceImpl (可选)
-1. MyBaseMapper继承BaseMapper,在原有的方法基础上又添加了以下方法:
+1. MPJBaseMapper继承BaseMapper,在原有的方法基础上又添加了以下方法:
* selectJoinOne 连表查询一条记录对象
* selectJoinList 连表查询返回命中记录对象集合
* selectJoinPage 连表分页查询对象集合
@@ -55,13 +54,13 @@
* selectJoinMaps 连表查询返回命中记录Map集合
* selectJoinMapsPage 连表分页查询返回Map集合
-2. MyBaseService 继承了IService,同样添加以上方法
+2. MPJBaseService 继承了IService,同样添加以上方法
-3. MyBaseServiceImpl 继承了ServiceImpl,同样添加了以上方法
+3. MPJBaseServiceImpl 继承了ServiceImpl,同样添加了以上方法
-## 核心类 MyQueryWrapper, MyLambdaQueryWrapper和MyJoinLambdaQueryWrapper
+## 核心类 MPJQueryWrapper,MPJLambdaQueryWrapper和MPJJoinLambdaQueryWrapper
-|-|MyQueryWrapper|MyLambdaQueryWrapper|MyJoinLambdaQueryWrapper|
+|-|MPJQueryWrapper|MPJLambdaQueryWrapper|MPJJoinLambdaQueryWrapper|
|---|---|---|---|
|select(String)|支持|**支持**|不支持|
|select(lambda)|不支持|仅支持主表lambda|所有表lambda|
@@ -70,14 +69,14 @@
|条件String|支持|不支持|不支持|
|条件lambda|不支持|仅支持主表lambda|所有表lambda|
-MyQueryWrapper相当于mp的QueryWrapper
-MyLambdaQueryWrapper相当于mp的LambdaQueryWrapper
+MPJQueryWrapper相当于mp的QueryWrapper
+MPJLambdaQueryWrapper相当于mp的LambdaQueryWrapper
两者可以无缝切换
-MyQueryWrapper.lambda() ===> MyLambdaQueryWrapper
-MyLambdaQueryWrapper.stringQuery() ===> MyQueryWrapper
+MPJQueryWrapper.lambda() ===> MPJLambdaQueryWrapper
+MPJLambdaQueryWrapper.stringQuery() ===> MPJQueryWrapper
-## MyQueryWrapper和MyLambdaQueryWrapper
+## MPJQueryWrapper和MPJLambdaQueryWrapper
### 简单的3表查询
@@ -88,7 +87,7 @@ class test {
void testJoin() {
List list = userMapper.selectJoinList(UserDTO.class,
- new MyLambdaQueryWrapper()
+ new MPJLambdaQueryWrapper()
.selectAll(UserDO.class)
.select("addr.tel", "addr.address", "a.province")
.leftJoin("user_address addr on t.id = addr.user_id")
@@ -144,7 +143,7 @@ class test {
void testJoin() {
IPage page = userMapper.selectJoinPage(new Page<>(1, 10), UserDTO.class,
- new MyLambdaQueryWrapper()
+ new MPJLambdaQueryWrapper()
.selectAll(UserDO.class)
.select("addr.tel", "addr.address")
.select("a.province")
@@ -181,7 +180,7 @@ class test {
void testJoin() {
List list = userMapper.selectJoinList(UserDTO.class,
- new MyLambdaQueryWrapper()
+ new MPJLambdaQueryWrapper()
.selectAll(UserDO.class)
.select("addr.tel", "addr.address")
//行列转换
@@ -224,13 +223,13 @@ ORDER BY
addr.id DESC
```
-## MyJoinLambdaQueryWrapper用法
+## MPJJoinLambdaQueryWrapper用法
-MyJoinLambdaQueryWrapper与上面连个Wrapper不同,是一套新的支持多表的wrapper
-MyQueryWrapper是基于QueryWrapper扩展的 MyLambdaQueryWrapper是基于LambdaQueryWrapper扩展的
+MPJJoinLambdaQueryWrapper与上面连个Wrapper不同,是一套新的支持多表的wrapper
+MPJQueryWrapper是基于QueryWrapper扩展的MPJLambdaQueryWrapper是基于LambdaQueryWrapper扩展的
而LambdaQueryWrapper由于泛型约束,不支持扩展成多表的lambdaWrapper
-#### MyJoinLambdaQueryWrapper示例
+#### MPJJoinLambdaQueryWrapper示例
#### 简单的3表查询
@@ -241,7 +240,7 @@ class test {
void testJoin() {
List list = userMapper.selectJoinList(UserDTO.class,
- new MyJoinLambdaQueryWrapper()
+ new MPJJoinLambdaQueryWrapper()
.selectAll(UserDO.class)
.select(UserAddressDO::getTel)
.selectAs(UserAddressDO::getAddress, UserDTO::getUserAddress)
@@ -299,7 +298,7 @@ class test {
void testJoin() {
IPage iPage = userMapper.selectJoinPage(new Page<>(2, 10), UserDTO.class,
- new MyJoinLambdaQueryWrapper()
+ new MPJJoinLambdaQueryWrapper()
.selectAll(UserDO.class)
.select(UserAddressDO::getTel)
.selectAs(UserAddressDO::getAddress, UserDTO::getUserAddress)
diff --git a/ossrh.xml b/ossrh.xml
new file mode 100644
index 0000000..6c44710
--- /dev/null
+++ b/ossrh.xml
@@ -0,0 +1,140 @@
+
+
+
+ org.apache.maven.plugins
+ maven-source-plugin
+ 2.2.1
+
+
+ attach-sources
+
+ jar-no-fork
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+ 2.9.1
+
+
+ attach-javadocs
+
+ jar
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-gpg-plugin
+ 1.5
+
+
+ sign-artifacts
+ verify
+
+ sign
+
+
+
+
+
+
+ org.sonatype.plugins
+ nexus-staging-maven-plugin
+ 1.6.8
+ true
+
+ ossrh
+ https://oss.sonatype.org/
+
+ 30
+
+
+
+
+
+
+ disable-javadoc-doclint
+
+ [1.8,)
+
+
+ -Xdoclint:none
+
+
+
+ release
+
+
+
+ org.apache.maven.plugins
+ maven-source-plugin
+ 2.2.1
+
+
+ attach-sources
+
+ jar-no-fork
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+ 2.9.1
+
+
+ attach-javadocs
+
+ jar
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-gpg-plugin
+ 1.5
+
+
+ sign-artifacts
+ verify
+
+ sign
+
+
+
+
+
+
+ org.sonatype.plugins
+ nexus-staging-maven-plugin
+ 1.6.7
+ true
+
+ ossrh
+ https://oss.sonatype.org/
+
+ 30
+
+
+
+
+
+
+
+
+ ossrh
+ https://oss.sonatype.org/content/repositories/snapshots
+
+
+ ossrh
+ https://oss.sonatype.org/service/local/staging/deploy/maven2/
+
+
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index c50d023..5079ccc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,8 +4,8 @@
4.0.0
com.github.yulichang
mybatis-plus-join
- 1.0.7-SNAPSHOT
- mp
+ 1.0.7
+ mybatis-plus-join
An enhanced toolkit of Mybatis-Plus to simplify development.
https://github.com/yulichang/mybatis-plus-join
@@ -42,147 +42,4 @@
compile
-
-
-
-
- org.apache.maven.plugins
- maven-source-plugin
- 2.2.1
-
-
- attach-sources
-
- jar-no-fork
-
-
-
-
-
- org.apache.maven.plugins
- maven-javadoc-plugin
- 2.9.1
-
-
- attach-javadocs
-
- jar
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-gpg-plugin
- 1.5
-
-
- sign-artifacts
- verify
-
- sign
-
-
-
-
-
-
- org.sonatype.plugins
- nexus-staging-maven-plugin
- 1.6.8
- true
-
- ossrh
- https://oss.sonatype.org/
-
- 30
-
-
-
-
-
-
-
- disable-javadoc-doclint
-
- [1.8,)
-
-
- -Xdoclint:none
-
-
-
- release
-
-
-
- org.apache.maven.plugins
- maven-source-plugin
- 2.2.1
-
-
- attach-sources
-
- jar-no-fork
-
-
-
-
-
- org.apache.maven.plugins
- maven-javadoc-plugin
- 2.9.1
-
-
- attach-javadocs
-
- jar
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-gpg-plugin
- 1.5
-
-
- sign-artifacts
- verify
-
- sign
-
-
-
-
-
-
- org.sonatype.plugins
- nexus-staging-maven-plugin
- 1.6.7
- true
-
- ossrh
- https://oss.sonatype.org/
-
- 30
-
-
-
-
-
-
-
-
-
- ossrh
- https://oss.sonatype.org/content/repositories/snapshots
-
-
- ossrh
- https://oss.sonatype.org/service/local/staging/deploy/maven2/
-
-
diff --git a/src/main/java/com/github/yulichang/MybatisPlusConfiguration.java b/src/main/java/com/github/yulichang/MybatisPlusConfiguration.java
index 6ab3eb9..767b0b8 100644
--- a/src/main/java/com/github/yulichang/MybatisPlusConfiguration.java
+++ b/src/main/java/com/github/yulichang/MybatisPlusConfiguration.java
@@ -1,6 +1,6 @@
package com.github.yulichang;
-import com.github.yulichang.injector.MySqlInjector;
+import com.github.yulichang.injector.MPJSqlInjector;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -12,9 +12,9 @@ import org.springframework.context.annotation.Configuration;
public class MybatisPlusConfiguration {
@Bean
- @ConditionalOnMissingBean(MySqlInjector.class)
- public MySqlInjector mySqlInjector() {
- return new MySqlInjector();
+ @ConditionalOnMissingBean(MPJSqlInjector.class)
+ public MPJSqlInjector mySqlInjector() {
+ return new MPJSqlInjector();
}
}
diff --git a/src/main/java/com/github/yulichang/base/MyBaseMapper.java b/src/main/java/com/github/yulichang/base/MPJBaseMapper.java
similarity index 81%
rename from src/main/java/com/github/yulichang/base/MyBaseMapper.java
rename to src/main/java/com/github/yulichang/base/MPJBaseMapper.java
index a5a0d92..cd029c8 100644
--- a/src/main/java/com/github/yulichang/base/MyBaseMapper.java
+++ b/src/main/java/com/github/yulichang/base/MPJBaseMapper.java
@@ -3,7 +3,7 @@ package com.github.yulichang.base;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.github.yulichang.interfaces.BaseJoin;
+import com.github.yulichang.interfaces.MPJBaseJoin;
import com.github.yulichang.toolkit.Constant;
import org.apache.ibatis.annotations.Param;
@@ -14,7 +14,7 @@ import java.util.Map;
* @author yulichang
* @see BaseMapper
*/
-public interface MyBaseMapper extends BaseMapper {
+public interface MPJBaseMapper extends BaseMapper {
/**
* 连表查询返回一条记录
@@ -23,14 +23,14 @@ public interface MyBaseMapper extends BaseMapper {
* @param clazz resultType
*/
DTO selectJoinOne(@Param(Constant.CLAZZ) Class clazz,
- @Param(Constants.WRAPPER) BaseJoin myWrapper);
+ @Param(Constants.WRAPPER) MPJBaseJoin myWrapper);
/**
* 连表查询返回Map
*
* @param myWrapper joinWrapper
*/
- Map selectJoinMap(@Param(Constants.WRAPPER) BaseJoin myWrapper);
+ Map selectJoinMap(@Param(Constants.WRAPPER) MPJBaseJoin myWrapper);
/**
* 连表查询返回记录集合
@@ -39,14 +39,14 @@ public interface MyBaseMapper extends BaseMapper {
* @param clazz resultType
*/
List selectJoinList(@Param(Constant.CLAZZ) Class clazz,
- @Param(Constants.WRAPPER) BaseJoin myWrapper);
+ @Param(Constants.WRAPPER) MPJBaseJoin myWrapper);
/**
* 连表查询返回Map集合
*
* @param myWrapper joinWrapper
*/
- List
*/
@Override
- protected MyJoinLambdaQueryWrapper instance() {
- return new MyJoinLambdaQueryWrapper<>(getEntity(), getEntityClass(), null, paramNameSeq, paramNameValuePairs,
+ protected MPJJoinLambdaQueryWrapper instance() {
+ return new MPJJoinLambdaQueryWrapper<>(getEntity(), getEntityClass(), null, paramNameSeq, paramNameValuePairs,
new MergeSegments(), SharedString.emptyString(), SharedString.emptyString(), SharedString.emptyString());
}
@@ -197,7 +197,7 @@ public class MyJoinLambdaQueryWrapper extends MyAbstractLambdaWrapper MyJoinLambdaQueryWrapper join(String keyWord, boolean condition, Class clazz, SFunction left, SFunction right) {
+ public MPJJoinLambdaQueryWrapper join(String keyWord, boolean condition, Class clazz, SFunction left, SFunction right) {
if (condition) {
subTable.put(clazz, tableIndex);
TableInfo leftInfo = TableInfoHelper.getTableInfo(clazz);
@@ -212,12 +212,12 @@ public class MyJoinLambdaQueryWrapper extends MyAbstractLambdaWrapper extends Serializable {
+public interface Compare extends Serializable {
/**
* ignore
diff --git a/src/main/java/com/github/yulichang/wrapper/interfaces/MyFunc.java b/src/main/java/com/github/yulichang/wrapper/interfaces/Func.java
similarity index 99%
rename from src/main/java/com/github/yulichang/wrapper/interfaces/MyFunc.java
rename to src/main/java/com/github/yulichang/wrapper/interfaces/Func.java
index c697ba3..6e6c4f5 100644
--- a/src/main/java/com/github/yulichang/wrapper/interfaces/MyFunc.java
+++ b/src/main/java/com/github/yulichang/wrapper/interfaces/Func.java
@@ -14,7 +14,7 @@ import static java.util.stream.Collectors.toList;
* copy {@link com.baomidou.mybatisplus.core.conditions.interfaces.Func}
*/
@SuppressWarnings("unchecked")
-public interface MyFunc extends Serializable {
+public interface Func extends Serializable {
/**
* ignore
diff --git a/src/main/java/com/github/yulichang/wrapper/interfaces/MyLambdaJoin.java b/src/main/java/com/github/yulichang/wrapper/interfaces/LambdaJoin.java
similarity index 92%
rename from src/main/java/com/github/yulichang/wrapper/interfaces/MyLambdaJoin.java
rename to src/main/java/com/github/yulichang/wrapper/interfaces/LambdaJoin.java
index 3216b56..b6c4ed3 100644
--- a/src/main/java/com/github/yulichang/wrapper/interfaces/MyLambdaJoin.java
+++ b/src/main/java/com/github/yulichang/wrapper/interfaces/LambdaJoin.java
@@ -1,13 +1,13 @@
package com.github.yulichang.wrapper.interfaces;
import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
-import com.github.yulichang.interfaces.BaseJoin;
+import com.github.yulichang.interfaces.MPJBaseJoin;
import com.github.yulichang.toolkit.Constant;
/**
* @author yulichang
*/
-public interface MyLambdaJoin extends BaseJoin {
+public interface LambdaJoin extends MPJBaseJoin {
default Children leftJoin(Class clazz, SFunction left, SFunction right) {
return leftJoin(true, clazz, left, right);
diff --git a/src/main/java/com/github/yulichang/wrapper/interfaces/MySFunctionQuery.java b/src/main/java/com/github/yulichang/wrapper/interfaces/SFunctionQuery.java
similarity index 95%
rename from src/main/java/com/github/yulichang/wrapper/interfaces/MySFunctionQuery.java
rename to src/main/java/com/github/yulichang/wrapper/interfaces/SFunctionQuery.java
index e303d2f..dd0c131 100644
--- a/src/main/java/com/github/yulichang/wrapper/interfaces/MySFunctionQuery.java
+++ b/src/main/java/com/github/yulichang/wrapper/interfaces/SFunctionQuery.java
@@ -9,7 +9,7 @@ import java.util.function.Predicate;
/**
* copy {@link com.baomidou.mybatisplus.core.conditions.query.Query}
*/
-public interface MySFunctionQuery extends Serializable {
+public interface SFunctionQuery extends Serializable {
/**
* 设置查询字段