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

perf(数据集): 视图获取数据集方式优化

Browse Source
This commit is contained in:
fit2cloud-chenyw 2024-09-18 18:28:06 +08:00
parent 5653227725
commit 1f07d4a93c
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java
View File

@ -111,7 +111,7 @@ public class ChartDataManage {
var dillAxis = new ArrayList<ChartViewFieldDTO>(); var dillAxis = new ArrayList<ChartViewFieldDTO>();
DatasetGroupInfoDTO table = datasetGroupManage.getDatasetGroupInfoDTO(view.getTableId(), null); DatasetGroupInfoDTO table = datasetGroupManage.get(view.getTableId(), null);
if (table == null) { if (table == null) {
DEException.throwException(ResultCode.DATA_IS_WRONG.code(), Translator.get("i18n_no_ds")); DEException.throwException(ResultCode.DATA_IS_WRONG.code(), Translator.get("i18n_no_ds"));
} }
@ -238,12 +238,12 @@ public class ChartDataManage {
if (ObjectUtils.isNotEmpty(filters)) { if (ObjectUtils.isNotEmpty(filters)) {
for (ChartExtFilterDTO request : filters) { for (ChartExtFilterDTO request : filters) {
// 包含 DE 的为数据集参数 // 包含 DE 的为数据集参数
if(request.getFieldId().contains("DE")){ if (request.getFieldId().contains("DE")) {
// 组装sql 参数原始数据 // 组装sql 参数原始数据
if (CollectionUtils.isNotEmpty(sqlVariables)) { if (CollectionUtils.isNotEmpty(sqlVariables)) {
for(SqlVariableDetails sourceVariables : sqlVariables){ for (SqlVariableDetails sourceVariables : sqlVariables) {
if(sourceVariables.getId().equals(request.getFieldId())){ if (sourceVariables.getId().equals(request.getFieldId())) {
if(CollectionUtils.isEmpty(request.getParameters())){ if (CollectionUtils.isEmpty(request.getParameters())) {
request.setParameters(new ArrayList<>()); request.setParameters(new ArrayList<>());
} }
request.getParameters().add(sourceVariables); request.getParameters().add(sourceVariables);
@ -251,7 +251,7 @@ public class ChartDataManage {
} }
} }
}else { } else {
DatasetTableFieldDTO datasetTableField = datasetTableFieldManage.selectById(Long.valueOf(request.getFieldId())); DatasetTableFieldDTO datasetTableField = datasetTableFieldManage.selectById(Long.valueOf(request.getFieldId()));
request.setDatasetTableField(datasetTableField); request.setDatasetTableField(datasetTableField);
request.setFilterType(2); request.setFilterType(2);

6
core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetGroupManage.java
View File

@ -45,8 +45,6 @@ import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantLock;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static io.dataease.result.ResultCode.DV_RESOURCE_UNCHECKED;
/** /**
* @Author Junjun * @Author Junjun
*/ */
@ -397,10 +395,6 @@ public class DatasetGroupManage {
return dto; return dto;
} }
public DatasetGroupInfoDTO getDatasetGroupInfoDTO(Long id, String type) throws Exception {
return get(id, type);
}
public DatasetGroupInfoDTO getDetail(Long id) throws Exception { public DatasetGroupInfoDTO getDetail(Long id) throws Exception {
CoreDatasetGroup coreDatasetGroup = coreDatasetGroupMapper.selectById(id); CoreDatasetGroup coreDatasetGroup = coreDatasetGroupMapper.selectById(id);
if (coreDatasetGroup == null) { if (coreDatasetGroup == null) {