From fe1c7dadab2e1ac8e33eccc4b2dcbcf3192492fb Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 16 Nov 2023 17:18:54 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20xpack=E5=B5=8C=E5=85=A5=E5=BC=8F?=
 =?UTF-8?q?=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataset/manage/DatasetDataManage.java     |  2 +-
 .../dataset/manage/DatasetGroupManage.java    | 24 +++++++++++++++++++
 de-xpack                                      |  2 +-
 3 files changed, 26 insertions(+), 2 deletions(-)

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 f575012f4c..20b92d03e0 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
@@ -211,7 +211,7 @@ public class DatasetDataManage {
     }
 
     public Long getDatasetTotal(Long datasetGroupId) throws Exception {
-        DatasetGroupInfoDTO dto = datasetGroupManage.get(datasetGroupId, null);
+        DatasetGroupInfoDTO dto = datasetGroupManage.getForCount(datasetGroupId);
         if (StringUtils.equalsIgnoreCase(dto.getNodeType(), "dataset")) {
             return getDatasetTotal(dto);
         }
diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetGroupManage.java b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetGroupManage.java
index ae5d7e6628..eb8906f0aa 100644
--- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetGroupManage.java
+++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetGroupManage.java
@@ -346,6 +346,30 @@ public class DatasetGroupManage {
         }
     }
 
+    public DatasetGroupInfoDTO getForCount(Long id) throws Exception {
+        CoreDatasetGroup coreDatasetGroup = coreDatasetGroupMapper.selectById(id);
+        if (coreDatasetGroup == null) {
+            return null;
+        }
+        DatasetGroupInfoDTO dto = new DatasetGroupInfoDTO();
+        BeanUtils.copyBean(dto, coreDatasetGroup);
+        if (StringUtils.equalsIgnoreCase(dto.getNodeType(), "dataset")) {
+            dto.setUnion(JsonUtil.parseList(coreDatasetGroup.getInfo(), new TypeReference<>() {
+            }));
+            // 获取field
+            List<DatasetTableFieldDTO> dsFields = datasetTableFieldManage.selectByDatasetGroupId(id);
+            List<DatasetTableFieldDTO> allFields = dsFields.stream().map(ele -> {
+                DatasetTableFieldDTO datasetTableFieldDTO = new DatasetTableFieldDTO();
+                BeanUtils.copyBean(datasetTableFieldDTO, ele);
+                datasetTableFieldDTO.setFieldShortName(ele.getDataeaseName());
+                return datasetTableFieldDTO;
+            }).collect(Collectors.toList());
+
+            dto.setAllFields(allFields);
+        }
+        return dto;
+    }
+
     public DatasetGroupInfoDTO get(Long id, String type) throws Exception {
         CoreDatasetGroup coreDatasetGroup = coreDatasetGroupMapper.selectById(id);
         if (coreDatasetGroup == null) {
diff --git a/de-xpack b/de-xpack
index a6f7aa3f64..9088bf9f2f 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit a6f7aa3f644fe258d9ed14cca420c3f6c4aeb1cd
+Subproject commit 9088bf9f2fcea60e26db765c1307b04e6567cf93