center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #11470 from dataease/pr@dev-v2@fixDS

Browse Source 
fix: 【数据源】-从社区版升级到企业版，历史Excel数据源同步保留后，图标错误
This commit is contained in:
taojinlong 2024-08-09 15:56:11 +08:00 committed by GitHub
commit 20afdbd169
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/core-backend/src/main/java/io/dataease/rmonitor/manage/ResourceMonitorManage.java
View File

@ -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<PerMonitorNodeBO> 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<PerMonitorNodeBO> 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";