From 2eb8e67e9725fd0ca54c9e950e3d4b58c35499e1 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Tue, 18 Jun 2024 10:17:09 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=89=B9=E9=87=8F=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=9B=86=E5=AD=97=E6=AE=B5=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataset/manage/DatasetTableFieldManage.java | 17 +++++++++++++++--
 .../dataset/server/DatasetFieldServer.java      |  5 +++++
 .../dataease/api/dataset/DatasetTableApi.java   |  4 ++++
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetTableFieldManage.java b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetTableFieldManage.java
index d5164c15b7..9489bf96b0 100644
--- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetTableFieldManage.java
+++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetTableFieldManage.java
@@ -2,17 +2,17 @@ package io.dataease.dataset.manage;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.dataease.api.chart.dto.ColumnPermissionItem;
-import io.dataease.extensions.view.model.SQLObj;
 import io.dataease.dataset.dao.auto.entity.CoreDatasetTableField;
 import io.dataease.dataset.dao.auto.mapper.CoreDatasetGroupMapper;
 import io.dataease.dataset.dao.auto.mapper.CoreDatasetTableFieldMapper;
 import io.dataease.dataset.utils.TableUtils;
 import io.dataease.datasource.provider.CalciteProvider;
-import io.dataease.extensions.view.dto.DatasetTableFieldDTO;
 import io.dataease.engine.constant.ExtFieldConstant;
 import io.dataease.engine.func.FunctionConstant;
 import io.dataease.engine.utils.Utils;
 import io.dataease.exception.DEException;
+import io.dataease.extensions.view.dto.DatasetTableFieldDTO;
+import io.dataease.extensions.view.model.SQLObj;
 import io.dataease.i18n.Translator;
 import io.dataease.utils.AuthUtils;
 import io.dataease.utils.BeanUtils;
@@ -160,6 +160,19 @@ public class DatasetTableFieldManage {
         return transDTO(coreDatasetTableFieldMapper.selectList(wrapper));
     }
 
+    public Map<String, List<DatasetTableFieldDTO>> selectByDatasetGroupIds(List<Long> ids) {
+        Map<String, List<DatasetTableFieldDTO>> map = new HashMap<>();
+        QueryWrapper<CoreDatasetTableField> wrapper = new QueryWrapper<>();
+        for (Long id : ids) {
+            wrapper.eq("dataset_group_id", id);
+            wrapper.eq("checked", true);
+            wrapper.isNull("chart_id");
+            wrapper.eq("ext_field", 0);
+            map.put(String.valueOf(id), transDTO(coreDatasetTableFieldMapper.selectList(wrapper)));
+        }
+        return map;
+    }
+
     public List<DatasetTableFieldDTO> selectByFieldIds(List<Long> ids) {
         QueryWrapper<CoreDatasetTableField> wrapper = new QueryWrapper<>();
         wrapper.in("id", ids);
diff --git a/core/core-backend/src/main/java/io/dataease/dataset/server/DatasetFieldServer.java b/core/core-backend/src/main/java/io/dataease/dataset/server/DatasetFieldServer.java
index 2174a0b276..1e3159bd4d 100644
--- a/core/core-backend/src/main/java/io/dataease/dataset/server/DatasetFieldServer.java
+++ b/core/core-backend/src/main/java/io/dataease/dataset/server/DatasetFieldServer.java
@@ -43,6 +43,11 @@ public class DatasetFieldServer implements DatasetTableApi {
         return datasetTableFieldManage.selectByDatasetGroupId(id);
     }
 
+    @Override
+    public Map<String, List<DatasetTableFieldDTO>> listByDsIds(List<Long> ids) {
+        return datasetTableFieldManage.selectByDatasetGroupIds(ids);
+    }
+
     @Override
     public void delete(Long id) {
         datasetTableFieldManage.deleteById(id);
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetTableApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetTableApi.java
index 8ba76fc1df..3f933da6c6 100644
--- a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetTableApi.java
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetTableApi.java
@@ -40,6 +40,10 @@ public interface DatasetTableApi {
     @PostMapping("listByDatasetGroup/{id}")
     List<DatasetTableFieldDTO> listByDatasetGroup(@PathVariable Long id);
 
+    @Operation(summary = "获取数据集字段map")
+    @PostMapping("listByDsIds")
+    Map<String, List<DatasetTableFieldDTO>> listByDsIds(@RequestBody List<Long> ids);
+
     @Operation(summary = "删除字段")
     @PostMapping("delete/{id}")
     void delete(@PathVariable Long id);