fix:() 优化任务调动方法
parent
86073cc39a
commit
86446b4bf4
|
@ -116,7 +116,7 @@ public class DataRunNameServiceImpl implements DataRunNameService {
|
||||||
//数据库名称查询
|
//数据库名称查询
|
||||||
List<DataName> dataNameList = dataNameService.list().stream()
|
List<DataName> dataNameList = dataNameService.list().stream()
|
||||||
.map(DataName::dataNameBuild).toList();
|
.map(DataName::dataNameBuild).toList();
|
||||||
HashSet<TableNames> set1 = new HashSet<>();
|
HashSet<DataName> set1 = new HashSet<>();
|
||||||
//遍历获取数据数据库名称对象
|
//遍历获取数据数据库名称对象
|
||||||
dataNameList.forEach(dataName -> {
|
dataNameList.forEach(dataName -> {
|
||||||
|
|
||||||
|
@ -142,24 +142,24 @@ public class DataRunNameServiceImpl implements DataRunNameService {
|
||||||
//在取数据数据遍历里获取表名称查询方法
|
//在取数据数据遍历里获取表名称查询方法
|
||||||
tableIdAndBasicIdByUserId.forEach(tableIdAndBasicId -> {
|
tableIdAndBasicIdByUserId.forEach(tableIdAndBasicId -> {
|
||||||
|
|
||||||
List<TableNames> tableNames = this.dataDeptShow(tableIdAndBasicId, dataName);
|
DataName dataName1 = this.dataDeptShow(tableIdAndBasicId, dataName);
|
||||||
System.out.println(tableNames);
|
System.out.println(dataName1);
|
||||||
set1.addAll(tableNames);
|
set1.add(dataName1);
|
||||||
|
|
||||||
});
|
});
|
||||||
idByDeptId.forEach(tableIdAndBasicId -> {
|
idByDeptId.forEach(tableIdAndBasicId -> {
|
||||||
List<TableNames> tableNames = this.dataDeptShow(tableIdAndBasicId, dataName);
|
DataName dataName1 = this.dataDeptShow(tableIdAndBasicId, dataName);
|
||||||
System.out.println(tableNames);
|
System.out.println(dataName1);
|
||||||
set1.addAll(tableNames);
|
set1.add(dataName1);
|
||||||
});
|
});
|
||||||
List<TableNames> set2 = new ArrayList<>(set1);
|
// dataName.setTableNames(set2);
|
||||||
dataName.setTableNames(set2);
|
|
||||||
});
|
});
|
||||||
|
List<DataName> list = new ArrayList<>(set1);
|
||||||
//返回所有数据
|
//返回所有数据
|
||||||
return dataNameList;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<TableNames> dataDeptShow(AssetAuthorization tableIdAndBasicId, DataName dataName) {
|
private DataName dataDeptShow(AssetAuthorization tableIdAndBasicId, DataName dataName) {
|
||||||
List<TableNames> tableNamesList = tableRunNameService.list(new LambdaQueryWrapper<TableNames>()
|
List<TableNames> tableNamesList = tableRunNameService.list(new LambdaQueryWrapper<TableNames>()
|
||||||
.eq(TableNames::getDataId, dataName.getId())
|
.eq(TableNames::getDataId, dataName.getId())
|
||||||
.eq(TableNames::getId, tableIdAndBasicId.getTableId()))
|
.eq(TableNames::getId, tableIdAndBasicId.getTableId()))
|
||||||
|
@ -185,7 +185,7 @@ public class DataRunNameServiceImpl implements DataRunNameService {
|
||||||
List<TableFie> tableFies = this.tableStructureShow(tableName1);
|
List<TableFie> tableFies = this.tableStructureShow(tableName1);
|
||||||
tableName1.setTableFie(tableFies);
|
tableName1.setTableFie(tableFies);
|
||||||
});
|
});
|
||||||
return tableNamesList;
|
return dataName;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue