fix: 修复app应用中包括excel自定义数据集时没有自动替换自定义sql中的表名问题

ziyujiahao · xuwei-fit2cloud · commit 9c81a7220b68 · 2025-04-23T16:55:33.000+08:00
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
@@ -4,6 +4,7 @@
 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.DatasetTableInfoDTO;
 import io.dataease.api.dataset.union.UnionDTO;
 import io.dataease.api.template.dto.TemplateManageFileDTO;
 import io.dataease.api.template.dto.VisualizationTemplateExtendDataDTO;
@@ -38,6 +39,7 @@
 import io.dataease.datasource.provider.ExcelUtils;
 import io.dataease.datasource.server.DatasourceServer;
 import io.dataease.exception.DEException;
+import io.dataease.extensions.datasource.dto.DatasetTableDTO;
 import io.dataease.extensions.datasource.vo.DatasourceConfiguration;
 import io.dataease.extensions.view.dto.ChartViewDTO;
 import io.dataease.i18n.Translator;
@@ -257,11 +259,12 @@ public String saveCanvas(DataVisualizationBaseRequest request) throws Exception
         Map<Long, Long> datasourceIdMap = new HashMap<>();
         Map<Long, Map<String, String>> dsTableNamesMap = new HashMap<>();
         List<Long> newDatasourceId = new ArrayList<>();
+        List<Long> excelDatasourceId = new ArrayList<>();
+        Map<String, String> excelTableNamesMap = new HashMap<>();
         if (appData != null) {
             isAppSave = true;
             try {
                 List<AppCoreDatasourceVO> appCoreDatasourceVO = appData.getDatasourceInfo();
-
                 //  app 数据源 excel 表名映射
                 appCoreDatasourceVO.forEach(datasourceOld -> {
                     newDatasourceId.add(datasourceOld.getSystemDatasourceId());
@@ -283,6 +286,7 @@ public String saveCanvas(DataVisualizationBaseRequest request) throws Exception
                     if (StringUtils.isNotEmpty(datasourceNew.getConfiguration())) {
                         if (datasourceNew.getType().equals(DatasourceConfiguration.DatasourceType.Excel.name())) {
                             dsTableNamesMap.put(datasourceNew.getId(), ExcelUtils.getTableNamesMap(datasourceNew.getType(), datasourceNew.getConfiguration()));
+                            excelDatasourceId.add(datasourceNew.getId());
                         } else if (datasourceNew.getType().contains(DatasourceConfiguration.DatasourceType.API.name())) {
                             dsTableNamesMap.put(datasourceNew.getId(), (Map<String, String>) datasourceServer.invokeMethod(datasourceNew.getType(), "getTableNamesMap", String.class, datasourceNew.getConfiguration()));
                         }
@@ -375,6 +379,7 @@ public String saveCanvas(DataVisualizationBaseRequest request) throws Exception
                             appDsTableNamesMap.forEach((keyName, valueName) -> {
                                 if (MapUtils.isNotEmpty(systemDsTableNamesMap) && StringUtils.isNotEmpty(systemDsTableNamesMap.get(keyName))) {
                                     dsGroup.setInfo(dsGroup.getInfo().replaceAll(valueName, systemDsTableNamesMap.get(keyName)));
+                                    excelTableNamesMap.put(valueName, systemDsTableNamesMap.get(keyName));
                                 } else {
                                     dsGroup.setInfo(dsGroup.getInfo().replaceAll(valueName, "excel_can_not_find"));
                                 }
@@ -393,6 +398,7 @@ public String saveCanvas(DataVisualizationBaseRequest request) throws Exception
                         }
                         datasetSQLManage.mergeDatasetCrossDefault(dsGroup);
                     }
+                    excelAdaptor(dsGroup,excelTableNamesMap,excelDatasourceId);
                     datasetGroupManage.innerSave(dsGroup);
                 });
 
@@ -481,6 +487,26 @@ public String saveCanvas(DataVisualizationBaseRequest request) throws Exception
         return newDvId.toString();
     }
 
+    private void excelAdaptor(DatasetGroupInfoDTO dsInfo,Map<String, String> excelTableNamesMap ,List<Long> excelDsId) {
+        List<UnionDTO> unionDTOList = JsonUtil.parseList(dsInfo.getInfo(), new TypeReference<>() {
+        });
+        if(CollectionUtils.isNotEmpty(excelDsId) && MapUtils.isNotEmpty(excelTableNamesMap)){
+            for(UnionDTO unionDTO : unionDTOList) {
+                DatasetTableDTO tableDTO =unionDTO.getCurrentDs();
+                if(excelDsId.contains(tableDTO.getDatasourceId())){
+                    DatasetTableInfoDTO infoDTO = JsonUtil.parseObject(tableDTO.getInfo(), DatasetTableInfoDTO.class);
+                    String s = new String(Base64.getDecoder().decode(infoDTO.getSql()));
+                    excelTableNamesMap.forEach((key, value) -> {
+                        infoDTO.setSql(Base64.getEncoder().encodeToString(s.replaceAll(key, value).getBytes()));
+                    });
+                    tableDTO.setInfo((String)JsonUtil.toJSONString(infoDTO));
+                }
+
+            }
+        }
+        dsInfo.setInfo((String)JsonUtil.toJSONString(unionDTOList));
+    }
+
     @Override
     public String appCanvasNameCheck(DataVisualizationBaseRequest request) throws Exception {
         Long datasetFolderPid = request.getDatasetFolderPid();
