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

fix: 修复部分应用使用数据集匹配时未匹配计算字段问题 (#17187)

Browse Source
This commit is contained in:
王嘉豪
2025-10-15 11:27:19 +08:00
committed by GitHub
parent 15660b7c15
commit b46f758399
1 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -237,7 +237,7 @@ public class DataVisualizationServer implements DataVisualizationApi {
return null;
}
private void appDatasetMatch(VisualizationExport2AppVO appData, Map<Long, Long> datasourceIdMap, Map<Long, Long> dsGroupIdMap, Map<Long, Long> dsTableIdMap, Map<Long, Long> dsTableFieldsIdMap) {
private void appDatasetMatch(VisualizationExport2AppVO appData, Map<Long, Long> datasourceIdMap, Map<Long, Long> dsGroupIdMap, Map<Long, Long> dsTableIdMap, Map<Long, Long> dsTableFieldsIdMap,Map<String, String> dsTableFieldsDatasetNameMap) {
List<AppCoreDatasetGroupVO> sourceDatasetGroupList = appData.getDatasetGroupsInfo();
List<AppCoreDatasetTableVO> sourceDatasetTableList = appData.getDatasetTablesInfo();
@@ -249,6 +249,10 @@ public class DataVisualizationServer implements DataVisualizationApi {
Map<Long, List<AppCoreDatasetTableFieldVO>> sourceDatasetTableFieldMap =
DeCollectionUtils.groupBy(sourceDatasetTableFieldList, AppCoreDatasetTableFieldVO::getDatasetTableId);
Map<Long, List<AppCoreDatasetTableFieldVO>> sourceDatasetTableFieldMapGroup =
DeCollectionUtils.groupBy(sourceDatasetTableFieldList, AppCoreDatasetTableFieldVO::getDatasetGroupId);
sourceDatasetGroupList.forEach(sourceDatasetGroup -> {
Long systemDatasetGroupId = sourceDatasetGroup.getSystemDatasetId();
Long sourceDatasetGroupId = sourceDatasetGroup.getId();
@@ -280,6 +284,25 @@ public class DataVisualizationServer implements DataVisualizationApi {
if (sourceTableField.getOriginName().equals(systemTableField.getOriginName())) {
// 获取dsTableIdMap datasourceIdMap
dsTableFieldsIdMap.put(sourceTableField.getId(), systemTableField.getId());
dsTableFieldsDatasetNameMap.put(sourceTableField.getDataeaseName(),systemTableField.getDataeaseName());
break;
}
}
}
// 获取 dsTableFieldsIdMapGroup 进行二次匹配 解决计算字段没有tableId 问题
List<AppCoreDatasetTableFieldVO> sourceDatasetTableFieldListSubGroup = sourceDatasetTableFieldMapGroup.get(sourceTable.getDatasetGroupId());
QueryWrapper<CoreDatasetTableField> wrapperFieldGroup = new QueryWrapper<>();
wrapperFieldGroup.eq("dataset_group_id", systemTable.getDatasetGroupId());
List<CoreDatasetTableField> systemDatasetTableFieldSubGroup = coreDatasetTableFieldMapper.selectList(wrapperFieldGroup);
for (AppCoreDatasetTableFieldVO sourceTableField : sourceDatasetTableFieldListSubGroup) {
for (CoreDatasetTableField systemTableField : systemDatasetTableFieldSubGroup) {
if (dsTableFieldsIdMap.get(sourceTableField.getId())==null && sourceTableField.getName().equals(systemTableField.getName())) {
// 获取dsTableIdMap datasourceIdMap
dsTableFieldsIdMap.put(sourceTableField.getId(), systemTableField.getId());
dsTableFieldsDatasetNameMap.put(sourceTableField.getDataeaseName(),systemTableField.getDataeaseName());
break;
}
}
@@ -316,6 +339,7 @@ public class DataVisualizationServer implements DataVisualizationApi {
List<DatasetGroupInfoDTO> newDsGroupInfo = new ArrayList<>();
Map<Long, Long> dsTableIdMap = new HashMap<>();
Map<Long, Long> dsTableFieldsIdMap = new HashMap<>();
Map<String, String> dsTableFieldsDatasetNameMap = new HashMap<>();
List<CoreDatasetTableField> dsTableFieldsList = new ArrayList();
Map<Long, Long> datasourceIdMap = new HashMap<>();
Map<Long, Map<String, String>> dsTableNamesMap = new HashMap<>();
@@ -325,7 +349,7 @@ public class DataVisualizationServer implements DataVisualizationApi {
if (appData != null) {
isAppSave = true;
if ("dataset".equals(request.getDataType())) {
appDatasetMatch(appData, datasourceIdMap, dsGroupIdMap, dsTableIdMap, dsTableFieldsIdMap);
appDatasetMatch(appData, datasourceIdMap, dsGroupIdMap, dsTableIdMap, dsTableFieldsIdMap,dsTableFieldsDatasetNameMap);
} else {
try {
List<AppCoreDatasourceVO> appCoreDatasourceVO = appData.getDatasourceInfo();
@@ -537,6 +561,9 @@ public class DataVisualizationServer implements DataVisualizationApi {
dsGroupIdMap.forEach((key, value) -> {
mutableViewInfoStr.set(mutableViewInfoStr.get().replaceAll(key.toString(), value.toString()));
});
dsTableFieldsDatasetNameMap.forEach((key, value) -> {
mutableViewInfoStr.set(mutableViewInfoStr.get().replaceAll(key, value));
});
canvasViewsStr.put(viewId, mutableViewInfoStr.get());
});
canvasViews = VisualizationUtils.viewTransToObj(canvasViewsStr);