diff --git a/MAPPING.md b/MAPPING.md index 110500c..c3cb4b1 100644 --- a/MAPPING.md +++ b/MAPPING.md @@ -63,7 +63,7 @@ public class UserDO { /** * 一对一,一对多关系映射查询 * 如果不需要关系映射就使用mybatis plus原生方法即可,比如 getById listByIds 等 - * + *

* 注意:关系映射不会去关联查询,而是执行多次单表查询(对结果汇总后使用in语句查询,再对结果进行匹配) */ @SpringBootTest @@ -90,9 +90,9 @@ class MappingTest { result.getRecords().forEach(System.out::println); } - /** - * 更多方法请查阅 MPJDeepMapper 或者 MPJDeepService - * 使用方式与 mybatis plus 一致 + /* + 更多方法请查阅 MPJDeepMapper 或者 MPJDeepService + 使用方式与 mybatis plus 一致 */ } ``` diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/base/mapper/MPJJoinMapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/base/mapper/MPJJoinMapper.java index 0a21c2c..9a59afe 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/base/mapper/MPJJoinMapper.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/base/mapper/MPJJoinMapper.java @@ -2,12 +2,9 @@ package com.github.yulichang.base.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Assert; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.github.yulichang.interfaces.MPJBaseJoin; import com.github.yulichang.toolkit.Constant; -import com.github.yulichang.wrapper.DeleteJoinWrapper; -import com.github.yulichang.wrapper.UpdateJoinWrapper; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/injector/MPJSqlInjector.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/injector/MPJSqlInjector.java index 65a61e6..93c33e1 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/injector/MPJSqlInjector.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/injector/MPJSqlInjector.java @@ -9,7 +9,6 @@ import com.baomidou.mybatisplus.core.injector.methods.*; import com.baomidou.mybatisplus.core.mapper.Mapper; import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.toolkit.ArrayUtils; -import com.baomidou.mybatisplus.core.toolkit.Assert; import com.baomidou.mybatisplus.core.toolkit.ClassUtils; import com.baomidou.mybatisplus.core.toolkit.ExceptionUtils; import com.github.yulichang.adapter.v3431.AbstractMethodV3431; diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/JoinWrappers.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/JoinWrappers.java index cd6c695..5ed7ff1 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/JoinWrappers.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/JoinWrappers.java @@ -58,7 +58,7 @@ public class JoinWrappers { * JoinWrappers.lambda("t", User.class) */ public static MPJLambdaWrapper lambda(String alias, Class clazz) { - return new MPJLambdaWrapper(clazz, alias); + return new MPJLambdaWrapper<>(clazz, alias); } /** @@ -72,7 +72,7 @@ public class JoinWrappers { * JoinWrappers.lambda("t", user) */ public static MPJLambdaWrapper lambda(String alias, T entity) { - return new MPJLambdaWrapper(entity, alias); + return new MPJLambdaWrapper<>(entity, alias); } /** @@ -82,6 +82,13 @@ public class JoinWrappers { return new DeleteJoinWrapper<>(clazz); } + /** + * JoinWrappers.delete(User.class) + */ + public static DeleteJoinWrapper delete(String alias, Class clazz) { + return new DeleteJoinWrapper<>(clazz, alias); + } + /** * JoinWrappers.update(User.class) */ diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java index 6b0a64a..9b90b0f 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java @@ -2,15 +2,14 @@ package com.github.yulichang.wrapper; import com.baomidou.mybatisplus.core.conditions.SharedString; import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments; -import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.toolkit.ArrayUtils; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; -import com.github.yulichang.config.ConfigProperties; -import com.github.yulichang.config.enums.LogicDelTypeEnum; -import com.github.yulichang.toolkit.*; +import com.github.yulichang.toolkit.Constant; +import com.github.yulichang.toolkit.LambdaUtils; +import com.github.yulichang.toolkit.TableList; import com.github.yulichang.toolkit.support.ColumnCache; import com.github.yulichang.wrapper.interfaces.Chain; import com.github.yulichang.wrapper.interfaces.Query; @@ -25,8 +24,6 @@ import java.util.*; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; -import static com.baomidou.mybatisplus.core.enums.WrapperKeyword.APPLY; - /** * 参考 {@link com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper} * Lambda 语法使用 Wrapper diff --git a/mybatis-plus-join-test/test-base/src/main/java/com/github/yulichang/test/config/MybatisPlusConfig.java b/mybatis-plus-join-test/test-base/src/main/java/com/github/yulichang/test/config/MybatisPlusConfig.java index 3335def..a0c2f95 100644 --- a/mybatis-plus-join-test/test-base/src/main/java/com/github/yulichang/test/config/MybatisPlusConfig.java +++ b/mybatis-plus-join-test/test-base/src/main/java/com/github/yulichang/test/config/MybatisPlusConfig.java @@ -55,6 +55,7 @@ public class MybatisPlusConfig { public ISqlInjector sqlInjector() { return new MPJSqlInjector() { @Override + @SuppressWarnings("deprecation") public List getMethodList(Class mapperClass) { List list = super.getMethodList(mapperClass); //添加你的方法 diff --git a/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/entity/OrderDO.java b/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/entity/OrderDO.java index 541e584..3c7f5b4 100644 --- a/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/entity/OrderDO.java +++ b/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/entity/OrderDO.java @@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.ToString; import lombok.experimental.Accessors; -import org.springframework.core.annotation.Order; import java.io.Serializable; diff --git a/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/mapper/OrderMapper.java b/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/mapper/OrderMapper.java index 53fd2e3..d370076 100644 --- a/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/mapper/OrderMapper.java +++ b/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/mapper/OrderMapper.java @@ -1,7 +1,6 @@ package com.github.yulichang.test.join.mapper; import com.github.yulichang.test.join.entity.OrderDO; -import com.github.yulichang.test.join.entity.UserDO; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/mybatis-plus-join-test/test-springboot3-jdk17/src/test/java/com/yulichang/test/springboot3jdk17/LambdaWrapperTest.java b/mybatis-plus-join-test/test-springboot3-jdk17/src/test/java/com/yulichang/test/springboot3jdk17/LambdaWrapperTest.java index 97ea155..9ae9061 100644 --- a/mybatis-plus-join-test/test-springboot3-jdk17/src/test/java/com/yulichang/test/springboot3jdk17/LambdaWrapperTest.java +++ b/mybatis-plus-join-test/test-springboot3-jdk17/src/test/java/com/yulichang/test/springboot3jdk17/LambdaWrapperTest.java @@ -638,6 +638,7 @@ class LambdaWrapperTest { * 忽略个别查询字段 */ @Test + @SuppressWarnings("deprecation") void test6() { MPJLambdaWrapper wrapper = new MPJLambdaWrapper() .selectAll(UserDO.class)