From c251d6df7e448b859945be10def6e1862b169b74 Mon Sep 17 00:00:00 2001 From: junjun Date: Fri, 7 Feb 2025 15:33:18 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=95=B0=E6=8D=AE=E9=9B=86):=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=9B=86=E5=A2=9E=E5=8A=A0=E5=88=86=E7=BB=84=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=8A=9F=E8=83=BD=E6=9E=9A=E4=B8=BE=E5=80=BC=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/dataset/manage/DatasetDataManage.java | 10 +++------- .../dataease/dataset/server/DatasetDataServer.java | 5 +++-- .../io/dataease/api/dataset/DatasetDataApi.java | 7 ++----- .../java/io/dataease/api/dataset/dto/EnumObj.java | 14 ++++++++++++++ 4 files changed, 22 insertions(+), 14 deletions(-) create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/EnumObj.java diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java index 943aa89fed..f02e4d8bc6 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java +++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java @@ -538,17 +538,13 @@ public class DatasetDataManage { } } - public List getFieldEnumDs(DatasetTableFieldDTO field) throws Exception { - // 根据前端传的查询组件field ids，获取所有字段枚举值并去重合并 -// List> list = new ArrayList<>(); + public List getFieldEnumDs(EnumObj map) throws Exception { + DatasetTableFieldDTO field = map.getField(); + DatasetGroupInfoDTO datasetGroupInfoDTO = map.getDataset(); if (field == null) { DEException.throwException(Translator.get("i18n_no_field")); } List allFields = new ArrayList<>(); - // 根据图表计算字段，获取数据集 - Long datasetGroupId = field.getDatasetGroupId(); - - DatasetGroupInfoDTO datasetGroupInfoDTO = datasetGroupManage.getDatasetGroupInfoDTO(datasetGroupId, null); Map sqlMap = datasetSQLManage.getUnionSQLForEdit(datasetGroupInfoDTO, new ChartExtRequest()); String sql = (String) sqlMap.get("sql"); diff --git a/core/core-backend/src/main/java/io/dataease/dataset/server/DatasetDataServer.java b/core/core-backend/src/main/java/io/dataease/dataset/server/DatasetDataServer.java index 17dd612863..9e73d906e6 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/server/DatasetDataServer.java +++ b/core/core-backend/src/main/java/io/dataease/dataset/server/DatasetDataServer.java @@ -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 getFieldEnumDs(DatasetTableFieldDTO field) throws Exception { + public List getFieldEnumDs(EnumObj map) throws Exception { try { - return datasetDataManage.getFieldEnumDs(field); + return datasetDataManage.getFieldEnumDs(map); } catch (Exception e) { e.printStackTrace(); LogUtil.error(e); diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetDataApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetDataApi.java index 3bc05b6ca2..46a0a0ebdf 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetDataApi.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetDataApi.java @@ -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 getFieldEnumDs(@RequestBody DatasetTableFieldDTO field) throws Exception; + List getFieldEnumDs(@RequestBody EnumObj map) throws Exception; @Operation(summary = "获取字段枚举值") @PostMapping("enumValue") diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/EnumObj.java b/sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/EnumObj.java new file mode 100644 index 0000000000..74353664fb --- /dev/null +++ b/sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/EnumObj.java @@ -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; +}