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

Merge pull request #13487 from dataease/pr@dev-v2@perf_free_resource

Browse Source 
perf(X-Pack): 游离资源管理页面
This commit is contained in:
dataeaseShu
2024-11-22 10:49:51 +08:00
committed by GitHub
parent edd8593e1b 3fb3b97d9e
commit 5832bb8e42
5 changed files with 58 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,6 +107,8 @@ public class DatasourceServer implements DatasourceApi {
private PluginManageApi pluginManage;
@Autowired(required = false)
private RelationApi relationManage;
@Autowired
private CoreDatasourceMapper coreDatasourceMapper;
public enum UpdateType {
all_scope, add_scope
@@ -1209,4 +1211,25 @@ public class DatasourceServer implements DatasourceApi {
return datasourceDTO;
}
@Override
public DsSimpleVO simple(Long id) {
if (ObjectUtils.isEmpty(id)) DEException.throwException("id is null");
CoreDatasource coreDatasource = coreDatasourceMapper.selectById(id);
if (ObjectUtils.isEmpty(coreDatasource)) return null;
DsSimpleVO vo = new DsSimpleVO();
vo.setName(coreDatasource.getName());
vo.setType(coreDatasource.getType());
vo.setDescription(coreDatasource.getDescription());
String configuration = coreDatasource.getConfiguration();
DatasourceConfiguration config = null;
String host = null;
if (StringUtils.isBlank(configuration)
|| StringUtils.equalsIgnoreCase("[]", configuration)
|| ObjectUtils.isEmpty(config = JsonUtil.parseObject(configuration, DatasourceConfiguration.class))
|| StringUtils.isBlank(host = config.getHost())) {
return vo;
}
vo.setHost(host);
return vo;
}
}

13
core/core-frontend/src/locales/zh-CN.ts
View File

@@ -3844,8 +3844,17 @@ export default {
quick_del_confirm: '确定删除所有游离资源吗？',
quick_del_tips: '资源删除后，不可撤销。',
quick_sync_confirm: '确定迁移所有游离资源吗？',
quick_sync_confirm_tips: '迁移删除后，不可撤销，请谨慎操作。',
quick_sync_confirm_tips: '迁移资源后，不可撤销，请谨慎操作。',
batch_sync_confirm: '确定迁移 {0} 项及其相关游离资源吗？',
single_sync_confirm: '确定迁移该资源吗'
single_sync_confirm: '确定迁移该资源吗',
batch_del_confirm: '确定删除 {0} 项资源吗？',
batch_del_confirm_tips: '资源删除后，不可撤销，请谨慎操作。',
del_tips_dataset: '删除数据集会造成相关数据集失效，确定删除？',
del_tips_datasource: '有数据集正在使用这些数据源，删除后数据集不可用，确定删除？',
single_del_confirm: '确定删除该{0}吗？',
single_del_tips_dataset: '该数据集存在如下血缘关系，删除会造成相关视图失效，确定删除？',
single_del_tips_datasource: '有 {0} 个数据集正在使用此数据源，删除后数据集不可用，确定删除？',
folder: '文件夹',
del_folder_tips: '删除后，此文件夹下的所有资源都会被删除，请谨慎操作。'
}
}

2
de-xpack

Submodule de-xpack updated: bce7b3f108...282f497c1f

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

@@ -159,4 +159,7 @@ public interface DatasourceApi {
List<DatasourceDTO> innerList(List<Long> ids, List<String> types) throws DEException;
@GetMapping("/simple/{id}")
DsSimpleVO simple(@PathVariable("id") Long id);
}

20
sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/DsSimpleVO.java Normal file
View File

@@ -0,0 +1,20 @@
package io.dataease.api.ds.vo;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
@Data
public class DsSimpleVO implements Serializable {
@Serial
private static final long serialVersionUID = 46446424188194481L;
private String name;
private String type;
private String description;
private String host;
}