a_bazu
/
cloud-property
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
Yueng 2024-09-10 16:48:31 +08:00
parent b22150f896
commit 9d7cea8f8e
1 changed files with 48 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,27 +142,59 @@ public class DataRunNameServiceImpl implements DataRunNameService {
//在取数据数据遍历里获取表名称查询方法
tableIdAndBasicIdByUserId.forEach(tableIdAndBasicId -> {
List<TableNames> dataName1 = this.dataDeptShow(tableIdAndBasicId, dataName);
if (CollectionUtils.isEmpty(dataName1)){
//判断getId不为空
if (StringUtils.isNotBlank(String.valueOf(dataName.getId()))) {
//在取数据数据遍历里获取表名称查询方法
List<TableNames> tableNamesList = tableRunNameService.list(new LambdaQueryWrapper<TableNames>()
.eq(TableNames::getDataId, dataName.getId())
.eq(TableNames::getId, tableIdAndBasicId.getTableId()))
.stream()
.map(TableNames::tableNamesBuild)
.toList();
//判断tableNamesList查询数据为空直接返回
if (CollectionUtils.isEmpty(tableNamesList)) {
return;
}
dataName1.forEach(tableNames -> {
set1.add(tableNames);
});
//在每一次循环中创建一个新的集合
ArrayList<TableNames> namesArrayList = new ArrayList<>(tableNamesList);
//添加到数据库实体类集合字段上
dataName.setTableNames(namesArrayList);
//将添加好的实体类集合进行遍历操作
log.info("数据库表名称:{}",dataName.getTableNames());
if (CollectionUtils.isEmpty(dataName.getTableNames())) {return;}
}
});
idByDeptId.forEach(tableIdAndBasicId -> {
List<TableNames> dataName1 = this.dataDeptShow(tableIdAndBasicId, dataName);
if (CollectionUtils.isEmpty(dataName1)){
//判断getId不为空
if (StringUtils.isNotBlank(String.valueOf(dataName.getId()))) {
//在取数据数据遍历里获取表名称查询方法
List<TableNames> tableNamesList = tableRunNameService.list(new LambdaQueryWrapper<TableNames>()
.eq(TableNames::getDataId, dataName.getId())
.eq(TableNames::getId, tableIdAndBasicId.getTableId()))
.stream()
.map(TableNames::tableNamesBuild)
.toList();
//判断tableNamesList查询数据为空直接返回
if (CollectionUtils.isEmpty(tableNamesList)) {
return;
}
dataName1.forEach(tableNames -> {
set1.add(tableNames);
});
});
ArrayList<TableNames> namesArrayList = new ArrayList<>(set1);
//在每一次循环中创建一个新的集合
ArrayList<TableNames> namesArrayList = new ArrayList<>(tableNamesList);
//添加到数据库实体类集合字段上
dataName.setTableNames(namesArrayList);
//将添加好的实体类集合进行遍历操作
log.info("数据库表名称:{}",dataName.getTableNames());
if (CollectionUtils.isEmpty(dataName.getTableNames())) {return;}
}
});
});
//返回所有数据
return dataNameList;