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

refactor: 应用模板兼容跨源标志

Browse Source
This commit is contained in:
wangjiahao
2025-04-16 16:27:04 +08:00
committed by 王嘉豪
parent cacdced2af
commit daec6f519a
4 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetSQLManage.java
View File

@@ -557,12 +557,16 @@ public class DatasetSQLManage {
public void datasetCrossDefault() {
List<DatasetGroupInfoDTO> allList = datasetGroupManage.getAllList();
for (DatasetGroupInfoDTO ele : allList) {
Set<Long> allDs = getAllDs(ele.getUnion());
boolean isCross = allDs.size() > 1;
ele.setIsCross(isCross);
mergeDatasetCrossDefault(ele);
CoreDatasetGroup record = new CoreDatasetGroup();
BeanUtils.copyBean(record, ele);
coreDatasetGroupMapper.updateById(record);
}
}
public void mergeDatasetCrossDefault(DatasetGroupInfoDTO ele) {
Set<Long> allDs = getAllDs(ele.getUnion());
boolean isCross = allDs.size() > 1;
ele.setIsCross(isCross);
}
}

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

@@ -2,7 +2,9 @@ package io.dataease.visualization.server;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.fasterxml.jackson.core.type.TypeReference;
import io.dataease.api.dataset.union.DatasetGroupInfoDTO;
import io.dataease.api.dataset.union.UnionDTO;
import io.dataease.api.template.dto.TemplateManageFileDTO;
import io.dataease.api.template.dto.VisualizationTemplateExtendDataDTO;
import io.dataease.api.visualization.DataVisualizationApi;
@@ -29,6 +31,7 @@ import io.dataease.dataset.dao.auto.mapper.CoreDatasetTableFieldMapper;
import io.dataease.dataset.dao.auto.mapper.CoreDatasetTableMapper;
import io.dataease.dataset.manage.DatasetDataManage;
import io.dataease.dataset.manage.DatasetGroupManage;
import io.dataease.dataset.manage.DatasetSQLManage;
import io.dataease.dataset.utils.DatasetUtils;
import io.dataease.datasource.dao.auto.entity.CoreDatasource;
import io.dataease.datasource.dao.auto.mapper.CoreDatasourceMapper;
@@ -155,6 +158,8 @@ public class DataVisualizationServer implements DataVisualizationApi {
private SnapshotDataVisualizationInfoMapper snapshotMapper;
@Resource
private ExtChartViewMapper extChartViewMapper;
@Resource
private DatasetSQLManage datasetSQLManage;
@Override
public DataVisualizationVO findCopyResource(Long dvId, String busiFlag) {
@@ -381,6 +386,13 @@ public class DataVisualizationServer implements DataVisualizationApi {
dsGroup.setName(dsGroup.getName() + "-" + UUID.randomUUID().toString());
}
dsGroupNameSave.add(dsGroup.getName());
if(dsGroup.getIsCross() == null){
if(dsGroup.getUnion() == null){
dsGroup.setUnion(JsonUtil.parseList(dsGroup.getInfo(), new TypeReference<>() {
}));
}
datasetSQLManage.mergeDatasetCrossDefault(dsGroup);
}
datasetGroupManage.innerSave(dsGroup);
});

5
sdk/api/api-base/src/main/java/io/dataease/api/dataset/vo/CoreDatasetGroupVO.java
View File

@@ -88,6 +88,11 @@ public class CoreDatasetGroupVO implements Serializable {
*/
private String unionSql;
/**
* 是否跨源
*/
private Boolean isCross;
private List<CoreDatasetTableFieldVO> datasetFields = new ArrayList<>();
private List<ChartBaseVO> datasetViews = new ArrayList<>();

5
sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/AppCoreDatasetGroupVO.java
View File

@@ -84,4 +84,9 @@ public class AppCoreDatasetGroupVO implements Serializable {
* 关联sql
*/
private String unionSql;
/**
* 是否跨源
*/
private Boolean isCross;
}