From 00c1700544ab142c4ec14cd7aed5560b2136f8be Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 25 Jun 2025 14:20:27 +0800
Subject: [PATCH] =?UTF-8?q?fix(X-Pack):=20=E9=98=88=E5=80=BC=E5=91=8A?=
 =?UTF-8?q?=E8=AD=A6-=E8=A1=A8=E6=A0=BC=E5=9C=BA=E6=99=AF=E4=BB=85?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=AC=AC=E4=B8=80=E9=A1=B5=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chart/manage/ChartViewManege.java         | 20 ++++++++++++++++---
 .../manage/ChartViewThresholdManage.java      |  2 +-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java
index 06d44c441c..efe3f59eea 100644
--- a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java
+++ b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java
@@ -224,19 +224,33 @@ public class ChartViewManege {
             return Collections.emptyList();
         }
         return list.stream().map(ele -> {
-            ChartViewDTO dto = transRecord2DTO(ele);
-            return dto;
+            return transRecord2DTO(ele);
         }).collect(Collectors.toList());
     }
 
-    public ChartViewDTO getChart(Long id, String resourceTable) throws Exception {
+    public ChartViewDTO getChart(Long id, String resourceTable, boolean forThreshold) throws Exception {
         ChartViewDTO details = getDetails(id, resourceTable);
         if (details == null) {
             return null;
         }
+        if (forThreshold) {
+            ChartExtRequest chartExtRequest = details.getChartExtRequest();
+            if (chartExtRequest == null) {
+                chartExtRequest = new ChartExtRequest();
+                chartExtRequest.setResultMode("all");
+                chartExtRequest.setResultCount(1000);
+                chartExtRequest.setGoPage(1L);
+                chartExtRequest.setPageSize(50000L);
+            }
+            details.setChartExtRequest(chartExtRequest);
+        }
         return chartDataManage.calcData(details);
     }
 
+    public ChartViewDTO getChart(Long id, String resourceTable) throws Exception {
+        return getChart(id, resourceTable, false);
+    }
+
     public Map<String, List<ChartViewFieldDTO>> listByDQ(Long id, Long chartId, ChartViewDTO chartViewDTO) {
         QueryWrapper<CoreDatasetTableField> wrapper = new QueryWrapper<>();
         wrapper.eq("dataset_group_id", id);
diff --git a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewThresholdManage.java b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewThresholdManage.java
index e28a82a59f..174e085412 100644
--- a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewThresholdManage.java
+++ b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewThresholdManage.java
@@ -252,7 +252,7 @@ public class ChartViewThresholdManage {
         String thresholdRules = request.getThresholdRules();
         Long chartId = request.getChartId();
         try {
-            ChartViewDTO chart = chartViewManege.getChart(chartId, request.getResourceTable());
+            ChartViewDTO chart = chartViewManege.getChart(chartId, request.getResourceTable(), true);
             Map<String, Object> data = null;
             if (ObjectUtils.isEmpty(chart) || MapUtils.isEmpty(data = chart.getData())) {
                 return new ThresholdCheckVO(false, null, "查询图表异常！", null);