From bc777cac252569c78d6dcab3021bfe308fdc6845 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Mon, 2 Dec 2024 15:41:45 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E7=A4=BE=E5=8C=BA=E7=89=88=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E8=B5=84=E6=BA=90=E6=9D=83=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/dataset/manage/DatasetGroupManage.java | 2 +- .../dataease/datasource/manage/DataSourceManage.java | 2 +- .../visualization/manage/CoreVisualizationManage.java | 2 +- .../visualization/server/DataVisualizationServer.java | 10 +++++----- de-xpack | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetGroupManage.java b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetGroupManage.java index 1204c6250a..6ebe0c1994 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetGroupManage.java +++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetGroupManage.java @@ -288,7 +288,7 @@ public class DatasetGroupManage { } private DataSetNodeBO convert(DataSetNodePO po) { - return new DataSetNodeBO(po.getId(), po.getName(), StringUtils.equals(po.getNodeType(), leafType), 7, po.getPid(), 0); + return new DataSetNodeBO(po.getId(), po.getName(), StringUtils.equals(po.getNodeType(), leafType), 9, po.getPid(), 0); } public void checkName(DatasetGroupInfoDTO dto) { diff --git a/core/core-backend/src/main/java/io/dataease/datasource/manage/DataSourceManage.java b/core/core-backend/src/main/java/io/dataease/datasource/manage/DataSourceManage.java index 8e3540bec6..a2d3904238 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/manage/DataSourceManage.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/manage/DataSourceManage.java @@ -54,7 +54,7 @@ public class DataSourceManage { } Integer flag = dataSourceType.getFlag(); int extraFlag = StringUtils.equalsIgnoreCase("error", po.getStatus()) ? Math.negateExact(flag) : flag; - return new DatasourceNodeBO(po.getId(), po.getName(), !StringUtils.equals(po.getType(), "folder"), 7, po.getPid(), extraFlag, dataSourceType.name()); + return new DatasourceNodeBO(po.getId(), po.getName(), !StringUtils.equals(po.getType(), "folder"), 9, po.getPid(), extraFlag, dataSourceType.name()); } @XpackInteract(value = "datasourceResourceTree", replace = true, invalid = true) diff --git a/core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationManage.java b/core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationManage.java index 08749ef3b0..7b55e015af 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationManage.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationManage.java @@ -155,7 +155,7 @@ public class CoreVisualizationManage { } private VisualizationNodeBO convert(VisualizationNodePO po) { - return new VisualizationNodeBO(po.getId(), po.getName(), StringUtils.equals(po.getNodeType(), "leaf"), 7, po.getPid(), po.getExtraFlag()); + return new VisualizationNodeBO(po.getId(), po.getName(), StringUtils.equals(po.getNodeType(), "leaf"), 9, po.getPid(), po.getExtraFlag()); } public CoreVisualizationManage proxy() { diff --git a/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java b/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java index 6b5d8f4fb4..a7cbc2028c 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java @@ -59,7 +59,6 @@ import io.dataease.visualization.utils.VisualizationUtils; import jakarta.annotation.Resource; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.checkerframework.checker.units.qual.C; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; @@ -187,6 +186,7 @@ public class DataVisualizationServer implements DataVisualizationApi { result.setWatermarkInfo(watermarkInfo); } } + result.setWeight(9); return result; } else { DEException.throwException("资源不存在或已经被删除..."); @@ -529,10 +529,10 @@ public class DataVisualizationServer implements DataVisualizationApi { request.setQueryFrom("recent"); IPage result = coreVisualizationManage.query(1, 20, request); List resourceVOS = result.getRecords(); - if(!CollectionUtils.isEmpty(resourceVOS)){ - resourceVOS.stream().forEach(item ->{ - item.setCreator(StringUtils.equals(item.getCreator(), "1")?item.getCreator():"管理员"); - item.setLastEditor(StringUtils.equals(item.getLastEditor(), "1")?item.getLastEditor():"管理员"); + if (!CollectionUtils.isEmpty(resourceVOS)) { + resourceVOS.stream().forEach(item -> { + item.setCreator(StringUtils.equals(item.getCreator(), "1") ? item.getCreator() : "管理员"); + item.setLastEditor(StringUtils.equals(item.getLastEditor(), "1") ? item.getLastEditor() : "管理员"); }); } return result.getRecords(); diff --git a/de-xpack b/de-xpack index ef5980c7a7..eef0675804 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit ef5980c7a78b82eb17c9a1376ad7258806014636 +Subproject commit eef06758048f8e06d1ec2f567cdc33db326b7ae5