From 16353bb0507b8b01029f1d48f38f09da17046976 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Fri, 9 Aug 2024 15:54:18 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E3=80=90=E6=95=B0=E6=8D=AE=E6=BA=90?= =?UTF-8?q?=E3=80=91-=E4=BB=8E=E7=A4=BE=E5=8C=BA=E7=89=88=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E5=88=B0=E4=BC=81=E4=B8=9A=E7=89=88=EF=BC=8C=E5=8E=86?= =?UTF-8?q?=E5=8F=B2Excel=E6=95=B0=E6=8D=AE=E6=BA=90=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E4=BF=9D=E7=95=99=E5=90=8E=EF=BC=8C=E5=9B=BE=E6=A0=87=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/rmonitor/manage/ResourceMonitorManage.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/core-backend/src/main/java/io/dataease/rmonitor/manage/ResourceMonitorManage.java b/core/core-backend/src/main/java/io/dataease/rmonitor/manage/ResourceMonitorManage.java index d234616ea9..a68d22d67e 100644 --- a/core/core-backend/src/main/java/io/dataease/rmonitor/manage/ResourceMonitorManage.java +++ b/core/core-backend/src/main/java/io/dataease/rmonitor/manage/ResourceMonitorManage.java @@ -1,5 +1,6 @@ package io.dataease.rmonitor.manage; +import io.dataease.constant.DataSourceType; import io.dataease.exception.DEException; import io.dataease.rmonitor.bo.PerMonitorCheckBO; import io.dataease.rmonitor.bo.PerMonitorNodeBO; @@ -45,6 +46,7 @@ public class ResourceMonitorManage { List dsBos = dsFreeResources.stream().map(node -> { PerMonitorNodeBO bo = BeanUtils.copyBean(new PerMonitorNodeBO(), node); bo.setLeaf(!StringUtils.equals("folder", node.getType())); + bo.setExtraFlag(DataSourceType.valueOf(node.getType()).getFlag()); return bo; }).collect(Collectors.toList()); List dsTree = TreeUtils.mergeTree(dsBos, PerMonitorNodeBO.class, false); @@ -79,7 +81,7 @@ public class ResourceMonitorManage { } private String convertBusiFlag(String key) { - if (StringUtils.equals("dashboard", key)){ + if (StringUtils.equals("dashboard", key)) { return "panel"; } else if (StringUtils.equals("dataV", key)) { return "screen";