public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-15 05:22:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(X-Pack): [数据填报]新建表单支持绑定已有表

Browse Source 
#12788

优化获取数据源列表接口
This commit is contained in:
ulleo
2025-03-12 10:42:03 +08:00
committed by jianneng-fit2cloud
parent 8c7e128287
commit d76a162e60
1 changed files with 35 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java
View File

@@ -65,7 +65,6 @@ import org.springframework.web.multipart.MultipartFile;
import java.io.*;
import java.lang.reflect.Method;
import java.util.*;
import java.util.concurrent.*;
import java.util.stream.Collectors;
import static io.dataease.datasource.server.DatasourceTaskServer.ScheduleType.MANUAL;
@@ -583,39 +582,45 @@ public class DatasourceServer implements DatasourceApi {
}
List<CoreDatasource> dsList = datasourceMapper.selectList(queryWrapper);
try (ExecutorService executor = Executors.newVirtualThreadPerTaskExecutor()) {
List<Callable<DatasourceDTO>> tasks = new ArrayList<>();
// 创建多个任务
for (CoreDatasource datasource : dsList) {
tasks.add(() -> {
try {
return convertCoreDatasource(datasource.getId(), false, datasource);
} catch (Exception e) {
e.printStackTrace();
return null;
}
});
}
for (CoreDatasource datasource : dsList) {
DatasourceDTO datasourceDTO = new DatasourceDTO();
BeanUtils.copyBean(datasourceDTO, datasource);
// 提交所有任务并等待结果
List<Future<DatasourceDTO>> futures = executor.invokeAll(tasks);
for (Future<DatasourceDTO> future : futures) {
DatasourceDTO datasourceDTO = future.get();
if (datasourceDTO != null) {
list.add(datasourceDTO);
if (datasourceDTO.getType().contains(DatasourceConfiguration.DatasourceType.API.toString())) {
List<ApiDefinition> apiDefinitionList = JsonUtil.parseList(datasourceDTO.getConfiguration(), listTypeReference);
int success = 0;
for (ApiDefinition apiDefinition : apiDefinitionList) {
String status = null;
if (StringUtils.isNotEmpty(datasourceDTO.getStatus())) {
JsonNode jsonNode = null;
try {
jsonNode = objectMapper.readTree(datasourceDTO.getStatus());
for (JsonNode node : jsonNode) {
if (node.get("name").asText().equals(apiDefinition.getName())) {
status = node.get("status").asText();
}
}
apiDefinition.setStatus(status);
} catch (Exception ignore) {
}
}
if (StringUtils.isNotEmpty(status) && status.equalsIgnoreCase("Success")) {
success++;
}
}
if (success == apiDefinitionList.size()) {
datasourceDTO.setStatus("Success");
} else {
if (success > 0 && success < apiDefinitionList.size()) {
datasourceDTO.setStatus("Warning");
} else {
datasourceDTO.setStatus("Error");
}
}
}
} catch (InterruptedException | ExecutionException e) {
e.printStackTrace();
}
/*for (CoreDatasource datasource : dsList) {
try {
list.add(convertCoreDatasource(datasource.getId(), false, datasource));
} catch (Exception e) {
e.printStackTrace();
}
}*/
list.add(datasourceDTO);
}
return list;
}