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> listByDQ(Long id, Long chartId, ChartViewDTO chartViewDTO) { QueryWrapper 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 data = null; if (ObjectUtils.isEmpty(chart) || MapUtils.isEmpty(data = chart.getData())) { return new ThresholdCheckVO(false, null, "查询图表异常!", null);