From 0a3d5fd5d47e90333de9ff316641e50d43e87b68 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 23 七月 2024 17:05:46 +0800
Subject: [PATCH] update 优化 代码生成分页实现 避免数据误传等问题
---
ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java
index b2c0cba..cf9d2d0 100644
--- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java
+++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java
@@ -123,17 +123,27 @@
// 鑾峰彇鏌ヨ鏉′欢
String tableName = genTable.getTableName();
String tableComment = genTable.getTableComment();
- // 鑾峰彇鍒嗛〉鍙傛暟
- Integer pageNum = pageQuery.getPageNum();
- Integer pageSize = pageQuery.getPageSize();
LinkedHashMap<String, Table<?>> tablesMap = ServiceProxy.metadata().tables();
if (CollUtil.isEmpty(tablesMap)) {
return TableDataInfo.build();
}
+ List<String> tableNames = baseMapper.selectTableNameList(genTable.getDataName());
+ String[] tableArrays;
+ if (CollUtil.isNotEmpty(tableNames)) {
+ tableArrays = tableNames.toArray(new String[0]);
+ } else {
+ tableArrays = new String[0];
+ }
// 杩囨护骞惰浆鎹㈣〃鏍兼暟鎹�
List<GenTable> tables = tablesMap.values().stream()
.filter(x -> !StringUtils.containsAnyIgnoreCase(x.getName(), TABLE_IGNORE))
+ .filter(x -> {
+ if (CollUtil.isEmpty(tableNames)) {
+ return true;
+ }
+ return !StringUtils.containsAnyIgnoreCase(x.getName(), tableArrays);
+ })
.filter(x -> {
boolean nameMatches = true;
boolean commentMatches = true;
@@ -157,10 +167,10 @@
return gen;
}).toList();
- // 鍒涘缓鍒嗛〉瀵硅薄锛屽苟璁剧疆鎬昏褰曟暟
- IPage<GenTable> page = new Page<>(pageNum, pageSize, tables.size());
- // 浣跨敤CollUtil杩涜鍒嗛〉锛屽苟璁剧疆鍒嗛〉璁板綍
- page.setRecords(CollUtil.page(pageNum - 1, pageSize, tables));
+ IPage<GenTable> page = pageQuery.build();
+ page.setTotal(tables.size());
+ // 鎵嬪姩鍒嗛〉 set鏁版嵁
+ page.setRecords(CollUtil.page((int) page.getCurrent() - 1, (int) page.getSize(), tables));
return TableDataInfo.build(page);
}
--
Gitblit v1.9.3