From 57ec2a5e1e4d773b90836755dac898e470494008 Mon Sep 17 00:00:00 2001 From: qraddx Date: Tue, 25 Jan 2022 18:26:23 +0800 Subject: [PATCH] =?UTF-8?q?:arrow=5Fup:=20Upgrading=20dependencies.=20clos?= =?UTF-8?q?e=20#3547=20up=20mybatis-plus=20=E5=8D=87=E7=BA=A7=E5=88=B03.5.?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit :arrow_up: Upgrading dependencies. close #3547 up mybatis-plus 升级到3.5.1 --- pigx-common/pigx-common-bom/pom.xml | 2 +- .../pigx/common/data/datascope/DataScopeSqlInjector.java | 5 +++-- .../com/pig4cloud/pigx/codegen/mapper/GeneratorMapper.java | 6 ++++++ .../codegen/service/impl/GenTableColumnServiceImpl.java | 3 +++ .../pigx/codegen/service/impl/GeneratorServiceImpl.java | 3 +++ 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml index a1998f593..e5866cc29 100644 --- a/pigx-common/pigx-common-bom/pom.xml +++ b/pigx-common/pigx-common-bom/pom.xml @@ -18,7 +18,7 @@ 4.3.0-SNAPSHOT - 3.4.3 + 3.5.1 3.4.1 1.2.8 8.0.27 diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScopeSqlInjector.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScopeSqlInjector.java index 58a44aeb7..c4c2eeb8f 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScopeSqlInjector.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScopeSqlInjector.java @@ -2,6 +2,7 @@ package com.pig4cloud.pigx.common.data.datascope; import com.baomidou.mybatisplus.core.injector.AbstractMethod; import com.baomidou.mybatisplus.core.injector.DefaultSqlInjector; +import com.baomidou.mybatisplus.core.metadata.TableInfo; import java.util.List; @@ -14,8 +15,8 @@ import java.util.List; public class DataScopeSqlInjector extends DefaultSqlInjector { @Override - public List getMethodList(Class mapperClass) { - List methodList = super.getMethodList(mapperClass); + public List getMethodList(Class mapperClass, TableInfo tableInfo) { + List methodList = super.getMethodList(mapperClass, tableInfo); methodList.add(new SelectListByScope()); methodList.add(new SelectPageByScope()); methodList.add(new SelectCountByScope()); diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/mapper/GeneratorMapper.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/mapper/GeneratorMapper.java index f108c682f..331a03b97 100755 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/mapper/GeneratorMapper.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/mapper/GeneratorMapper.java @@ -18,6 +18,7 @@ package com.pig4cloud.pigx.codegen.mapper; import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.codegen.entity.ColumnEntity; @@ -41,6 +42,7 @@ public interface GeneratorMapper extends PigxBaseMapper { * @param tableName 表名称 * @return */ + @InterceptorIgnore(tenantLine = "true") IPage> queryTable(Page page, @Param("tableName") String tableName); /** @@ -50,6 +52,7 @@ public interface GeneratorMapper extends PigxBaseMapper { * @return */ @DS("#last") + @InterceptorIgnore(tenantLine = "true") Map queryTable(@Param("tableName") String tableName, String dsName); /** @@ -60,6 +63,7 @@ public interface GeneratorMapper extends PigxBaseMapper { * @return */ @DS("#last") + @InterceptorIgnore(tenantLine = "true") IPage selectTableColumn(Page page, @Param("tableName") String tableName, @Param("dsName") String dsName); @@ -70,6 +74,7 @@ public interface GeneratorMapper extends PigxBaseMapper { * @return */ @DS("#last") + @InterceptorIgnore(tenantLine = "true") List selectTableColumn(@Param("tableName") String tableName, @Param("dsName") String dsName); /** @@ -79,6 +84,7 @@ public interface GeneratorMapper extends PigxBaseMapper { * @return */ @DS("#last") + @InterceptorIgnore(tenantLine = "true") List> selectMapTableColumn(@Param("tableName") String tableName, String dsName); } diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenTableColumnServiceImpl.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenTableColumnServiceImpl.java index 5b2c302e0..8bfa644ef 100644 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenTableColumnServiceImpl.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenTableColumnServiceImpl.java @@ -26,6 +26,9 @@ public class GenTableColumnServiceImpl implements GenTableColumnService { @Override public IPage listTable(Page page, GenConfig genConfig) { GeneratorMapper mapper = GenUtils.getMapper(genConfig.getDsName()); + + // 关闭sql 优化 + page.setOptimizeCountSql(false); IPage columnPage = mapper.selectTableColumn(page, genConfig.getTableName(), genConfig.getDsName()); diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GeneratorServiceImpl.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GeneratorServiceImpl.java index b9b3d0f3d..b0512d1aa 100755 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GeneratorServiceImpl.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GeneratorServiceImpl.java @@ -62,6 +62,9 @@ public class GeneratorServiceImpl implements GeneratorService { GeneratorMapper mapper = GenUtils.getMapper(dsName); // 手动切换数据源 DynamicDataSourceContextHolder.push(dsName); + + // 关闭SQL 优化 + page.setOptimizeCountSql(false); return mapper.queryTable(page, tableName); }