admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 修复 代码生成 报错与警告

Browse Source
This commit is contained in:
疯狂的狮子Li 2024-07-23 10:06:15 +08:00
parent 05580deaa9
commit 84f553a911
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java
View File

@ -125,7 +125,7 @@ public class GenTableServiceImpl implements IGenTableService {
Integer pageNum = pageQuery.getPageNum(); Integer pageNum = pageQuery.getPageNum();
Integer pageSize = pageQuery.getPageSize(); Integer pageSize = pageQuery.getPageSize();
LinkedHashMap<String, Table> tablesMap = ServiceProxy.metadata().tables(); LinkedHashMap<String, Table<?>> tablesMap = ServiceProxy.metadata().tables();
if (CollUtil.isEmpty(tablesMap)) { if (CollUtil.isEmpty(tablesMap)) {
return TableDataInfo.build(); return TableDataInfo.build();
} }
@ -172,13 +172,13 @@ public class GenTableServiceImpl implements IGenTableService {
@Override @Override
public List<GenTable> selectDbTableListByNames(String[] tableNames, String dataName) { public List<GenTable> selectDbTableListByNames(String[] tableNames, String dataName) {
Set<String> tableNameSet = new HashSet<>(List.of(tableNames)); 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)) { if (CollUtil.isEmpty(tablesMap)) {
return new ArrayList<>(); return new ArrayList<>();
} }
List<Table> tableList = tablesMap.values().stream() List<Table<?>> tableList = tablesMap.values().stream()
.filter(x -> tableNameSet.contains(x.getName())).toList(); .filter(x -> tableNameSet.contains(x.getName())).toList();
if (ArrayUtil.isEmpty(tableList)) { if (ArrayUtil.isEmpty(tableList)) {
@ -279,7 +279,11 @@ public class GenTableServiceImpl implements IGenTableService {
*/ */
@DS("#dataName") @DS("#dataName")
private List<GenTableColumn> selectDbTableColumnsByName(String tableName, String 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<>(); List<GenTableColumn> tableColumns = new ArrayList<>();
columns.forEach((columnName, column) -> { columns.forEach((columnName, column) -> {
GenTableColumn tableColumn = new GenTableColumn(); GenTableColumn tableColumn = new GenTableColumn();