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

refactor: 更新 X-Pack

Browse Source
This commit is contained in:
ulleo 2024-08-23 18:11:08 +08:00
parent 1e8f5ec786
commit 66183622ff
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,7 +70,6 @@ import java.util.stream.Collectors;
import static io.dataease.datasource.server.DatasourceTaskServer.ScheduleType.MANUAL; import static io.dataease.datasource.server.DatasourceTaskServer.ScheduleType.MANUAL;
import static io.dataease.datasource.server.DatasourceTaskServer.ScheduleType.RIGHTNOW; import static io.dataease.datasource.server.DatasourceTaskServer.ScheduleType.RIGHTNOW;
import static io.dataease.result.ResultCode.DS_RESOURCE_UNCHECKED;
@RestController @RestController
@ -530,7 +529,7 @@ public class DatasourceServer implements DatasourceApi {
} }
@Override @Override
public List<DatasourceDTO> innerList(List<Long> ids) throws DEException { public List<DatasourceDTO> innerList(List<Long> ids, List<String> types) throws DEException {
List<DatasourceDTO> list = new ArrayList<>(); List<DatasourceDTO> list = new ArrayList<>();
LambdaQueryWrapper<CoreDatasource> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<CoreDatasource> queryWrapper = new LambdaQueryWrapper<>();
if (ids != null) { if (ids != null) {
@ -540,9 +539,20 @@ public class DatasourceServer implements DatasourceApi {
queryWrapper.in(CoreDatasource::getId, ids); queryWrapper.in(CoreDatasource::getId, ids);
} }
} }
if (types != null) {
if (types.isEmpty()) {
return list;
} else {
queryWrapper.in(CoreDatasource::getType, types);
}
}
List<CoreDatasource> dsList = datasourceMapper.selectList(queryWrapper); List<CoreDatasource> dsList = datasourceMapper.selectList(queryWrapper);
for (CoreDatasource datasource : dsList) { for (CoreDatasource datasource : dsList) {
try {
list.add(convertCoreDatasource(datasource.getId(), false, datasource)); list.add(convertCoreDatasource(datasource.getId(), false, datasource));
} catch (Exception e) {
e.printStackTrace();
}
} }
return list; return list;
} }

2
de-xpack

@ -1 +1 @@
Subproject commit ecc332d1abc22b822956380277990708ef8457b3 Subproject commit 9a7b3488f9e8dee6ea156cbdf34f789dda011f7d

7
sdk/api/api-base/src/main/java/io/dataease/api/ds/DatasourceApi.java
View File

@ -2,7 +2,9 @@ package io.dataease.api.ds;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiSupport; import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import io.dataease.api.ds.vo.*; import io.dataease.api.ds.vo.ApiDefinition;
import io.dataease.api.ds.vo.CoreDatasourceTaskLogDTO;
import io.dataease.api.ds.vo.ExcelFileData;
import io.dataease.auth.DeApiPath; import io.dataease.auth.DeApiPath;
import io.dataease.auth.DePermit; import io.dataease.auth.DePermit;
import io.dataease.exception.DEException; import io.dataease.exception.DEException;
@ -79,7 +81,8 @@ public interface DatasourceApi {
DatasourceDTO get(@PathVariable("datasourceId") Long datasourceId) throws DEException; DatasourceDTO get(@PathVariable("datasourceId") Long datasourceId) throws DEException;
DatasourceDTO innerGet(Long datasourceId) throws DEException; DatasourceDTO innerGet(Long datasourceId) throws DEException;
List<DatasourceDTO> innerList(List<Long> ids) throws DEException;
List<DatasourceDTO> innerList(List<Long> ids, List<String> types) throws DEException;
@DePermit({"#p0+':read'"}) @DePermit({"#p0+':read'"})
@GetMapping("/hidePw/{datasourceId}") @GetMapping("/hidePw/{datasourceId}")