diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractLambdaWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractLambdaWrapper.java index 743305f..374f93c 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractLambdaWrapper.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractLambdaWrapper.java @@ -332,8 +332,7 @@ public abstract class KtAbstractLambdaWrapper LogicInfoUtils.getLogicInfoNoAnd( wrapper.getIndex(), wrapper.getJoinClass(), wrapper.isHasAlias(), wrapper.getAlias() @@ -368,8 +367,7 @@ public abstract class KtAbstractLambdaWrapper clazz, String tableAlias, BiConsumer, Children> consumer) { Integer oldIndex = this.getIndex(); int newIndex = tableIndex; - TableInfo info = TableHelper.get(clazz); - Asserts.hasTable(info, clazz); + TableInfo info = TableHelper.getAssert(clazz); Children instance = instance(newIndex, keyWord, clazz, info.getTableName()); instance.isNo = true; instance.isMain = false; diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtDeleteJoinWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtDeleteJoinWrapper.java index 406d7cd..8721079 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtDeleteJoinWrapper.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtDeleteJoinWrapper.java @@ -5,10 +5,10 @@ import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments; import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.toolkit.*; import com.github.yulichang.adapter.AdapterHelper; -import com.github.yulichang.toolkit.Asserts; import com.github.yulichang.toolkit.LogicInfoUtils; import com.github.yulichang.toolkit.TableHelper; import com.github.yulichang.toolkit.TableList; +import com.github.yulichang.wrapper.interfaces.DeleteChain; import java.util.ArrayList; import java.util.Arrays; @@ -22,7 +22,7 @@ import java.util.stream.Collectors; * @since 1.4.5 */ @SuppressWarnings({"unused", "DuplicatedCode"}) -public class KtDeleteJoinWrapper extends KtAbstractLambdaWrapper> { +public class KtDeleteJoinWrapper extends KtAbstractLambdaWrapper> implements DeleteChain { /** * 删除表 @@ -166,21 +166,19 @@ public class KtDeleteJoinWrapper extends KtAbstractLambdaWrapper> classList) { Class entityClass = getEntityClass(); - TableInfo tableInfo = TableHelper.get(entityClass); - Asserts.hasTable(tableInfo, entityClass); + TableInfo tableInfo = TableHelper.getAssert(entityClass); //检查 boolean mainLogic = AdapterHelper.getTableInfoAdapter().mpjHasLogic(tableInfo); boolean check = classList.stream().allMatch(t -> { - TableInfo ti = TableHelper.get(t); - Asserts.hasTable(ti, t); + TableInfo ti = TableHelper.getAssert(t); return mainLogic == AdapterHelper.getTableInfoAdapter().mpjHasLogic(ti); }); if (!check) { throw ExceptionUtils.mpe("连表删除只适用于全部表(主表和副表)都是物理删除或全部都是逻辑删除, " + "不支持同时存在物理删除和逻辑删除 [物理删除->(%s)] [逻辑删除->(%s)]", - classList.stream().filter(t -> !AdapterHelper.getTableInfoAdapter().mpjHasLogic(TableHelper.get(t))) + classList.stream().filter(t -> !AdapterHelper.getTableInfoAdapter().mpjHasLogic(TableHelper.getAssert(t))) .map(Class::getSimpleName).collect(Collectors.joining(StringPool.COMMA)), - classList.stream().filter(t -> AdapterHelper.getTableInfoAdapter().mpjHasLogic(TableHelper.get(t))) + classList.stream().filter(t -> AdapterHelper.getTableInfoAdapter().mpjHasLogic(TableHelper.getAssert(t))) .map(Class::getSimpleName).collect(Collectors.joining(StringPool.COMMA))); } } diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtUpdateJoinWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtUpdateJoinWrapper.java index 54c96fd..d6ac0cf 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtUpdateJoinWrapper.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtUpdateJoinWrapper.java @@ -7,10 +7,10 @@ import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.toolkit.*; import com.github.yulichang.adapter.AdapterHelper; import com.github.yulichang.kt.interfaces.Update; -import com.github.yulichang.toolkit.Asserts; import com.github.yulichang.toolkit.KtUtils; import com.github.yulichang.toolkit.TableHelper; import com.github.yulichang.toolkit.TableList; +import com.github.yulichang.wrapper.interfaces.UpdateChain; import kotlin.reflect.KProperty; import lombok.AllArgsConstructor; import lombok.Data; @@ -29,7 +29,7 @@ import java.util.stream.Collectors; */ @SuppressWarnings({"unused", "DuplicatedCode"}) public class KtUpdateJoinWrapper extends KtAbstractLambdaWrapper> - implements Update> { + implements Update>, UpdateChain { /** * SQL 更新字段内容,例如:name='1', age=2 */ @@ -199,8 +199,7 @@ public class KtUpdateJoinWrapper extends KtAbstractLambdaWrapper entityList) { for (Object obj : entityList) { Assert.isTrue(tableList.contain(obj.getClass()), "更新的实体不是主表或关联表 <%>", obj.getClass().getSimpleName()); - TableInfo tableInfo = TableHelper.get(obj.getClass()); - Asserts.hasTable(tableInfo, obj.getClass()); + TableInfo tableInfo = TableHelper.getAssert(obj.getClass()); for (TableFieldInfo fieldInfo : tableInfo.getFieldList()) { if (AdapterHelper.getTableInfoAdapter().mpjHasLogic(tableInfo) && fieldInfo.isLogicDelete()) { continue; diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Query.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Query.java index 33729fe..7cd6bef 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Query.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Query.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.TableFieldInfo; import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.github.yulichang.kt.segments.FuncArgs; -import com.github.yulichang.toolkit.Asserts; import com.github.yulichang.toolkit.KtUtils; import com.github.yulichang.toolkit.MPJReflectionKit; import com.github.yulichang.toolkit.TableHelper; @@ -53,8 +52,7 @@ public interface Query extends Serializable { */ @Deprecated default Children select(Class entityClass, Predicate predicate) { - TableInfo info = TableHelper.get(entityClass); - Asserts.hasTable(info, entityClass); + TableInfo info = TableHelper.getAssert(entityClass); Map cacheMap = ColumnCache.getMapField(entityClass); info.getFieldList().stream().filter(predicate).collect(Collectors.toList()).forEach( i -> getSelectColum().add(new SelectNormal(cacheMap.get(i.getProperty()), getIndex(), isHasAlias(), getAlias()))); @@ -73,8 +71,7 @@ public interface Query extends Serializable { * @return children */ default Children selectFilter(Class entityClass, Predicate predicate) { - TableInfo info = TableHelper.get(entityClass); - Asserts.hasTable(info, entityClass); + TableInfo info = TableHelper.getAssert(entityClass); List cacheList = ColumnCache.getListField(entityClass); cacheList.stream().filter(predicate).collect(Collectors.toList()).forEach( i -> getSelectColum().add(new SelectNormal(i, getIndex(), isHasAlias(), getAlias()))); diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/resultmap/MybatisLabel.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/resultmap/MybatisLabel.java index e14fa9c..4674297 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/resultmap/MybatisLabel.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/resultmap/MybatisLabel.java @@ -3,7 +3,6 @@ package com.github.yulichang.kt.resultmap; import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; -import com.github.yulichang.toolkit.Asserts; import com.github.yulichang.toolkit.KtUtils; import com.github.yulichang.toolkit.MPJReflectionKit; import com.github.yulichang.toolkit.TableHelper; @@ -145,7 +144,7 @@ public class MybatisLabel implements Label { /** * 嵌套 */ - public Builder collection(String prefix, Class entityClass, KProperty func) { + public Builder collection(String prefix, Class entityClass, KProperty func) { String dtoFieldName = func.getName(); Map fieldMap = MPJReflectionKit.getFieldMap(KtUtils.ref(func)); FieldCache field = fieldMap.get(dtoFieldName); @@ -254,8 +253,7 @@ public class MybatisLabel implements Label { } private void autoBuild(boolean auto, Class entityClass, Class tagClass) { - TableInfo tableInfo = TableHelper.get(entityClass); - Asserts.hasTable(tableInfo, entityClass); + TableInfo tableInfo = TableHelper.getAssert(entityClass); Map tagMap = MPJReflectionKit.getFieldMap(tagClass); if (auto && !tagMap.isEmpty()) { List listField = ColumnCache.getListField(entityClass); diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJLambdaQueryWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJLambdaQueryWrapper.java index d03e725..dde0ee7 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJLambdaQueryWrapper.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJLambdaQueryWrapper.java @@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import com.github.yulichang.config.ConfigProperties; import com.github.yulichang.query.interfaces.CompareIfExists; import com.github.yulichang.query.interfaces.StringJoin; -import com.github.yulichang.toolkit.Asserts; import com.github.yulichang.toolkit.TableHelper; import com.github.yulichang.toolkit.ThrowOptional; import com.github.yulichang.wrapper.enums.IfExistsSqlKeyWordEnum; @@ -194,8 +193,7 @@ public class MPJLambdaQueryWrapper extends AbstractLambdaWrapper select(Class entityClass, Predicate predicate) { - TableInfo info = TableHelper.get(entityClass); - Asserts.hasTable(info, entityClass); + TableInfo info = TableHelper.getAssert(entityClass); selectColumns.addAll(info.getFieldList().stream().filter(predicate).map(c -> alias + StringPool.DOT + c.getColumn()).collect(Collectors.toList())); return typedThis; @@ -219,8 +217,7 @@ public class MPJLambdaQueryWrapper extends AbstractLambdaWrapper selectAll(Class clazz, String as) { - TableInfo info = TableHelper.get(clazz); - Asserts.hasTable(info, clazz); + TableInfo info = TableHelper.getAssert(clazz); if (info.havePK()) { selectColumns.add(as + StringPool.DOT + info.getKeyColumn()); } diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJQueryWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJQueryWrapper.java index 68c8df1..4f46924 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJQueryWrapper.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJQueryWrapper.java @@ -13,7 +13,6 @@ import com.github.yulichang.adapter.base.tookit.VersionUtils; import com.github.yulichang.config.ConfigProperties; import com.github.yulichang.query.interfaces.CompareIfExists; import com.github.yulichang.query.interfaces.StringJoin; -import com.github.yulichang.toolkit.Asserts; import com.github.yulichang.toolkit.MPJSqlInjectionUtils; import com.github.yulichang.toolkit.TableHelper; import com.github.yulichang.toolkit.ThrowOptional; @@ -215,8 +214,7 @@ public class MPJQueryWrapper extends AbstractWrapper select(Class entityClass, Predicate predicate) { - TableInfo info = TableHelper.get(entityClass); - Asserts.hasTable(info, entityClass); + TableInfo info = TableHelper.getAssert(entityClass); selectColumns.addAll(info.getFieldList().stream().filter(predicate).map(c -> alias + StringPool.DOT + c.getSqlSelect()).collect(Collectors.toList())); return typedThis; @@ -240,8 +238,7 @@ public class MPJQueryWrapper extends AbstractWrapper selectAll(Class clazz, String as) { - TableInfo info = TableHelper.get(clazz); - Asserts.hasTable(info, clazz); + TableInfo info = TableHelper.getAssert(clazz); if (ConfigProperties.tableInfoAdapter.mpjHasPK(info)) { selectColumns.add(as + StringPool.DOT + info.getKeySqlSelect()); } diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/KtWrapperUtils.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/KtWrapperUtils.java index 242fb92..d980af0 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/KtWrapperUtils.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/KtWrapperUtils.java @@ -20,8 +20,7 @@ import java.util.Optional; public class KtWrapperUtils { public static String buildSubSqlByWrapper(Class clazz, KtLambdaWrapper wrapper, String alias) { - TableInfo tableInfo = TableHelper.get(clazz); - Asserts.hasTable(tableInfo, clazz); + TableInfo tableInfo = TableHelper.getAssert(clazz); String first = Optional.ofNullable(wrapper.getSqlFirst()).orElse(StringPool.EMPTY); boolean hasWhere = false; String entityWhere = getEntitySql(tableInfo, wrapper); @@ -54,8 +53,7 @@ public class KtWrapperUtils { } public static String buildUnionSqlByWrapper(Class clazz, KtLambdaWrapper wrapper) { - TableInfo tableInfo = TableHelper.get(clazz); - Asserts.hasTable(tableInfo, clazz); + TableInfo tableInfo = TableHelper.getAssert(clazz); String first = Optional.ofNullable(wrapper.getSqlFirst()).orElse(StringPool.EMPTY); boolean hasWhere = false; String entityWhere = getEntitySql(tableInfo, wrapper); diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/LogicInfoUtils.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/LogicInfoUtils.java index ed2ff2e..d18849e 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/LogicInfoUtils.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/LogicInfoUtils.java @@ -53,8 +53,7 @@ public class LogicInfoUtils implements Constants { private static String getLogicStr(String prefix, Class clazz, boolean and, boolean invert) { String logicStr; - TableInfo tableInfo = TableHelper.get(clazz); - Asserts.hasTable(tableInfo, clazz); + TableInfo tableInfo = TableHelper.getAssert(clazz); TableFieldInfo logicField = ConfigProperties.tableInfoAdapter.mpjGetLogicField(tableInfo); if (ConfigProperties.tableInfoAdapter.mpjHasLogic(tableInfo) && Objects.nonNull(logicField)) { final String notDeleteValue = logicField.getLogicNotDeleteValue(); diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/TableHelper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/TableHelper.java index 5de0cfd..f856a5f 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/TableHelper.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/TableHelper.java @@ -63,4 +63,11 @@ public class TableHelper { return null; } } + + public static TableInfo getAssert(Class clazz) { + Objects.requireNonNull(clazz); + TableInfo tableInfo = get(clazz); + Asserts.hasTable(tableInfo, clazz); + return tableInfo; + } } diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/WrapperUtils.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/WrapperUtils.java index 7603cc6..910f0f2 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/WrapperUtils.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/WrapperUtils.java @@ -20,8 +20,7 @@ import java.util.Optional; public class WrapperUtils { public static String buildSubSqlByWrapper(Class clazz, MPJLambdaWrapper wrapper, String alias) { - TableInfo tableInfo = TableHelper.get(clazz); - Asserts.hasTable(tableInfo, clazz); + TableInfo tableInfo = TableHelper.getAssert(clazz); String first = Optional.ofNullable(wrapper.getSqlFirst()).orElse(StringPool.EMPTY); boolean hasWhere = false; String entityWhere = getEntitySql(tableInfo, wrapper); @@ -54,8 +53,7 @@ public class WrapperUtils { } public static String buildUnionSqlByWrapper(Class clazz, MPJLambdaWrapper wrapper) { - TableInfo tableInfo = TableHelper.get(clazz); - Asserts.hasTable(tableInfo, clazz); + TableInfo tableInfo = TableHelper.getAssert(clazz); String first = Optional.ofNullable(wrapper.getSqlFirst()).orElse(StringPool.EMPTY); boolean hasWhere = false; String entityWhere = getEntitySql(tableInfo, wrapper); diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/support/ColumnCache.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/support/ColumnCache.java index 214e037..9515c7e 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/support/ColumnCache.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/support/ColumnCache.java @@ -2,7 +2,6 @@ package com.github.yulichang.toolkit.support; import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.github.yulichang.config.ConfigProperties; -import com.github.yulichang.toolkit.Asserts; import com.github.yulichang.toolkit.FieldStringMap; import com.github.yulichang.toolkit.TableHelper; import com.github.yulichang.wrapper.segments.SelectCache; @@ -29,8 +28,7 @@ public class ColumnCache { public static List getListField(Class clazz) { return LIST_CACHE.computeIfAbsent(clazz, c -> { - TableInfo tableInfo = TableHelper.get(clazz); - Asserts.hasTable(tableInfo, c); + TableInfo tableInfo = TableHelper.getAssert(clazz); List list = new ArrayList<>(); if (ConfigProperties.tableInfoAdapter.mpjHasPK(tableInfo)) { list.add(new SelectCache(clazz, true, tableInfo.getKeyColumn(), tableInfo.getKeyType(), diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/DeleteJoinWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/DeleteJoinWrapper.java index 21e136b..bfbb174 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/DeleteJoinWrapper.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/DeleteJoinWrapper.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments; import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.toolkit.*; import com.github.yulichang.adapter.AdapterHelper; -import com.github.yulichang.toolkit.Asserts; import com.github.yulichang.toolkit.LogicInfoUtils; import com.github.yulichang.toolkit.TableHelper; import com.github.yulichang.toolkit.TableList; @@ -167,24 +166,22 @@ public class DeleteJoinWrapper extends JoinAbstractLambdaWrapper> classList) { Class entityClass = getEntityClass(); - TableInfo tableInfo = TableHelper.get(entityClass); - Asserts.hasTable(tableInfo, entityClass); + TableInfo tableInfo = TableHelper.getAssert(entityClass); //检查 boolean mainLogic = AdapterHelper.getTableInfoAdapter().mpjHasLogic(tableInfo); boolean check = classList.stream().allMatch(t -> { - TableInfo ti = TableHelper.get(t); - Asserts.hasTable(ti, t); + TableInfo ti = TableHelper.getAssert(t); return mainLogic == AdapterHelper.getTableInfoAdapter().mpjHasLogic(ti); }); if (!check) { throw ExceptionUtils.mpe("连表删除只适用于全部表(主表和副表)都是物理删除或全部都是逻辑删除, " + "不支持同时存在物理删除和逻辑删除 [物理删除->(%s)] [逻辑删除->(%s)]", - classList.stream().filter(t -> !AdapterHelper.getTableInfoAdapter().mpjHasLogic(TableHelper.get(t))) + classList.stream().filter(t -> !AdapterHelper.getTableInfoAdapter().mpjHasLogic(TableHelper.getAssert(t))) .map(Class::getSimpleName).collect(Collectors.joining(StringPool.COMMA)), - classList.stream().filter(t -> AdapterHelper.getTableInfoAdapter().mpjHasLogic(TableHelper.get(t))) + classList.stream().filter(t -> AdapterHelper.getTableInfoAdapter().mpjHasLogic(TableHelper.getAssert(t))) .map(Class::getSimpleName).collect(Collectors.joining(StringPool.COMMA))); } } diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/JoinAbstractLambdaWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/JoinAbstractLambdaWrapper.java index 66c6b7c..7df36fc 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/JoinAbstractLambdaWrapper.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/JoinAbstractLambdaWrapper.java @@ -374,8 +374,7 @@ public abstract class JoinAbstractLambdaWrapper w.contains(Constant.JOIN + StringPool.SPACE + tableName + StringPool.SPACE)) @@ -391,8 +390,7 @@ public abstract class JoinAbstractLambdaWrapper Children join(String keyWord, Class clazz, String tableAlias, BiConsumer, Children> consumer) { Integer oldIndex = this.getIndex(); int newIndex = tableIndex; - TableInfo info = TableHelper.get(clazz); - Asserts.hasTable(info, clazz); + TableInfo info = TableHelper.getAssert(clazz); Children instance = instance(newIndex, keyWord, clazz, info.getTableName()); instance.isOn = true; instance.isMain = false; diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/UpdateJoinWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/UpdateJoinWrapper.java index 478ddfc..1df4243 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/UpdateJoinWrapper.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/UpdateJoinWrapper.java @@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.toolkit.*; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import com.github.yulichang.adapter.AdapterHelper; -import com.github.yulichang.toolkit.Asserts; import com.github.yulichang.toolkit.LambdaUtils; import com.github.yulichang.toolkit.TableHelper; import com.github.yulichang.toolkit.TableList; @@ -198,11 +197,11 @@ public class UpdateJoinWrapper extends JoinAbstractLambdaWrapper entityList) { for (Object obj : entityList) { Assert.isTrue(tableList.contain(obj.getClass()), "更新的实体不是主表或关联表 <%>", obj.getClass().getSimpleName()); - TableInfo tableInfo = TableHelper.get(obj.getClass()); - Asserts.hasTable(tableInfo, obj.getClass()); + TableInfo tableInfo = TableHelper.getAssert(obj.getClass()); for (TableFieldInfo fieldInfo : tableInfo.getFieldList()) { if (AdapterHelper.getTableInfoAdapter().mpjHasLogic(tableInfo) && fieldInfo.isLogicDelete()) { continue; diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Query.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Query.java index 7c5381e..8a7e4dc 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Query.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Query.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; -import com.github.yulichang.toolkit.Asserts; import com.github.yulichang.toolkit.LambdaUtils; import com.github.yulichang.toolkit.MPJReflectionKit; import com.github.yulichang.toolkit.TableHelper; @@ -51,8 +50,7 @@ public interface Query extends Serializable { */ @Deprecated default Children select(Class entityClass, Predicate predicate) { - TableInfo info = TableHelper.get(entityClass); - Asserts.hasTable(info, entityClass); + TableInfo info = TableHelper.getAssert(entityClass); Map cacheMap = ColumnCache.getMapField(entityClass); info.getFieldList().stream().filter(predicate).collect(Collectors.toList()).forEach( i -> getSelectColum().add(new SelectNormal(cacheMap.get(i.getProperty()), getIndex(), isHasAlias(), getAlias()))); @@ -71,8 +69,7 @@ public interface Query extends Serializable { * @return children */ default Children selectFilter(Class entityClass, Predicate predicate) { - TableInfo info = TableHelper.get(entityClass); - Asserts.hasTable(info, entityClass); + TableInfo info = TableHelper.getAssert(entityClass); List cacheList = ColumnCache.getListField(entityClass); cacheList.stream().filter(predicate).collect(Collectors.toList()).forEach( i -> getSelectColum().add(new SelectNormal(i, getIndex(), isHasAlias(), getAlias()))); diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/resultmap/MybatisLabel.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/resultmap/MybatisLabel.java index f029fd1..0ab6ede 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/resultmap/MybatisLabel.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/resultmap/MybatisLabel.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; -import com.github.yulichang.toolkit.Asserts; import com.github.yulichang.toolkit.LambdaUtils; import com.github.yulichang.toolkit.MPJReflectionKit; import com.github.yulichang.toolkit.TableHelper; @@ -257,8 +256,7 @@ public class MybatisLabel implements Label { } private void autoBuild(boolean auto, Class entityClass, Class tagClass) { - TableInfo tableInfo = TableHelper.get(entityClass); - Asserts.hasTable(tableInfo, entityClass); + TableInfo tableInfo = TableHelper.getAssert(entityClass); Map tagMap = MPJReflectionKit.getFieldMap(tagClass); if (auto && !tagMap.isEmpty()) { List listField = ColumnCache.getListField(entityClass); diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/segments/SelectCache.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/segments/SelectCache.java index 9a8da43..6ed4942 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/segments/SelectCache.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/segments/SelectCache.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.TableFieldInfo; import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.github.yulichang.config.ConfigProperties; -import com.github.yulichang.toolkit.Asserts; import com.github.yulichang.toolkit.TableHelper; import lombok.Getter; import org.apache.ibatis.session.Configuration; @@ -84,8 +83,7 @@ public class SelectCache { } else { this.hasTypeHandle = this.tableFieldInfo.getTypeHandler() != null && tableFieldInfo.getTypeHandler() != UnknownTypeHandler.class; if (this.hasTypeHandle) { - TableInfo info = TableHelper.get(clazz); - Asserts.hasTable(info, clazz); + TableInfo info = TableHelper.getAssert(clazz); this.typeHandler = getTypeHandler(ConfigProperties.tableInfoAdapter.mpjGetConfiguration(info), tableFieldInfo); } else { this.typeHandler = null;