From 0f7adb02f6de75c25d2eb082fe068481904837ca Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 18 Nov 2024 16:24:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E3=80=90=E6=95=B0=E6=8D=AE=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E4=B8=AD=E5=BF=83=E3=80=91=E4=BF=AE=E5=A4=8D=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E8=A7=86=E5=9B=BE=E8=B7=AF=E5=BE=84=E5=87=BA=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/DataVisualizationServer.java | 30 +++++++------------ 1 file changed, 10 insertions(+), 20 deletions(-) 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 9c341b14bd..06eff1e74e 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 @@ -234,8 +234,7 @@ public class DataVisualizationServer implements DataVisualizationApi { } } }); - datasourceIdMap.putAll(appData.getDatasourceInfo().stream() - .collect(Collectors.toMap(AppCoreDatasourceVO::getId, AppCoreDatasourceVO::getSystemDatasourceId))); + datasourceIdMap.putAll(appData.getDatasourceInfo().stream().collect(Collectors.toMap(AppCoreDatasourceVO::getId, AppCoreDatasourceVO::getSystemDatasourceId))); Long datasetFolderPid = request.getDatasetFolderPid(); String datasetFolderName = request.getDatasetFolderName(); //新建数据集分组 @@ -327,8 +326,8 @@ public class DataVisualizationServer implements DataVisualizationApi { } }); - if(dsGroupNameSave.contains(dsGroup.getName())){ - dsGroup.setName(dsGroup.getName()+"-"+UUID.randomUUID().toString()); + if (dsGroupNameSave.contains(dsGroup.getName())) { + dsGroup.setName(dsGroup.getName() + "-" + UUID.randomUUID().toString()); } dsGroupNameSave.add(dsGroup.getName()); datasetGroupManage.innerSave(dsGroup); @@ -727,26 +726,19 @@ public class DataVisualizationServer implements DataVisualizationApi { List linkJumpInfoVOInfo = appTemplateMapper.findAppLinkJumpInfoInfo(dvId); List listJumpTargetViewInfoVO = appTemplateMapper.findAppLinkJumpTargetViewInfoInfo(dvId); - return new VisualizationExport2AppVO(chartViewVOInfo, datasetGroupVOInfo, datasetTableVOInfo, - datasetTableFieldVOInfo, datasourceVOInfo, datasourceTaskVOInfo, - linkJumpVOInfo, linkJumpInfoVOInfo, listJumpTargetViewInfoVO, linkageVOInfo, linkageFieldVOInfo); + return new VisualizationExport2AppVO(chartViewVOInfo, datasetGroupVOInfo, datasetTableVOInfo, datasetTableFieldVOInfo, datasourceVOInfo, datasourceTaskVOInfo, linkJumpVOInfo, linkJumpInfoVOInfo, listJumpTargetViewInfoVO, linkageVOInfo, linkageFieldVOInfo); } @Override public void nameCheck(DataVisualizationBaseRequest request) { QueryWrapper wrapper = new QueryWrapper<>(); - if (DataVisualizationConstants.RESOURCE_OPT_TYPE.MOVE.equals(request.getOpt()) - || DataVisualizationConstants.RESOURCE_OPT_TYPE.RENAME.equals(request.getOpt()) - || DataVisualizationConstants.RESOURCE_OPT_TYPE.EDIT.equals(request.getOpt()) - || DataVisualizationConstants.RESOURCE_OPT_TYPE.COPY.equals(request.getOpt())) { + if (DataVisualizationConstants.RESOURCE_OPT_TYPE.MOVE.equals(request.getOpt()) || DataVisualizationConstants.RESOURCE_OPT_TYPE.RENAME.equals(request.getOpt()) || DataVisualizationConstants.RESOURCE_OPT_TYPE.EDIT.equals(request.getOpt()) || DataVisualizationConstants.RESOURCE_OPT_TYPE.COPY.equals(request.getOpt())) { if (request.getPid() == null) { DataVisualizationInfo result = visualizationInfoMapper.selectById(request.getId()); request.setPid(result.getPid()); } - if (DataVisualizationConstants.RESOURCE_OPT_TYPE.MOVE.equals(request.getOpt()) - || DataVisualizationConstants.RESOURCE_OPT_TYPE.RENAME.equals(request.getOpt()) - || DataVisualizationConstants.RESOURCE_OPT_TYPE.EDIT.equals(request.getOpt())) { + if (DataVisualizationConstants.RESOURCE_OPT_TYPE.MOVE.equals(request.getOpt()) || DataVisualizationConstants.RESOURCE_OPT_TYPE.RENAME.equals(request.getOpt()) || DataVisualizationConstants.RESOURCE_OPT_TYPE.EDIT.equals(request.getOpt())) { wrapper.ne("id", request.getId()); } } @@ -793,12 +785,10 @@ public class DataVisualizationServer implements DataVisualizationApi { } public void getParent(List list, DataVisualizationInfo dataVisualizationInfo) { - if (ObjectUtils.isNotEmpty(dataVisualizationInfo)) { - if (dataVisualizationInfo.getPid() != null) { - DataVisualizationInfo d = visualizationInfoMapper.selectById(dataVisualizationInfo.getPid()); - list.add(d); - getParent(list, d); - } + if (ObjectUtils.isNotEmpty(dataVisualizationInfo) && dataVisualizationInfo.getPid() != null && !dataVisualizationInfo.getPid().equals(dataVisualizationInfo.getId())) { + DataVisualizationInfo d = visualizationInfoMapper.selectById(dataVisualizationInfo.getPid()); + list.add(d); + getParent(list, d); } } From 75561c6e8fd8573e5bb14dcc1f402887283c1b96 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 18 Nov 2024 16:37:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E8=B0=83=E8=AF=95=E6=89=A7=E8=A1=8C=E6=88=90=E5=8A=9F?= =?UTF-8?q?=EF=BC=8C=E4=BF=9D=E5=AD=98=E6=8A=A5=E9=94=99=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=8F=82=E6=95=B0=E4=B9=9F=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=88=90=E5=8A=9F=20#13317?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/dataease/commons/utils/SqlparserUtils.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/core-backend/src/main/java/io/dataease/commons/utils/SqlparserUtils.java b/core/core-backend/src/main/java/io/dataease/commons/utils/SqlparserUtils.java index 0b25d9a53f..53b54bc5b8 100644 --- a/core/core-backend/src/main/java/io/dataease/commons/utils/SqlparserUtils.java +++ b/core/core-backend/src/main/java/io/dataease/commons/utils/SqlparserUtils.java @@ -507,6 +507,12 @@ public class SqlparserUtils { if (StringUtils.isEmpty(sql)) { DEException.throwException(Translator.get("i18n_sql_not_empty")); } + try { + removeVariables(sql, ""); + } catch (Exception e) { + DEException.throwException(e); + } + sql = sql.trim(); if (sql.endsWith(";")) { sql = sql.substring(0, sql.length() - 1);