From bd872f624a043b00af1124607929e04230dbd212 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期六, 27 七月 2024 23:57:13 +0800
Subject: [PATCH] fix 修复 代码生成 数据源切换问题
---
ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java | 25 ++++++++++---------------
1 files changed, 10 insertions(+), 15 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 48ae8b2..b4abc90 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
@@ -23,6 +23,7 @@
import org.apache.velocity.app.Velocity;
import org.dromara.common.core.constant.Constants;
import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.SpringUtils;
import org.dromara.common.core.utils.StreamUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.core.utils.file.FileUtils;
@@ -123,9 +124,6 @@
// 鑾峰彇鏌ヨ鏉′欢
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)) {
@@ -170,10 +168,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);
}
@@ -271,7 +269,7 @@
int row = baseMapper.insert(table);
if (row > 0) {
// 淇濆瓨鍒椾俊鎭�
- List<GenTableColumn> genTableColumns = selectDbTableColumnsByName(tableName, dataName);
+ List<GenTableColumn> genTableColumns = SpringUtils.getAopProxy(this).selectDbTableColumnsByName(tableName, dataName);
List<GenTableColumn> saveColumns = new ArrayList<>();
for (GenTableColumn column : genTableColumns) {
GenUtils.initColumnField(column, table);
@@ -295,12 +293,9 @@
* @return 鍒椾俊鎭�
*/
@DS("#dataName")
- private List<GenTableColumn> selectDbTableColumnsByName(String tableName, String dataName) {
- Table<?> table = ServiceProxy.metadata().table(tableName);
- if (Objects.isNull(table)) {
- return new ArrayList<>();
- }
- LinkedHashMap<String, Column> columns = table.getColumns();
+ @Override
+ public List<GenTableColumn> selectDbTableColumnsByName(String tableName, String dataName) {
+ LinkedHashMap<String, Column> columns = ServiceProxy.metadata().columns(tableName);
List<GenTableColumn> tableColumns = new ArrayList<>();
columns.forEach((columnName, column) -> {
GenTableColumn tableColumn = new GenTableColumn();
@@ -411,7 +406,7 @@
List<GenTableColumn> tableColumns = table.getColumns();
Map<String, GenTableColumn> tableColumnMap = StreamUtils.toIdentityMap(tableColumns, GenTableColumn::getColumnName);
- List<GenTableColumn> dbTableColumns = selectDbTableColumnsByName(table.getTableName(), table.getDataName());
+ List<GenTableColumn> dbTableColumns = SpringUtils.getAopProxy(this).selectDbTableColumnsByName(table.getTableName(), table.getDataName());
if (CollUtil.isEmpty(dbTableColumns)) {
throw new ServiceException("鍚屾鏁版嵁澶辫触锛屽師琛ㄧ粨鏋勪笉瀛樺湪");
}
--
Gitblit v1.9.3