center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix: 优化数据源校验逻辑

Browse Source
This commit is contained in:
taojinlong 2024-09-09 14:57:49 +08:00
parent b4b7027ec6
commit a90de684d9
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,6 +130,8 @@ public class DatasourceServer implements DatasourceApi {
private boolean isUpdatingStatus = false; private boolean isUpdatingStatus = false;
private static List<Long> syncDsIds = new ArrayList<>();
private void getParents(Long pid, List<Long> ids) { private void getParents(Long pid, List<Long> ids) {
CoreDatasource parent = datasourceMapper.selectById(pid);// 查找父级folder CoreDatasource parent = datasourceMapper.selectById(pid);// 查找父级folder
ids.add(parent.getId()); ids.add(parent.getId());
@ -1069,11 +1071,16 @@ public class DatasourceServer implements DatasourceApi {
wrapper.notIn("type", Arrays.asList("Excel", "folder")); wrapper.notIn("type", Arrays.asList("Excel", "folder"));
List<CoreDatasource> datasources = datasourceMapper.selectList(wrapper); List<CoreDatasource> datasources = datasourceMapper.selectList(wrapper);
datasources.forEach(datasource -> { datasources.forEach(datasource -> {
if (!syncDsIds.contains(datasource.getId())) {
syncDsIds.add(datasource.getId());
}
commonThreadPool.addTask(() -> { commonThreadPool.addTask(() -> {
try { try {
LicenseUtil.validate(); LicenseUtil.validate();
validate(datasource); validate(datasource);
} catch (Exception e) { } catch (Exception e) {
} finally {
syncDsIds.removeIf(id -> id.equals(datasource.getId()));
} }
}); });
}); });