From 0580dee825cc67483c5531c19e97d35c354cee7b Mon Sep 17 00:00:00 2001 From: Raod <1130305001@qq.com> Date: Tue, 28 Sep 2021 16:52:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=BD=B4=E9=81=8D=E5=8E=86?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ReportDashboardServiceImpl.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/ReportDashboardServiceImpl.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/ReportDashboardServiceImpl.java index e4ba8dd8..4210fc0d 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/ReportDashboardServiceImpl.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/ReportDashboardServiceImpl.java @@ -446,14 +446,19 @@ public class ReportDashboardServiceImpl implements ReportDashboardService, Initi return data; } //获取时间轴字段和解析时间颗粒度 - chartProperties.forEach((key, value) -> { + + for (Map.Entry entry : chartProperties.entrySet()) { + String key = entry.getKey(); + String value = entry.getValue(); dto.setParticles(value); setTimeLineFormat(dto); if (StringUtils.isNotBlank(dto.getDataTimeFormat())) { dto.setTimeLineFiled(key); - return; + break; } - }); + + } + if (StringUtils.isBlank(dto.getDataTimeFormat())) { return data;