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

feat(数据集): 数据集增加分组字段功能枚举值接口

Browse Source
This commit is contained in:
junjun
2025-02-07 15:33:18 +08:00
committed by Junjun
parent 9fec68fa9b
commit c251d6df7e
4 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java
View File

@@ -538,17 +538,13 @@ public class DatasetDataManage {
}
}
public List<String> getFieldEnumDs(DatasetTableFieldDTO field) throws Exception {
// 根据前端传的查询组件field ids，获取所有字段枚举值并去重合并
// List<List<String>> list = new ArrayList<>();
public List<String> getFieldEnumDs(EnumObj map) throws Exception {
DatasetTableFieldDTO field = map.getField();
DatasetGroupInfoDTO datasetGroupInfoDTO = map.getDataset();
if (field == null) {
DEException.throwException(Translator.get("i18n_no_field"));
}
List<DatasetTableFieldDTO> allFields = new ArrayList<>();
// 根据图表计算字段，获取数据集
Long datasetGroupId = field.getDatasetGroupId();
DatasetGroupInfoDTO datasetGroupInfoDTO = datasetGroupManage.getDatasetGroupInfoDTO(datasetGroupId, null);
Map<String, Object> sqlMap = datasetSQLManage.getUnionSQLForEdit(datasetGroupInfoDTO, new ChartExtRequest());
String sql = (String) sqlMap.get("sql");

5
core/core-backend/src/main/java/io/dataease/dataset/server/DatasetDataServer.java
View File

@@ -6,6 +6,7 @@ import io.dataease.api.dataset.dto.EnumValueRequest;
import io.dataease.api.dataset.dto.MultFieldValuesRequest;
import io.dataease.api.dataset.dto.PreviewSqlDTO;
import io.dataease.api.dataset.union.DatasetGroupInfoDTO;
import io.dataease.api.dataset.dto.EnumObj;
import io.dataease.dataset.manage.DatasetDataManage;
import io.dataease.extensions.datasource.dto.DatasetTableDTO;
import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO;
@@ -47,9 +48,9 @@ public class DatasetDataServer implements DatasetDataApi {
}
@Override
public List<String> getFieldEnumDs(DatasetTableFieldDTO field) throws Exception {
public List<String> getFieldEnumDs(EnumObj map) throws Exception {
try {
return datasetDataManage.getFieldEnumDs(field);
return datasetDataManage.getFieldEnumDs(map);
} catch (Exception e) {
e.printStackTrace();
LogUtil.error(e);

7
sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetDataApi.java
View File

@@ -1,10 +1,7 @@
package io.dataease.api.dataset;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import io.dataease.api.dataset.dto.BaseTreeNodeDTO;
import io.dataease.api.dataset.dto.EnumValueRequest;
import io.dataease.api.dataset.dto.MultFieldValuesRequest;
import io.dataease.api.dataset.dto.PreviewSqlDTO;
import io.dataease.api.dataset.dto.*;
import io.dataease.api.dataset.union.DatasetGroupInfoDTO;
import io.dataease.extensions.datasource.dto.DatasetTableDTO;
import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO;
@@ -40,7 +37,7 @@ public interface DatasetDataApi {
@Operation(summary = "数据集获取字段枚举值")
@PostMapping("enumValueDs")
List<String> getFieldEnumDs(@RequestBody DatasetTableFieldDTO field) throws Exception;
List<String> getFieldEnumDs(@RequestBody EnumObj map) throws Exception;
@Operation(summary = "获取字段枚举值")
@PostMapping("enumValue")

14
sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/EnumObj.java Normal file
View File

@@ -0,0 +1,14 @@
package io.dataease.api.dataset.dto;
import io.dataease.api.dataset.union.DatasetGroupInfoDTO;
import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO;
import lombok.Data;
/**
* @Author Junjun
*/
@Data
public class EnumObj {
private DatasetTableFieldDTO field;
private DatasetGroupInfoDTO dataset;
}