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

疯狂的狮子Li

2024-07-23 84f553a911a1812a494cbac73ac0fc22d067fdb1

 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();