public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-15 05:22:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13725 from dataease/pr@dev-v2@perf_auth_weight

Browse Source 
perf: 社区版默认资源权重
This commit is contained in:
xuwei-fit2cloud
2024-12-02 15:52:33 +08:00
committed by GitHub
parent 345496c71f bc777cac25
commit 40404f29c0
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetGroupManage.java
View File

@@ -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) {

2
core/core-backend/src/main/java/io/dataease/datasource/manage/DataSourceManage.java
View File

@@ -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)

2
core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationManage.java
View File

@@ -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() {

10
core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java
View File

@@ -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<VisualizationResourceVO> result = coreVisualizationManage.query(1, 20, request);
List<VisualizationResourceVO> 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();

2
de-xpack

Submodule de-xpack updated: ef5980c7a7...eef0675804