fix:() 优化任务调动方法

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

@@ -57,9 +57,8 @@ public class DataLinkController {
      * @return 反护试图
      */
     @PostMapping("/findSelectDataShow")
-    public Result<List<DataName>> findSelectDataShow(
+    public Result<List<DataName>> findSelectDataShow(){
-            @RequestParam("dataName") String dataName){
+        List<DataName> longs = dataLinkService.findSelectDataShow();
-        List<DataName> longs = dataLinkService.findSelectDataShow(dataName);
         return Result.success(longs);
     }
 
@@ -70,8 +69,8 @@ public class DataLinkController {
      */
     @PostMapping("/findSelectTableShow")
     public Result<List<TableNames>> findSelectTableShow(
-            @RequestParam("tableName") String tableName){
+            @RequestParam("id") Integer id){
-        List<TableNames> longs = dataLinkService.findSelectTableShow(tableName);
+        List<TableNames> longs = dataLinkService.findSelectTableShow(id);
         return Result.success(longs);
     }
 

cloud-property-server/src/main/java/com/muyu/server/mysql/MySqlDataSource.java

@@ -124,7 +124,7 @@ public class MySqlDataSource extends BaseDataAbsSource
                         while (columns.next()){
                             remarks = columns.getString("REMARKS");
 
-                            log.info("字段备注:"+remarks);
+                            log.info("字段备注:{}", remarks);
                         }
                         DataValue build = DataValue.builder()
                                 .key(metaData.getColumnName(i))

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

@@ -40,17 +40,17 @@ public interface DataLinkService {
 
     /**
      * 查询表数据下所有表表
-     * @param dataName 数据库名称
+     * @param aName 数据库名称
      * @return 反护试图
      */
-    List<DataName> findSelectDataShow(String dataName);
+    List<DataName> findSelectDataShow();
 
     /**
      * 查询表数据dashuju表
-     * @param dataTableName 查看表下的所有数据
+     * @param id 查看表下的所有数据
      * @return 反护试图
      */
-    List<TableNames> findSelectTableShow(String dataTableName);
+    List<TableNames> findSelectTableShow(Integer id);
 
     List<TableFie> findSelectTableFieShow(String dataTableName);
 }

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

@@ -85,10 +85,9 @@ public class DataLinkServiceImpl implements DataLinkService {
     }
 
     @Override
-    public List<DataName> findSelectDataShow(String dataName) {
+    public List<DataName> findSelectDataShow() {
 
-        List<DataName> dataNameList = dataNameService.list(new LambdaQueryWrapper<DataName>()
+        List<DataName> dataNameList = dataNameService.list()
-                        .eq(DataName::getName, dataName))
                 .stream()
                 .map(DataName::dataNameBuild)
                 .toList();
@@ -97,14 +96,14 @@ public class DataLinkServiceImpl implements DataLinkService {
 
     /**
      * 查询表数据dashuju表
-     * @param dataTableName 查看表下的所有数据
+     * @param id 查看表下的所有数据
      * @return 反护试图
      */
     @Override
-    public List<TableNames> findSelectTableShow(String dataTableName) {
+    public List<TableNames> findSelectTableShow(Integer id) {
 
         List<TableNames> tableNamesList = tableRunNameService.list(new LambdaQueryWrapper<TableNames>()
-                .eq(TableNames::getName, dataTableName))
+                .eq(TableNames::getDataId, id))
                 .stream()
                 .map(TableNames::tableNamesBuild)
                 .toList();

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

@@ -119,8 +119,9 @@ public class DataRunNameServiceImpl implements DataRunNameService {
 
         //遍历获取数据数据库名称对象
         dataNameList.forEach(dataName -> {
-            HashSet<TableNames> set = new HashSet<>();
+
             //判断getId不为空
+            List<TableNames> set1;
             if (StringUtils.isNotBlank(String.valueOf(dataName.getId()))) {
 
                 //使用安全管理工具获取当前登录的用户对象
@@ -139,25 +140,26 @@ public class DataRunNameServiceImpl implements DataRunNameService {
                 // 调用assetImpowerService服务的findTableIdAndBasicIdByDeptId方法
                 // 传入部门ID，获取该部门下所有授权的表ID和基础ID
                 List<AssetAuthorization> idByDeptId = dataRunNameMapper.findTableIdAndBasicIdByDeptId(deptId);
+                set1 = new ArrayList<>();
                 //在取数据数据遍历里获取表名称查询方法
                 tableIdAndBasicIdByUserId.forEach(tableIdAndBasicId -> {
+
                     List<TableNames> tableNames = this.dataDeptShow(tableIdAndBasicId, dataName);
                     System.out.println(tableNames);
-                    tableNames.forEach(tableName -> {
+                    assert tableNames != null;
-                        set.add(tableName);
+                    set1.addAll(tableNames);
-                    });
 
                 });
                 idByDeptId.forEach(tableIdAndBasicId -> {
-                        List<TableNames> tableNames = this.dataDeptShow(tableIdAndBasicId, dataName);
+                    List<TableNames> tableNames = this.dataDeptShow(tableIdAndBasicId, dataName);
                     System.out.println(tableNames);
-                        tableNames.forEach(tableName -> {
+                    assert tableNames != null;
-                            set.add(tableName);
+                    set1.addAll(tableNames);
-                        });
                 });
+            } else {
+                set1 = null;
             }
-            List<TableNames> tableNameSet = new ArrayList<>(set);
+            dataName.setTableNames(set1);
-            dataName.setTableNames(tableNameSet);
         });
         //返回所有数据
         return dataNameList;