fine:()修改规格

cloud-property-common/src/main/java/com/muyu/common/domain/TableNames.java

@@ -4,17 +4,12 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.StringUtils;
 
-import java.util.List;
-import java.util.function.Supplier;
-
-import static com.muyu.common.domain.TableFie.customerBuild;
+import java.util.ArrayList;
 
 /**
  * @Author：yang
@@ -50,7 +45,7 @@ public class TableNames {
      * 数据库表字段
      */
     @TableField(exist = false)
-    private List<TableFie> tableFie;
+    private ArrayList<TableFie> tableFie;
 
     public TableNames(String name, Integer dataId) {
         this.name = name;

cloud-property-server/src/main/java/com/muyu/server/controller/TableFieldController.java

@@ -86,9 +86,9 @@ public class TableFieldController {
      * @param tableName 表名
      * @return 字段集合
      */
-    @PostMapping("/selectByTableName")
+    @PostMapping("/selectByTableName/{tableName}")
     @Operation(summary = "根据表名获取所有字段")
-    public Result<List<TableFie>> selectByName(String tableName){
+    public Result<List<TableFie>> selectByName(@PathVariable String tableName){
         return Result.success(tableFieldService.selectByName(tableName),"操作成功");
     }
 }

cloud-property-server/src/main/java/com/muyu/server/service/DataRunNameService.java

@@ -14,11 +14,6 @@ import java.util.List;
  * @Date：2024/8/27 20:00
  */
 public interface DataRunNameService {
-    /**
-     * 添加数据库
-     * @param list
-     */
-//    void addDataRunName(ArrayList<DataName> list);
 
     /**
      * 添加 数据库名，表名，结构

cloud-property-server/src/main/java/com/muyu/server/service/impl/DataRunNameServiceImpl.java

@@ -50,7 +50,6 @@ public class DataRunNameServiceImpl implements DataRunNameService {
         //获取数据库表的名称
         List<TableNames> tableNames = tableRunNameService.extractTableName(connect.getDatabaseName());
         tableNames.forEach(tableName -> {
-            System.out.println();
             log.info("数据库ID:{}",dataName1.getId());
             tableName.setDataId(dataName1.getId());
         });
@@ -105,56 +104,35 @@ public class DataRunNameServiceImpl implements DataRunNameService {
     @Override
     public List<DataName> getDataBaseTableName() {
 
-        List<DataName> list = dataNameService.list().stream()
+        List<DataName> dataNameList = dataNameService.list().stream()
                 .map(DataName::dataNameBuild).toList();
-
-        ArrayList<TableNames> namesArrayList = new ArrayList<>();
-
-        ArrayList<TableFie> fieArrayList = new ArrayList<>();
-
-        list.forEach(dataName -> {
+        dataNameList.forEach(dataName -> {
 
             if (StringUtils.isNotBlank(String.valueOf(dataName.getId()))) {
-                List<TableNames> tableNames = tableRunNameService.list(new LambdaQueryWrapper<TableNames>()
+                List<TableNames> tableNamesList = tableRunNameService.list(new LambdaQueryWrapper<TableNames>()
                                 .eq(TableNames::getDataId, dataName.getId()))
                         .stream()
                         .map(TableNames::tableNamesBuild)
                         .toList();
-
-
-                tableNames.forEach(tableName -> {
-                    namesArrayList.add(tableName);
+                ArrayList<TableNames> namesArrayList = new ArrayList<>(tableNamesList);
                     dataName.setTableNames(namesArrayList);
-                    List<TableNames> tableNames1 = dataName.getTableNames();
-
-                    tableNames1.forEach(tableName1 -> {
-                        System.out.println(tableName1);
-                        if (StringUtils.isNotBlank(String.valueOf(tableName1.getId()))){
-                            List<TableFie> list1 = tableFieldService.list(new LambdaQueryWrapper<TableFie>()
-                                            .eq(TableFie::getTableId, tableName1.getId()))
-                                    .stream()
-                                    .map(TableFie::tableFieBuild).toList();
-                            System.out.println(list1);
-                            fieArrayList.addAll(list1);
-                            tableName1.setTableFie(fieArrayList);
-                        }
-                    });
-//                    tableNames1.forEach(tableName1 -> {
-//                        if (StringUtils.isNotBlank(String.valueOf(tableName1.getId()))) {
-//                            List<TableFie> list1 = tableFieldService.list(new LambdaQueryWrapper<TableFie>()
-//                                            .eq(TableFie::getTableId, tableName1.getId()))
-//                                    .stream()
-//                                    .map(TableFie::tableFieBuild).toList();
-//                            list1.forEach(tableFy -> {
-//                                fieArrayList.add(tableFy);
-//                                tableName1.setTableFie(fieArrayList);
-//                            });
-//                        }
-//                    });
+                List<TableNames> tableNames1 = dataName.getTableNames();
+                log.info("数据库表名称:{}",tableNames1);
+                tableNames1.forEach(tableName1 -> {
+                    System.out.println(tableName1);
+                    if (StringUtils.isNotBlank(String.valueOf(tableName1.getId()))){
+                        List<TableFie> tableFieList = tableFieldService.list(new LambdaQueryWrapper<TableFie>()
+                                        .eq(TableFie::getTableId, tableName1.getId()))
+                                .stream()
+                                .map(TableFie::tableFieBuild).toList();
+                        System.out.println(tableFieList);
+                        ArrayList<TableFie> fieArrayList = new ArrayList<>(tableFieList);
+                        tableName1.setTableFie(fieArrayList);
+                    }
                 });
             }
         });
-        return list;
+        return dataNameList;
 
     }
 }