From 84f553a911a1812a494cbac73ac0fc22d067fdb1 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 23 七月 2024 10:06:15 +0800
Subject: [PATCH] fix 修复 代码生成 报错与警告
---
ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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 b8aff31..744d0ac 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
@@ -125,7 +125,7 @@
Integer pageNum = pageQuery.getPageNum();
Integer pageSize = pageQuery.getPageSize();
- LinkedHashMap<String, Table> tablesMap = ServiceProxy.metadata().tables();
+ LinkedHashMap<String, Table<?>> tablesMap = ServiceProxy.metadata().tables();
if (CollUtil.isEmpty(tablesMap)) {
return TableDataInfo.build();
}
@@ -172,13 +172,13 @@
@Override
public List<GenTable> selectDbTableListByNames(String[] tableNames, String dataName) {
Set<String> tableNameSet = new HashSet<>(List.of(tableNames));
- LinkedHashMap<String, Table> tablesMap = ServiceProxy.metadata().tables();
+ LinkedHashMap<String, Table<?>> tablesMap = ServiceProxy.metadata().tables();
if (CollUtil.isEmpty(tablesMap)) {
return new ArrayList<>();
}
- List<Table> tableList = tablesMap.values().stream()
+ List<Table<?>> tableList = tablesMap.values().stream()
.filter(x -> tableNameSet.contains(x.getName())).toList();
if (ArrayUtil.isEmpty(tableList)) {
@@ -279,7 +279,11 @@
*/
@DS("#dataName")
private List<GenTableColumn> selectDbTableColumnsByName(String tableName, String dataName) {
- LinkedHashMap<String, Column> columns = ServiceProxy.service().metadata().table(tableName).getColumns();
+ Table<?> table = ServiceProxy.metadata().table(tableName);
+ if (Objects.isNull(table)) {
+ return new ArrayList<>();
+ }
+ LinkedHashMap<String, Column> columns = table.getColumns();
List<GenTableColumn> tableColumns = new ArrayList<>();
columns.forEach((columnName, column) -> {
GenTableColumn tableColumn = new GenTableColumn();
--
Gitblit v1.9.3