diff --git a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java index 42a790e9a1..489d925f52 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java +++ b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java @@ -1,12 +1,8 @@ package io.dataease.chart.manage; -import io.dataease.api.chart.dto.*; -import io.dataease.api.chart.filter.FilterTreeObj; -import io.dataease.api.chart.request.ChartDrillRequest; -import io.dataease.api.chart.request.ChartExtRequest; -import io.dataease.api.dataset.dto.SqlVariableDetails; +import io.dataease.api.chart.dto.ColumnPermissionItem; +import io.dataease.api.chart.dto.PageInfo; import io.dataease.api.dataset.union.DatasetGroupInfoDTO; -import io.dataease.api.dataset.union.model.SQLMeta; import io.dataease.api.permissions.auth.dto.BusiPerCheckDTO; import io.dataease.api.permissions.dataset.dto.DataSetRowPermissionsTreeDTO; import io.dataease.chart.constant.ChartConstants; @@ -20,13 +16,17 @@ import io.dataease.dataset.manage.PermissionManage; import io.dataease.dataset.utils.SqlUtils; import io.dataease.datasource.provider.CalciteProvider; import io.dataease.datasource.request.DatasourceRequest; -import io.dataease.dto.dataset.DatasetTableFieldDTO; import io.dataease.engine.constant.SQLConstants; import io.dataease.engine.sql.SQLProvider; import io.dataease.engine.trans.*; import io.dataease.engine.utils.SQLUtils; import io.dataease.engine.utils.Utils; import io.dataease.exception.DEException; +import io.dataease.extensions.view.dto.*; +import io.dataease.extensions.view.factory.PluginsChartFactory; +import io.dataease.extensions.view.filter.FilterTreeObj; +import io.dataease.extensions.view.model.SQLMeta; +import io.dataease.extensions.view.template.PluginsChartTemplate; import io.dataease.i18n.Translator; import io.dataease.result.ResultCode; import io.dataease.system.manage.CorePermissionManage; @@ -162,73 +162,98 @@ public class ChartDataManage { } public ChartViewDTO calcData(ChartViewDTO view, ChartExtRequest chartExtRequest, List allFields, List viewFields) throws Exception { - - List xAxisBase = new ArrayList<>(view.getXAxis()); - List xAxis = new ArrayList<>(view.getXAxis()); - List xAxisExt = new ArrayList<>(view.getXAxisExt()); - if (StringUtils.equalsIgnoreCase(view.getType(), "table-pivot") - || StringUtils.containsIgnoreCase(view.getType(), "group") - || ("antv".equalsIgnoreCase(view.getRender()) && "line".equalsIgnoreCase(view.getType())) - || StringUtils.equalsIgnoreCase(view.getType(), "flow-map") - || StringUtils.equalsIgnoreCase(view.getType(), "sankey") - || StringUtils.equalsIgnoreCase(view.getType(), "chart-mix") - ) { - xAxis.addAll(xAxisExt); - } - List yAxis = new ArrayList<>(view.getYAxis()); - if (StringUtils.equalsIgnoreCase(view.getType(), "chart-mix") - || StringUtils.equalsIgnoreCase(view.getType(), "bidirectional-bar") - || StringUtils.equalsIgnoreCase(view.getType(), "quadrant") - || StringUtils.containsIgnoreCase(view.getType(), "progress-bar")) { - List yAxisExt = new ArrayList<>(view.getYAxisExt()); - yAxis.addAll(yAxisExt); - } - if (StringUtils.equalsIgnoreCase(view.getRender(), "antv") && StringUtils.equalsAnyIgnoreCase(view.getType(), "gauge", "liquid")) { - List sizeField = getSizeField(view); - yAxis.addAll(sizeField); - } + List xAxisBase = null; + List xAxis = null; + List xAxisExt = null; + List yAxis = null; + List extStack = null; + List extBubble = null; + List drill = null; + PluginsChartTemplate instance = null; boolean skipBarRange = false; boolean barRangeDate = false; - if (StringUtils.equalsIgnoreCase(view.getType(), "bar-range")) { //针对区间条形图进行处理 - yAxis.clear(); - if (CollectionUtils.isNotEmpty(view.getYAxis()) && CollectionUtils.isNotEmpty(view.getYAxisExt())) { - ChartViewFieldDTO axis1 = view.getYAxis().get(0); - ChartViewFieldDTO axis2 = view.getYAxisExt().get(0); + if (ObjectUtils.isNotEmpty(view.getIsPlugin()) && view.getIsPlugin()) { + instance = PluginsChartFactory.getInstance(view.getRender(), view.getType()); + String key = view.getRender() + "_" + view.getType(); + if (ObjectUtils.isEmpty(instance)) DEException.throwException(String.format("此视图插件【%s】不存在！", key)); + Map> axisMap = instance.formatChartAxis(view); + xAxisBase = axisMap.get("axisMap"); + xAxis = axisMap.get("xAxis"); + xAxisExt = axisMap.get("xAxisExt"); + yAxis = axisMap.get("yAxis"); + extStack = axisMap.get("extStack"); + extBubble = axisMap.get("extBubble"); + drill = axisMap.get("drill"); + viewFields = axisMap.get("viewFields"); + } else { + xAxisBase = new ArrayList<>(view.getXAxis()); + xAxis = new ArrayList<>(view.getXAxis()); + xAxisExt = new ArrayList<>(view.getXAxisExt()); + if (StringUtils.equalsIgnoreCase(view.getType(), "table-pivot") + || StringUtils.containsIgnoreCase(view.getType(), "group") + || ("antv".equalsIgnoreCase(view.getRender()) && "line".equalsIgnoreCase(view.getType())) + || StringUtils.equalsIgnoreCase(view.getType(), "flow-map") + || StringUtils.equalsIgnoreCase(view.getType(), "sankey") + || StringUtils.equalsIgnoreCase(view.getType(), "chart-mix") + ) { + xAxis.addAll(xAxisExt); + } + yAxis = new ArrayList<>(view.getYAxis()); + if (StringUtils.equalsIgnoreCase(view.getType(), "chart-mix") + || StringUtils.equalsIgnoreCase(view.getType(), "bidirectional-bar") + || StringUtils.equalsIgnoreCase(view.getType(), "quadrant") + || StringUtils.containsIgnoreCase(view.getType(), "progress-bar")) { + List yAxisExt = new ArrayList<>(view.getYAxisExt()); + yAxis.addAll(yAxisExt); + } + if (StringUtils.equalsIgnoreCase(view.getRender(), "antv") && StringUtils.equalsAnyIgnoreCase(view.getType(), "gauge", "liquid")) { + List sizeField = getSizeField(view); + yAxis.addAll(sizeField); + } - if (StringUtils.equalsIgnoreCase(axis1.getGroupType(), "q") && StringUtils.equalsIgnoreCase(axis2.getGroupType(), "q")) { - yAxis.add(axis1); - yAxis.add(axis2); - } else if (StringUtils.equalsIgnoreCase(axis1.getGroupType(), "d") && axis1.getDeType() == 1 && StringUtils.equalsIgnoreCase(axis2.getGroupType(), "d") && axis2.getDeType() == 1) { - barRangeDate = true; - if (BooleanUtils.isTrue(view.getAggregate())) { - axis1.setSummary("min"); - axis2.setSummary("max"); + if (StringUtils.equalsIgnoreCase(view.getType(), "bar-range")) { //针对区间条形图进行处理 + yAxis.clear(); + if (CollectionUtils.isNotEmpty(view.getYAxis()) && CollectionUtils.isNotEmpty(view.getYAxisExt())) { + ChartViewFieldDTO axis1 = view.getYAxis().get(0); + ChartViewFieldDTO axis2 = view.getYAxisExt().get(0); + + if (StringUtils.equalsIgnoreCase(axis1.getGroupType(), "q") && StringUtils.equalsIgnoreCase(axis2.getGroupType(), "q")) { yAxis.add(axis1); yAxis.add(axis2); + } else if (StringUtils.equalsIgnoreCase(axis1.getGroupType(), "d") && axis1.getDeType() == 1 && StringUtils.equalsIgnoreCase(axis2.getGroupType(), "d") && axis2.getDeType() == 1) { + barRangeDate = true; + if (BooleanUtils.isTrue(view.getAggregate())) { + axis1.setSummary("min"); + axis2.setSummary("max"); + yAxis.add(axis1); + yAxis.add(axis2); + } else { + xAxis.add(axis1); + xAxis.add(axis2); + } } else { - xAxis.add(axis1); - xAxis.add(axis2); + skipBarRange = true; } } else { skipBarRange = true; } - } else { - skipBarRange = true; } - } - List extStack = new ArrayList<>(view.getExtStack()); - List extBubble = new ArrayList<>(view.getExtBubble()); - if (ObjectUtils.isNotEmpty(view.getExtLabel()) && enableExtData(view.getType())) { - List extLabel = new ArrayList<>(view.getExtLabel()); - yAxis.addAll(extLabel); - } - if (ObjectUtils.isNotEmpty(view.getExtTooltip()) && enableExtData(view.getType())) { - List extTooltip = new ArrayList<>(view.getExtTooltip()); - yAxis.addAll(extTooltip); + extStack = new ArrayList<>(view.getExtStack()); + extBubble = new ArrayList<>(view.getExtBubble()); + if (ObjectUtils.isNotEmpty(view.getExtLabel()) && enableExtData(view.getType())) { + List extLabel = new ArrayList<>(view.getExtLabel()); + yAxis.addAll(extLabel); + } + if (ObjectUtils.isNotEmpty(view.getExtTooltip()) && enableExtData(view.getType())) { + List extTooltip = new ArrayList<>(view.getExtTooltip()); + yAxis.addAll(extTooltip); + } + drill = new ArrayList<>(view.getDrillFields()); } FilterTreeObj fieldCustomFilter = view.getCustomFilter(); - List drill = new ArrayList<>(view.getDrillFields()); + + // 以上是formatAxis内容 DatasetGroupInfoDTO table = datasetGroupManage.getDatasetGroupInfoDTO(view.getTableId(), null); if (table == null) { @@ -291,42 +316,43 @@ public class ChartDataManage { chartExtRequest.setPageSize(null); } - switch (view.getType()) { - case "label": - xAxis = xAxis.stream().filter(item -> !desensitizationList.keySet().contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList()); - xAxisBase = xAxisBase.stream().filter(item -> !desensitizationList.keySet().contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList()); - yAxis = new ArrayList<>(); - if (ObjectUtils.isEmpty(xAxis)) { - return emptyChartViewDTO(view); - } - break; - case "indicator": - case "gauge": - case "liquid": - xAxis = new ArrayList<>(); - yAxis = yAxis.stream().filter(item -> !desensitizationList.keySet().contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList()); - if (ObjectUtils.isEmpty(yAxis)) { - return emptyChartViewDTO(view); - } - break; - case "table-info": - yAxis = new ArrayList<>(); - xAxis = xAxis.stream().filter(item -> dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList()); - xAxisBase = xAxisBase.stream().filter(item -> dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList()); - if (ObjectUtils.isEmpty(xAxis)) { - return emptyChartViewDTO(view); - } - break; - case "table-normal": - xAxis = xAxis.stream().filter(item -> dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList()); - xAxisBase = xAxisBase.stream().filter(item -> dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList()); - yAxis = yAxis.stream().filter(item -> dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList()); - break; - default: - xAxis = xAxis.stream().filter(item -> !desensitizationList.keySet().contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList()); - xAxisBase = xAxisBase.stream().filter(item -> !desensitizationList.keySet().contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList()); - yAxis = yAxis.stream().filter(item -> !desensitizationList.keySet().contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList()); - } + if (ObjectUtils.isEmpty(instance)) + switch (view.getType()) { + case "label": + xAxis = xAxis.stream().filter(item -> !desensitizationList.keySet().contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList()); + xAxisBase = xAxisBase.stream().filter(item -> !desensitizationList.keySet().contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList()); + yAxis = new ArrayList<>(); + if (ObjectUtils.isEmpty(xAxis)) { + return emptyChartViewDTO(view); + } + break; + case "indicator": + case "gauge": + case "liquid": + xAxis = new ArrayList<>(); + yAxis = yAxis.stream().filter(item -> !desensitizationList.keySet().contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList()); + if (ObjectUtils.isEmpty(yAxis)) { + return emptyChartViewDTO(view); + } + break; + case "table-info": + yAxis = new ArrayList<>(); + xAxis = xAxis.stream().filter(item -> dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList()); + xAxisBase = xAxisBase.stream().filter(item -> dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList()); + if (ObjectUtils.isEmpty(xAxis)) { + return emptyChartViewDTO(view); + } + break; + case "table-normal": + xAxis = xAxis.stream().filter(item -> dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList()); + xAxisBase = xAxisBase.stream().filter(item -> dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList()); + yAxis = yAxis.stream().filter(item -> dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList()); + break; + default: + xAxis = xAxis.stream().filter(item -> !desensitizationList.keySet().contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList()); + xAxisBase = xAxisBase.stream().filter(item -> !desensitizationList.keySet().contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList()); + yAxis = yAxis.stream().filter(item -> !desensitizationList.keySet().contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList()); + } // 过滤来自仪表板的条件 List extFilterList = new ArrayList<>(); @@ -585,6 +611,10 @@ public class ChartDataManage { CustomWhere2Str.customWhere2sqlObj(sqlMeta, fieldCustomFilter, transFields(allFields), crossDs, dsMap); ExtWhere2Str.extWhere2sqlOjb(sqlMeta, extFilterList, transFields(allFields), crossDs, dsMap); WhereTree2Str.transFilterTrees(sqlMeta, rowPermissionsTree, transFields(allFields), crossDs, dsMap); + Map dsTypeMap = dsMap.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, entry -> entry.getValue().getType())); + if (ObjectUtils.isNotEmpty(instance)) { + return instance.calcResult(sqlMeta, xAxis, yAxis, transFields(allFields), crossDs, dsTypeMap); + } if (StringUtils.equalsAnyIgnoreCase(view.getType(), "indicator", "gauge", "liquid")) { Quota2SQLObj.quota2sqlObj(sqlMeta, yAxis, transFields(allFields), crossDs, dsMap); diff --git a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartFilterTreeService.java b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartFilterTreeService.java index 05e3f3e839..a07279775a 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartFilterTreeService.java +++ b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartFilterTreeService.java @@ -1,10 +1,10 @@ package io.dataease.chart.manage; -import io.dataease.api.chart.filter.FilterTreeItem; -import io.dataease.api.chart.filter.FilterTreeObj; +import io.dataease.extensions.view.filter.FilterTreeItem; +import io.dataease.extensions.view.filter.FilterTreeObj; import io.dataease.dataset.dao.auto.entity.CoreDatasetTableField; import io.dataease.dataset.dao.auto.mapper.CoreDatasetTableFieldMapper; -import io.dataease.dto.dataset.DatasetTableFieldDTO; +import io.dataease.extensions.view.dto.DatasetTableFieldDTO; import io.dataease.engine.utils.SQLUtils; import io.dataease.utils.BeanUtils; import jakarta.annotation.Resource; diff --git a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java index ced37eebcf..b27edb4538 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java +++ b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java @@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import io.dataease.api.chart.dto.*; -import io.dataease.api.chart.filter.FilterTreeObj; +import io.dataease.extensions.view.dto.*; +import io.dataease.extensions.view.filter.FilterTreeObj; import io.dataease.api.chart.vo.ViewSelectorVO; -import io.dataease.api.dataset.union.model.SQLObj; +import io.dataease.extensions.view.model.SQLObj; import io.dataease.chart.dao.auto.entity.CoreChartView; import io.dataease.chart.dao.auto.mapper.CoreChartViewMapper; import io.dataease.chart.dao.ext.mapper.ExtChartViewMapper; @@ -14,7 +15,6 @@ import io.dataease.dataset.dao.auto.entity.CoreDatasetTableField; import io.dataease.dataset.dao.auto.mapper.CoreDatasetTableFieldMapper; import io.dataease.dataset.manage.PermissionManage; import io.dataease.dataset.utils.TableUtils; -import io.dataease.dto.dataset.DatasetTableFieldDTO; import io.dataease.engine.constant.ExtFieldConstant; import io.dataease.engine.func.FunctionConstant; import io.dataease.engine.utils.Utils; diff --git a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewOldDataMergeService.java b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewOldDataMergeService.java index 63c265fd9c..3d026c39d5 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewOldDataMergeService.java +++ b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewOldDataMergeService.java @@ -2,10 +2,10 @@ package io.dataease.chart.manage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fasterxml.jackson.core.type.TypeReference; -import io.dataease.api.chart.dto.ChartCustomFilterItemDTO; -import io.dataease.api.chart.dto.ChartFieldCustomFilterDTO; -import io.dataease.api.chart.filter.FilterTreeItem; -import io.dataease.api.chart.filter.FilterTreeObj; +import io.dataease.extensions.view.dto.ChartCustomFilterItemDTO; +import io.dataease.extensions.view.dto.ChartFieldCustomFilterDTO; +import io.dataease.extensions.view.filter.FilterTreeItem; +import io.dataease.extensions.view.filter.FilterTreeObj; import io.dataease.chart.dao.auto.entity.CoreChartView; import io.dataease.chart.dao.auto.mapper.CoreChartViewMapper; import io.dataease.utils.JsonUtil; diff --git a/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java b/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java index f2cf66a9c5..3cc5b44e44 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java +++ b/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java @@ -1,7 +1,7 @@ package io.dataease.chart.server; import io.dataease.api.chart.ChartDataApi; -import io.dataease.api.chart.dto.ChartViewDTO; +import io.dataease.extensions.view.dto.ChartViewDTO; import io.dataease.api.chart.dto.ViewDetailField; import io.dataease.api.chart.request.ChartExcelRequest; import io.dataease.api.chart.request.ChartExcelRequestInner; diff --git a/core/core-backend/src/main/java/io/dataease/chart/server/ChartViewServer.java b/core/core-backend/src/main/java/io/dataease/chart/server/ChartViewServer.java index 383ba7dbb3..d998eb9b6e 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/server/ChartViewServer.java +++ b/core/core-backend/src/main/java/io/dataease/chart/server/ChartViewServer.java @@ -1,8 +1,8 @@ package io.dataease.chart.server; import io.dataease.api.chart.ChartViewApi; -import io.dataease.api.chart.dto.ChartViewDTO; -import io.dataease.api.chart.dto.ChartViewFieldDTO; +import io.dataease.extensions.view.dto.ChartViewDTO; +import io.dataease.extensions.view.dto.ChartViewFieldDTO; import io.dataease.api.chart.vo.ViewSelectorVO; import io.dataease.chart.manage.ChartViewManege; import io.dataease.exception.DEException; diff --git a/core/core-backend/src/main/java/io/dataease/chart/utils/ChartDataBuild.java b/core/core-backend/src/main/java/io/dataease/chart/utils/ChartDataBuild.java index 58ebef4c2c..b83f828892 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/utils/ChartDataBuild.java +++ b/core/core-backend/src/main/java/io/dataease/chart/utils/ChartDataBuild.java @@ -1,6 +1,9 @@ package io.dataease.chart.utils; import io.dataease.api.chart.dto.*; +import io.dataease.extensions.view.dto.ChartDimensionDTO; +import io.dataease.extensions.view.dto.ChartViewDTO; +import io.dataease.extensions.view.dto.ChartViewFieldDTO; import io.dataease.i18n.Lang; import io.dataease.i18n.Translator; import io.dataease.utils.IDUtils; 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 89a4cb9395..83c744b1f4 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 @@ -1,7 +1,7 @@ package io.dataease.commons.utils; import com.fasterxml.jackson.core.type.TypeReference; -import io.dataease.api.dataset.dto.SqlVariableDetails; +import io.dataease.extensions.view.dto.SqlVariableDetails; import io.dataease.api.ds.vo.DatasourceConfiguration; import io.dataease.dataset.dto.DatasourceSchemaDTO; import io.dataease.exception.DEException; diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java index 04a67bcaba..6fe82437da 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java +++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java @@ -1,13 +1,13 @@ package io.dataease.dataset.manage; -import io.dataease.api.chart.dto.ChartExtFilterDTO; +import io.dataease.extensions.view.dto.ChartExtFilterDTO; import io.dataease.api.chart.dto.ColumnPermissionItem; import io.dataease.api.chart.dto.DeSortField; -import io.dataease.api.chart.request.ChartExtRequest; +import io.dataease.extensions.view.dto.ChartExtRequest; import io.dataease.api.dataset.dto.*; import io.dataease.api.dataset.union.DatasetGroupInfoDTO; import io.dataease.api.dataset.union.DatasetTableInfoDTO; -import io.dataease.api.dataset.union.model.SQLMeta; +import io.dataease.extensions.view.model.SQLMeta; import io.dataease.api.ds.vo.TableField; import io.dataease.api.permissions.dataset.dto.DataSetRowPermissionsTreeDTO; import io.dataease.auth.bo.TokenUserBO; @@ -25,7 +25,7 @@ import io.dataease.datasource.manage.EngineManage; import io.dataease.datasource.provider.CalciteProvider; import io.dataease.datasource.request.DatasourceRequest; import io.dataease.datasource.utils.DatasourceUtils; -import io.dataease.dto.dataset.DatasetTableFieldDTO; +import io.dataease.extensions.view.dto.DatasetTableFieldDTO; import io.dataease.engine.constant.ExtFieldConstant; import io.dataease.engine.constant.SQLConstants; import io.dataease.engine.constant.SqlPlaceholderConstants; @@ -34,6 +34,7 @@ import io.dataease.engine.trans.*; import io.dataease.engine.utils.SQLUtils; import io.dataease.engine.utils.Utils; import io.dataease.exception.DEException; +import io.dataease.extensions.view.dto.SqlVariableDetails; import io.dataease.i18n.Translator; import io.dataease.utils.AuthUtils; import io.dataease.utils.BeanUtils; diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetGroupManage.java b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetGroupManage.java index daecbe6449..fdbc1cf52e 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetGroupManage.java +++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetGroupManage.java @@ -3,7 +3,7 @@ package io.dataease.dataset.manage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fasterxml.jackson.core.type.TypeReference; import io.dataease.api.dataset.dto.DatasetTableDTO; -import io.dataease.api.dataset.dto.SqlVariableDetails; +import io.dataease.extensions.view.dto.SqlVariableDetails; import io.dataease.api.dataset.union.DatasetGroupInfoDTO; import io.dataease.api.dataset.union.UnionDTO; import io.dataease.api.dataset.vo.DataSetBarVO; @@ -20,7 +20,7 @@ import io.dataease.dataset.utils.FieldUtils; import io.dataease.dataset.utils.TableUtils; import io.dataease.datasource.dao.auto.entity.CoreDatasource; import io.dataease.datasource.dao.auto.mapper.CoreDatasourceMapper; -import io.dataease.dto.dataset.DatasetTableFieldDTO; +import io.dataease.extensions.view.dto.DatasetTableFieldDTO; import io.dataease.engine.constant.ExtFieldConstant; import io.dataease.exception.DEException; import io.dataease.i18n.Translator; diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetSQLManage.java b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetSQLManage.java index c2c137933b..be075dba97 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetSQLManage.java +++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetSQLManage.java @@ -1,11 +1,11 @@ package io.dataease.dataset.manage; -import io.dataease.api.chart.dto.ChartExtFilterDTO; -import io.dataease.api.chart.request.ChartExtRequest; +import io.dataease.extensions.view.dto.ChartExtFilterDTO; +import io.dataease.extensions.view.dto.ChartExtRequest; import io.dataease.api.dataset.dto.DatasetTableDTO; -import io.dataease.api.dataset.dto.SqlVariableDetails; +import io.dataease.extensions.view.dto.SqlVariableDetails; import io.dataease.api.dataset.union.*; -import io.dataease.api.dataset.union.model.SQLObj; +import io.dataease.extensions.view.model.SQLObj; import io.dataease.api.ds.vo.DatasourceConfiguration; import io.dataease.api.permissions.auth.dto.BusiPerCheckDTO; import io.dataease.commons.utils.SqlparserUtils; @@ -18,7 +18,7 @@ import io.dataease.dataset.utils.TableUtils; import io.dataease.datasource.dao.auto.entity.CoreDatasource; import io.dataease.datasource.dao.auto.mapper.CoreDatasourceMapper; import io.dataease.datasource.manage.EngineManage; -import io.dataease.dto.dataset.DatasetTableFieldDTO; +import io.dataease.extensions.view.dto.DatasetTableFieldDTO; import io.dataease.engine.constant.ExtFieldConstant; import io.dataease.engine.constant.SQLConstants; import io.dataease.exception.DEException; diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetTableFieldManage.java b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetTableFieldManage.java index 9ae1ba7faa..d5164c15b7 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetTableFieldManage.java +++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetTableFieldManage.java @@ -2,13 +2,13 @@ package io.dataease.dataset.manage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.dataease.api.chart.dto.ColumnPermissionItem; -import io.dataease.api.dataset.union.model.SQLObj; +import io.dataease.extensions.view.model.SQLObj; import io.dataease.dataset.dao.auto.entity.CoreDatasetTableField; import io.dataease.dataset.dao.auto.mapper.CoreDatasetGroupMapper; import io.dataease.dataset.dao.auto.mapper.CoreDatasetTableFieldMapper; import io.dataease.dataset.utils.TableUtils; import io.dataease.datasource.provider.CalciteProvider; -import io.dataease.dto.dataset.DatasetTableFieldDTO; +import io.dataease.extensions.view.dto.DatasetTableFieldDTO; import io.dataease.engine.constant.ExtFieldConstant; import io.dataease.engine.func.FunctionConstant; import io.dataease.engine.utils.Utils; diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/PermissionManage.java b/core/core-backend/src/main/java/io/dataease/dataset/manage/PermissionManage.java index 14201dddc6..32675a6289 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/manage/PermissionManage.java +++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/PermissionManage.java @@ -11,7 +11,9 @@ import io.dataease.api.permissions.user.vo.UserFormVO; import io.dataease.api.permissions.variable.dto.SysVariableValueDto; import io.dataease.api.permissions.variable.dto.SysVariableValueItem; import io.dataease.constant.ColumnPermissionConstants; -import io.dataease.dto.dataset.DatasetTableFieldDTO; +import io.dataease.extensions.view.dto.DatasetRowPermissionsTreeItem; +import io.dataease.extensions.view.dto.DatasetRowPermissionsTreeObj; +import io.dataease.extensions.view.dto.DatasetTableFieldDTO; import io.dataease.utils.AuthUtils; import io.dataease.utils.JsonUtil; import jakarta.annotation.Resource; diff --git a/core/core-backend/src/main/java/io/dataease/dataset/server/DatasetDataServer.java b/core/core-backend/src/main/java/io/dataease/dataset/server/DatasetDataServer.java index e9430a3325..60e9740c32 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/server/DatasetDataServer.java +++ b/core/core-backend/src/main/java/io/dataease/dataset/server/DatasetDataServer.java @@ -6,7 +6,7 @@ import io.dataease.api.dataset.dto.EnumValueRequest; import io.dataease.api.dataset.dto.PreviewSqlDTO; import io.dataease.api.dataset.union.DatasetGroupInfoDTO; import io.dataease.dataset.manage.DatasetDataManage; -import io.dataease.dto.dataset.DatasetTableFieldDTO; +import io.dataease.extensions.view.dto.DatasetTableFieldDTO; import io.dataease.utils.LogUtil; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/core/core-backend/src/main/java/io/dataease/dataset/server/DatasetFieldServer.java b/core/core-backend/src/main/java/io/dataease/dataset/server/DatasetFieldServer.java index 0ba29b6163..2174a0b276 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/server/DatasetFieldServer.java +++ b/core/core-backend/src/main/java/io/dataease/dataset/server/DatasetFieldServer.java @@ -6,7 +6,7 @@ import io.dataease.api.dataset.engine.SQLFunctionDTO; import io.dataease.api.dataset.engine.SQLFunctionsEnum; import io.dataease.dataset.manage.DatasetDataManage; import io.dataease.dataset.manage.DatasetTableFieldManage; -import io.dataease.dto.dataset.DatasetTableFieldDTO; +import io.dataease.extensions.view.dto.DatasetTableFieldDTO; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/core/core-backend/src/main/java/io/dataease/dataset/server/DatasetTreeServer.java b/core/core-backend/src/main/java/io/dataease/dataset/server/DatasetTreeServer.java index 83f88fa2ce..5da6508ca2 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/server/DatasetTreeServer.java +++ b/core/core-backend/src/main/java/io/dataease/dataset/server/DatasetTreeServer.java @@ -3,7 +3,7 @@ package io.dataease.dataset.server; import io.dataease.api.dataset.DatasetTreeApi; import io.dataease.api.dataset.dto.DatasetNodeDTO; import io.dataease.api.dataset.dto.DatasetTableDTO; -import io.dataease.api.dataset.dto.SqlVariableDetails; +import io.dataease.extensions.view.dto.SqlVariableDetails; import io.dataease.api.dataset.union.DatasetGroupInfoDTO; import io.dataease.api.dataset.vo.DataSetBarVO; import io.dataease.constant.LogOT; diff --git a/core/core-backend/src/main/java/io/dataease/dataset/utils/SqlUtils.java b/core/core-backend/src/main/java/io/dataease/dataset/utils/SqlUtils.java index f46e123943..37ee2e6074 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/utils/SqlUtils.java +++ b/core/core-backend/src/main/java/io/dataease/dataset/utils/SqlUtils.java @@ -1,7 +1,7 @@ package io.dataease.dataset.utils; import com.google.common.collect.ImmutableList; -import io.dataease.api.dataset.union.model.SQLMeta; +import io.dataease.extensions.view.model.SQLMeta; import io.dataease.api.ds.vo.DatasourceConfiguration; import io.dataease.dataset.dto.DatasourceSchemaDTO; import io.dataease.engine.constant.SqlPlaceholderConstants; diff --git a/core/core-backend/src/main/java/io/dataease/dataset/utils/TableUtils.java b/core/core-backend/src/main/java/io/dataease/dataset/utils/TableUtils.java index 81a88f5ba6..ec101c8399 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/utils/TableUtils.java +++ b/core/core-backend/src/main/java/io/dataease/dataset/utils/TableUtils.java @@ -1,6 +1,6 @@ package io.dataease.dataset.utils; -import io.dataease.api.dataset.union.model.SQLObj; +import io.dataease.extensions.view.model.SQLObj; import io.dataease.api.ds.vo.DatasourceConfiguration; import io.dataease.dataset.dto.DatasourceSchemaDTO; import io.dataease.utils.Md5Utils; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/dao/ext/mapper/DataSourceExtMapper.java b/core/core-backend/src/main/java/io/dataease/datasource/dao/ext/mapper/DataSourceExtMapper.java index 9fc93e2991..93d0574487 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/dao/ext/mapper/DataSourceExtMapper.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/dao/ext/mapper/DataSourceExtMapper.java @@ -3,7 +3,6 @@ package io.dataease.datasource.dao.ext.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import io.dataease.datasource.dao.ext.po.Ctimestamp; import io.dataease.datasource.dao.ext.po.DataSourceNodePO; -import io.dataease.dto.dataset.DatasetTableFieldDTO; import org.apache.ibatis.annotations.*; @Mapper diff --git a/core/core-backend/src/main/java/io/dataease/engine/sql/SQLProvider.java b/core/core-backend/src/main/java/io/dataease/engine/sql/SQLProvider.java index a5ea329019..2ce93e853c 100644 --- a/core/core-backend/src/main/java/io/dataease/engine/sql/SQLProvider.java +++ b/core/core-backend/src/main/java/io/dataease/engine/sql/SQLProvider.java @@ -1,8 +1,8 @@ package io.dataease.engine.sql; -import io.dataease.api.chart.dto.ChartViewDTO; -import io.dataease.api.dataset.union.model.SQLMeta; -import io.dataease.api.dataset.union.model.SQLObj; +import io.dataease.extensions.view.dto.ChartViewDTO; +import io.dataease.extensions.view.model.SQLMeta; +import io.dataease.extensions.view.model.SQLObj; import io.dataease.engine.constant.SQLConstants; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; diff --git a/core/core-backend/src/main/java/io/dataease/engine/trans/CustomWhere2Str.java b/core/core-backend/src/main/java/io/dataease/engine/trans/CustomWhere2Str.java index b9913f0625..bc878f1fe2 100644 --- a/core/core-backend/src/main/java/io/dataease/engine/trans/CustomWhere2Str.java +++ b/core/core-backend/src/main/java/io/dataease/engine/trans/CustomWhere2Str.java @@ -1,11 +1,11 @@ package io.dataease.engine.trans; -import io.dataease.api.chart.filter.FilterTreeItem; -import io.dataease.api.chart.filter.FilterTreeObj; -import io.dataease.api.dataset.union.model.SQLMeta; -import io.dataease.api.dataset.union.model.SQLObj; +import io.dataease.extensions.view.filter.FilterTreeItem; +import io.dataease.extensions.view.filter.FilterTreeObj; +import io.dataease.extensions.view.model.SQLMeta; +import io.dataease.extensions.view.model.SQLObj; import io.dataease.dataset.dto.DatasourceSchemaDTO; -import io.dataease.dto.dataset.DatasetTableFieldDTO; +import io.dataease.extensions.view.dto.DatasetTableFieldDTO; import io.dataease.engine.constant.SQLConstants; import io.dataease.engine.constant.SqlPlaceholderConstants; import io.dataease.engine.utils.Utils; diff --git a/core/core-backend/src/main/java/io/dataease/engine/trans/Dimension2SQLObj.java b/core/core-backend/src/main/java/io/dataease/engine/trans/Dimension2SQLObj.java index 458989fb26..b2f6481a2f 100644 --- a/core/core-backend/src/main/java/io/dataease/engine/trans/Dimension2SQLObj.java +++ b/core/core-backend/src/main/java/io/dataease/engine/trans/Dimension2SQLObj.java @@ -1,10 +1,10 @@ package io.dataease.engine.trans; -import io.dataease.api.chart.dto.ChartViewFieldDTO; -import io.dataease.api.dataset.union.model.SQLMeta; -import io.dataease.api.dataset.union.model.SQLObj; +import io.dataease.extensions.view.dto.ChartViewFieldDTO; +import io.dataease.extensions.view.model.SQLMeta; +import io.dataease.extensions.view.model.SQLObj; import io.dataease.dataset.dto.DatasourceSchemaDTO; -import io.dataease.dto.dataset.DatasetTableFieldDTO; +import io.dataease.extensions.view.dto.DatasetTableFieldDTO; import io.dataease.engine.constant.DeTypeConstants; import io.dataease.engine.constant.ExtFieldConstant; import io.dataease.engine.constant.SQLConstants; @@ -21,7 +21,8 @@ import java.util.*; */ public class Dimension2SQLObj { - public static void dimension2sqlObj(SQLMeta meta, List fields, List originFields, boolean isCross, Map dsMap) { + public static void dimension2sqlObj(SQLMeta meta, List fields, List originFields, + boolean isCross, Map dsMap) { SQLObj tableObj = meta.getTable(); if (ObjectUtils.isEmpty(tableObj)) { return; diff --git a/core/core-backend/src/main/java/io/dataease/engine/trans/ExtWhere2Str.java b/core/core-backend/src/main/java/io/dataease/engine/trans/ExtWhere2Str.java index 0824eca977..572df331db 100644 --- a/core/core-backend/src/main/java/io/dataease/engine/trans/ExtWhere2Str.java +++ b/core/core-backend/src/main/java/io/dataease/engine/trans/ExtWhere2Str.java @@ -1,10 +1,10 @@ package io.dataease.engine.trans; -import io.dataease.api.chart.dto.ChartExtFilterDTO; -import io.dataease.api.dataset.union.model.SQLMeta; -import io.dataease.api.dataset.union.model.SQLObj; +import io.dataease.extensions.view.dto.ChartExtFilterDTO; +import io.dataease.extensions.view.model.SQLMeta; +import io.dataease.extensions.view.model.SQLObj; import io.dataease.dataset.dto.DatasourceSchemaDTO; -import io.dataease.dto.dataset.DatasetTableFieldDTO; +import io.dataease.extensions.view.dto.DatasetTableFieldDTO; import io.dataease.engine.constant.SQLConstants; import io.dataease.engine.constant.SqlPlaceholderConstants; import io.dataease.engine.utils.Utils; diff --git a/core/core-backend/src/main/java/io/dataease/engine/trans/Field2SQLObj.java b/core/core-backend/src/main/java/io/dataease/engine/trans/Field2SQLObj.java index efa8d1b57e..5219477482 100644 --- a/core/core-backend/src/main/java/io/dataease/engine/trans/Field2SQLObj.java +++ b/core/core-backend/src/main/java/io/dataease/engine/trans/Field2SQLObj.java @@ -1,9 +1,9 @@ package io.dataease.engine.trans; -import io.dataease.api.dataset.union.model.SQLMeta; -import io.dataease.api.dataset.union.model.SQLObj; +import io.dataease.extensions.view.model.SQLMeta; +import io.dataease.extensions.view.model.SQLObj; import io.dataease.dataset.dto.DatasourceSchemaDTO; -import io.dataease.dto.dataset.DatasetTableFieldDTO; +import io.dataease.extensions.view.dto.DatasetTableFieldDTO; import io.dataease.engine.constant.DeTypeConstants; import io.dataease.engine.constant.ExtFieldConstant; import io.dataease.engine.constant.SQLConstants; diff --git a/core/core-backend/src/main/java/io/dataease/engine/trans/Order2SQLObj.java b/core/core-backend/src/main/java/io/dataease/engine/trans/Order2SQLObj.java index 54d6d4ab23..d5d12bb829 100644 --- a/core/core-backend/src/main/java/io/dataease/engine/trans/Order2SQLObj.java +++ b/core/core-backend/src/main/java/io/dataease/engine/trans/Order2SQLObj.java @@ -1,10 +1,10 @@ package io.dataease.engine.trans; import io.dataease.api.chart.dto.DeSortField; -import io.dataease.api.dataset.union.model.SQLMeta; -import io.dataease.api.dataset.union.model.SQLObj; +import io.dataease.extensions.view.model.SQLMeta; +import io.dataease.extensions.view.model.SQLObj; import io.dataease.dataset.dto.DatasourceSchemaDTO; -import io.dataease.dto.dataset.DatasetTableFieldDTO; +import io.dataease.extensions.view.dto.DatasetTableFieldDTO; import io.dataease.engine.constant.DeTypeConstants; import io.dataease.engine.constant.ExtFieldConstant; import io.dataease.engine.constant.SQLConstants; diff --git a/core/core-backend/src/main/java/io/dataease/engine/trans/Quota2SQLObj.java b/core/core-backend/src/main/java/io/dataease/engine/trans/Quota2SQLObj.java index d99283350e..d294ad186a 100644 --- a/core/core-backend/src/main/java/io/dataease/engine/trans/Quota2SQLObj.java +++ b/core/core-backend/src/main/java/io/dataease/engine/trans/Quota2SQLObj.java @@ -1,10 +1,10 @@ package io.dataease.engine.trans; -import io.dataease.api.chart.dto.ChartViewFieldDTO; -import io.dataease.api.dataset.union.model.SQLMeta; -import io.dataease.api.dataset.union.model.SQLObj; +import io.dataease.extensions.view.dto.ChartViewFieldDTO; +import io.dataease.extensions.view.model.SQLMeta; +import io.dataease.extensions.view.model.SQLObj; import io.dataease.dataset.dto.DatasourceSchemaDTO; -import io.dataease.dto.dataset.DatasetTableFieldDTO; +import io.dataease.extensions.view.dto.DatasetTableFieldDTO; import io.dataease.engine.constant.DeTypeConstants; import io.dataease.engine.constant.ExtFieldConstant; import io.dataease.engine.constant.SQLConstants; diff --git a/core/core-backend/src/main/java/io/dataease/engine/trans/Table2SQLObj.java b/core/core-backend/src/main/java/io/dataease/engine/trans/Table2SQLObj.java index 8f4f1660c6..7be3b75600 100644 --- a/core/core-backend/src/main/java/io/dataease/engine/trans/Table2SQLObj.java +++ b/core/core-backend/src/main/java/io/dataease/engine/trans/Table2SQLObj.java @@ -1,7 +1,7 @@ package io.dataease.engine.trans; -import io.dataease.api.dataset.union.model.SQLMeta; -import io.dataease.api.dataset.union.model.SQLObj; +import io.dataease.extensions.view.model.SQLMeta; +import io.dataease.extensions.view.model.SQLObj; import io.dataease.engine.constant.SQLConstants; import io.dataease.engine.constant.SqlPlaceholderConstants; diff --git a/core/core-backend/src/main/java/io/dataease/engine/trans/WhereTree2Str.java b/core/core-backend/src/main/java/io/dataease/engine/trans/WhereTree2Str.java index b9149c02ba..ac950403a5 100644 --- a/core/core-backend/src/main/java/io/dataease/engine/trans/WhereTree2Str.java +++ b/core/core-backend/src/main/java/io/dataease/engine/trans/WhereTree2Str.java @@ -1,12 +1,12 @@ package io.dataease.engine.trans; -import io.dataease.api.dataset.union.model.SQLMeta; -import io.dataease.api.dataset.union.model.SQLObj; +import io.dataease.extensions.view.model.SQLMeta; +import io.dataease.extensions.view.model.SQLObj; import io.dataease.api.permissions.dataset.dto.DataSetRowPermissionsTreeDTO; -import io.dataease.api.permissions.dataset.dto.DatasetRowPermissionsTreeItem; -import io.dataease.api.permissions.dataset.dto.DatasetRowPermissionsTreeObj; +import io.dataease.extensions.view.dto.DatasetRowPermissionsTreeItem; +import io.dataease.extensions.view.dto.DatasetRowPermissionsTreeObj; import io.dataease.dataset.dto.DatasourceSchemaDTO; -import io.dataease.dto.dataset.DatasetTableFieldDTO; +import io.dataease.extensions.view.dto.DatasetTableFieldDTO; import io.dataease.engine.constant.ExtFieldConstant; import io.dataease.engine.constant.SQLConstants; import io.dataease.engine.constant.SqlPlaceholderConstants; diff --git a/core/core-backend/src/main/java/io/dataease/engine/utils/Utils.java b/core/core-backend/src/main/java/io/dataease/engine/utils/Utils.java index c776352991..42d9975fd5 100644 --- a/core/core-backend/src/main/java/io/dataease/engine/utils/Utils.java +++ b/core/core-backend/src/main/java/io/dataease/engine/utils/Utils.java @@ -1,9 +1,9 @@ package io.dataease.engine.utils; -import io.dataease.api.dataset.union.model.SQLObj; +import io.dataease.extensions.view.model.SQLObj; import io.dataease.api.ds.vo.DatasourceConfiguration; import io.dataease.dataset.dto.DatasourceSchemaDTO; -import io.dataease.dto.dataset.DatasetTableFieldDTO; +import io.dataease.extensions.view.dto.DatasetTableFieldDTO; import io.dataease.engine.constant.ExtFieldConstant; import io.dataease.engine.constant.SQLConstants; import io.dataease.engine.constant.SqlPlaceholderConstants; @@ -40,6 +40,22 @@ public class Utils { return null; } + public static String calcSimpleFieldRegex(String originField, SQLObj tableObj, List originFields, + boolean isCross, Map dsTypeMap) { + try { + int i = 0; + DatasourceConfiguration.DatasourceType datasourceType = null; + if (dsTypeMap != null && dsTypeMap.entrySet().iterator().hasNext()) { + Map.Entry next = dsTypeMap.entrySet().iterator().next(); + datasourceType = DatasourceConfiguration.DatasourceType.valueOf(next.getValue()); + } + return buildCalcField(originField, tableObj, originFields, i, isCross, datasourceType); + } catch (Exception e) { + DEException.throwException(Translator.get("i18n_field_circular_ref")); + } + return null; + } + public static String buildCalcField(String originField, SQLObj tableObj, List originFields, int i, boolean isCross, DatasourceConfiguration.DatasourceType datasourceType) throws Exception { try { i++; diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/ExtVisualizationLinkageMapper.java b/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/ExtVisualizationLinkageMapper.java index 535ca77c50..d409448d9c 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/ExtVisualizationLinkageMapper.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/ExtVisualizationLinkageMapper.java @@ -2,7 +2,7 @@ package io.dataease.visualization.dao.ext.mapper; import io.dataease.api.visualization.dto.LinkageInfoDTO; import io.dataease.api.visualization.dto.VisualizationLinkageDTO; -import io.dataease.dto.dataset.DatasetTableFieldDTO; +import io.dataease.extensions.view.dto.DatasetTableFieldDTO; import io.dataease.visualization.dao.auto.entity.VisualizationLinkage; import io.dataease.visualization.dao.auto.entity.VisualizationLinkageField; import org.apache.ibatis.annotations.Mapper; diff --git a/core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationExportManage.java b/core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationExportManage.java index 6a263eabc5..d4f98f7ac7 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationExportManage.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationExportManage.java @@ -1,10 +1,10 @@ package io.dataease.visualization.manage; import com.fasterxml.jackson.core.type.TypeReference; -import io.dataease.api.chart.dto.ChartExtFilterDTO; -import io.dataease.api.chart.dto.ChartViewDTO; -import io.dataease.api.chart.dto.ChartViewFieldDTO; -import io.dataease.api.chart.request.ChartExtRequest; +import io.dataease.extensions.view.dto.ChartExtFilterDTO; +import io.dataease.extensions.view.dto.ChartViewDTO; +import io.dataease.extensions.view.dto.ChartViewFieldDTO; +import io.dataease.extensions.view.dto.ChartExtRequest; import io.dataease.api.visualization.vo.DataVisualizationVO; import io.dataease.chart.manage.ChartDataManage; import io.dataease.chart.manage.ChartViewManege; diff --git a/core/core-backend/src/main/java/io/dataease/visualization/manage/VisualizationTemplateExtendDataManage.java b/core/core-backend/src/main/java/io/dataease/visualization/manage/VisualizationTemplateExtendDataManage.java index 93bab1cf86..3435aacdde 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/manage/VisualizationTemplateExtendDataManage.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/manage/VisualizationTemplateExtendDataManage.java @@ -1,7 +1,7 @@ package io.dataease.visualization.manage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import io.dataease.api.chart.dto.ChartViewDTO; +import io.dataease.extensions.view.dto.ChartViewDTO; import io.dataease.exception.DEException; import io.dataease.template.dao.auto.entity.VisualizationTemplateExtendData; import io.dataease.template.dao.auto.mapper.VisualizationTemplateExtendDataMapper; @@ -11,8 +11,6 @@ import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; import java.util.List; -import java.util.Map; - /** 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 a0283e066f..275494ddda 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 @@ -2,7 +2,7 @@ package io.dataease.visualization.server; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import io.dataease.api.chart.dto.ChartViewDTO; +import io.dataease.extensions.view.dto.ChartViewDTO; import io.dataease.api.template.dto.TemplateManageFileDTO; import io.dataease.api.template.dto.VisualizationTemplateExtendDataDTO; import io.dataease.api.visualization.DataVisualizationApi; diff --git a/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationLinkJumpService.java b/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationLinkJumpService.java index 843325c35b..ad76d753e8 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationLinkJumpService.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationLinkJumpService.java @@ -1,7 +1,5 @@ package io.dataease.visualization.server; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import io.dataease.api.permissions.dataset.dto.DataSetRowPermissionsTreeDTO; import io.dataease.api.visualization.VisualizationLinkJumpApi; import io.dataease.api.visualization.dto.VisualizationComponentDTO; import io.dataease.api.visualization.dto.VisualizationLinkJumpDTO; @@ -11,8 +9,7 @@ import io.dataease.api.visualization.response.VisualizationLinkJumpBaseResponse; import io.dataease.api.visualization.vo.VisualizationViewTableVO; import io.dataease.chart.dao.auto.entity.CoreChartView; import io.dataease.chart.dao.auto.mapper.CoreChartViewMapper; -import io.dataease.dto.dataset.DatasetTableFieldDTO; -import io.dataease.license.config.XpackInteract; +import io.dataease.extensions.view.dto.DatasetTableFieldDTO; import io.dataease.utils.AuthUtils; import io.dataease.utils.BeanUtils; import io.dataease.utils.IDUtils; diff --git a/core/core-backend/src/main/java/io/dataease/visualization/template/FilterBuildTemplate.java b/core/core-backend/src/main/java/io/dataease/visualization/template/FilterBuildTemplate.java index 013e8f2808..59b0a6a5dd 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/template/FilterBuildTemplate.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/template/FilterBuildTemplate.java @@ -1,6 +1,6 @@ package io.dataease.visualization.template; -import io.dataease.api.chart.dto.ChartExtFilterDTO; +import io.dataease.extensions.view.dto.ChartExtFilterDTO; import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; diff --git a/core/core-backend/src/main/resources/mybatis/ExtDataVisualizationMapper.xml b/core/core-backend/src/main/resources/mybatis/ExtDataVisualizationMapper.xml index 2e81f6214b..76729f21a3 100644 --- a/core/core-backend/src/main/resources/mybatis/ExtDataVisualizationMapper.xml +++ b/core/core-backend/src/main/resources/mybatis/ExtDataVisualizationMapper.xml @@ -379,7 +379,7 @@ - + diff --git a/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml b/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml index 75a18168f2..d3bdad20fd 100644 --- a/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml +++ b/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml @@ -53,7 +53,7 @@ + ofType="io.dataease.extensions.view.dto.DatasetTableFieldDTO"> diff --git a/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkageMapper.xml b/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkageMapper.xml index a5ab50506e..c9775897d9 100644 --- a/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkageMapper.xml +++ b/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkageMapper.xml @@ -2,7 +2,7 @@ - + @@ -17,7 +17,7 @@ - diff --git a/de-xpack b/de-xpack index 4e4115d980..c36d845145 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 4e4115d9803717a06f114ef047183ab447f68470 +Subproject commit c36d845145b1dd398da4451e03e28329bd3d8a82 diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/ChartDataApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/chart/ChartDataApi.java index 7052bf0a08..916400062d 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/ChartDataApi.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/chart/ChartDataApi.java @@ -1,8 +1,8 @@ package io.dataease.api.chart; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.chart.dto.ChartViewDTO; import io.dataease.api.chart.request.ChartExcelRequest; +import io.dataease.extensions.view.dto.ChartViewDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; @@ -10,7 +10,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; -import java.io.IOException; import java.util.List; /** diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/ChartViewApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/chart/ChartViewApi.java index 02b729b2ac..05b88078a4 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/ChartViewApi.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/chart/ChartViewApi.java @@ -1,9 +1,9 @@ package io.dataease.api.chart; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.chart.dto.ChartViewDTO; -import io.dataease.api.chart.dto.ChartViewFieldDTO; import io.dataease.api.chart.vo.ViewSelectorVO; +import io.dataease.extensions.view.dto.ChartViewDTO; +import io.dataease.extensions.view.dto.ChartViewFieldDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.GetMapping; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/AxisChartDataAntVDTO.java b/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/AxisChartDataAntVDTO.java index 3d8ed7d3f6..cf22917806 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/AxisChartDataAntVDTO.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/AxisChartDataAntVDTO.java @@ -1,5 +1,6 @@ package io.dataease.api.chart.dto; +import io.dataease.extensions.view.dto.ChartDimensionDTO; import lombok.Data; import java.math.BigDecimal; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/AxisChartDataDTO.java b/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/AxisChartDataDTO.java index 219097a293..62a1e3fa21 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/AxisChartDataDTO.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/AxisChartDataDTO.java @@ -1,5 +1,6 @@ package io.dataease.api.chart.dto; +import io.dataease.extensions.view.dto.ChartDimensionDTO; import lombok.Data; import java.math.BigDecimal; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/DeSortField.java b/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/DeSortField.java index 86c9090be8..df61ffa9dc 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/DeSortField.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/DeSortField.java @@ -1,6 +1,6 @@ package io.dataease.api.chart.dto; -import io.dataease.dto.dataset.DatasetTableFieldDTO; +import io.dataease.extensions.view.dto.DatasetTableFieldDTO; import lombok.Data; @Data diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ScatterChartDataDTO.java b/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ScatterChartDataDTO.java index 0cd1236b55..0b0b5a9467 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ScatterChartDataDTO.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ScatterChartDataDTO.java @@ -1,5 +1,6 @@ package io.dataease.api.chart.dto; +import io.dataease.extensions.view.dto.ChartDimensionDTO; import lombok.Data; import java.util.List; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/request/ChartExcelRequest.java b/sdk/api/api-base/src/main/java/io/dataease/api/chart/request/ChartExcelRequest.java index dcdc8fd207..ca1c785b54 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/request/ChartExcelRequest.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/chart/request/ChartExcelRequest.java @@ -1,6 +1,6 @@ package io.dataease.api.chart.request; -import io.dataease.api.chart.dto.ChartViewDTO; +import io.dataease.extensions.view.dto.ChartViewDTO; import lombok.Data; import java.io.Serial; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetDataApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetDataApi.java index 61d9198112..3ea305171c 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetDataApi.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetDataApi.java @@ -5,7 +5,7 @@ import io.dataease.api.dataset.dto.DatasetTableDTO; import io.dataease.api.dataset.dto.EnumValueRequest; import io.dataease.api.dataset.dto.PreviewSqlDTO; import io.dataease.api.dataset.union.DatasetGroupInfoDTO; -import io.dataease.dto.dataset.DatasetTableFieldDTO; +import io.dataease.extensions.view.dto.DatasetTableFieldDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.PostMapping; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetTableApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetTableApi.java index 990db8b20a..8ba76fc1df 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetTableApi.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetTableApi.java @@ -3,7 +3,7 @@ package io.dataease.api.dataset; import com.github.xiaoymin.knife4j.annotations.ApiSupport; import io.dataease.api.dataset.dto.MultFieldValuesRequest; import io.dataease.api.dataset.engine.SQLFunctionDTO; -import io.dataease.dto.dataset.DatasetTableFieldDTO; +import io.dataease.extensions.view.dto.DatasetTableFieldDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.GetMapping; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetTreeApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetTreeApi.java index 0f94543995..0aed707e89 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetTreeApi.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetTreeApi.java @@ -3,11 +3,11 @@ package io.dataease.api.dataset; import com.github.xiaoymin.knife4j.annotations.ApiSupport; import io.dataease.api.dataset.dto.DatasetNodeDTO; import io.dataease.api.dataset.dto.DatasetTableDTO; -import io.dataease.api.dataset.dto.SqlVariableDetails; import io.dataease.api.dataset.union.DatasetGroupInfoDTO; import io.dataease.api.dataset.vo.DataSetBarVO; import io.dataease.auth.DeApiPath; import io.dataease.auth.DePermit; +import io.dataease.extensions.view.dto.SqlVariableDetails; import io.dataease.model.BusiNodeRequest; import io.dataease.model.BusiNodeVO; import io.swagger.v3.oas.annotations.Operation; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/DatasetTableDTO.java b/sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/DatasetTableDTO.java index 343234ba16..6a92df2543 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/DatasetTableDTO.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/DatasetTableDTO.java @@ -2,7 +2,7 @@ package io.dataease.api.dataset.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.dataease.dto.dataset.DatasetTableFieldDTO; +import io.dataease.extensions.view.dto.DatasetTableFieldDTO; import lombok.Data; import java.io.Serializable; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/EnumValueRequest.java b/sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/EnumValueRequest.java index acc327ed25..72a205b5e2 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/EnumValueRequest.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/EnumValueRequest.java @@ -1,6 +1,6 @@ package io.dataease.api.dataset.dto; -import io.dataease.api.chart.dto.ChartExtFilterDTO; +import io.dataease.extensions.view.dto.ChartExtFilterDTO; import lombok.Data; import java.util.List; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/DatasetGroupInfoDTO.java b/sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/DatasetGroupInfoDTO.java index 08d61cf05a..73ef8cb656 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/DatasetGroupInfoDTO.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/DatasetGroupInfoDTO.java @@ -2,7 +2,7 @@ package io.dataease.api.dataset.union; import io.dataease.api.chart.dto.DeSortField; import io.dataease.api.dataset.dto.DatasetNodeDTO; -import io.dataease.dto.dataset.DatasetTableFieldDTO; +import io.dataease.extensions.view.dto.DatasetTableFieldDTO; import lombok.Data; import java.util.List; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/UnionDTO.java b/sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/UnionDTO.java index d7429cdf32..02561e15b0 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/UnionDTO.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/UnionDTO.java @@ -1,7 +1,7 @@ package io.dataease.api.dataset.union; import io.dataease.api.dataset.dto.DatasetTableDTO; -import io.dataease.dto.dataset.DatasetTableFieldDTO; +import io.dataease.extensions.view.dto.DatasetTableFieldDTO; import lombok.Data; import java.io.Serializable; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/UnionItemDTO.java b/sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/UnionItemDTO.java index 3b9d5e3e33..a2c855708f 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/UnionItemDTO.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/UnionItemDTO.java @@ -1,6 +1,6 @@ package io.dataease.api.dataset.union; -import io.dataease.dto.dataset.DatasetTableFieldDTO; +import io.dataease.extensions.view.dto.DatasetTableFieldDTO; import lombok.Data; import java.io.Serializable; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/UnionParamDTO.java b/sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/UnionParamDTO.java index 64c8391848..ce36c21754 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/UnionParamDTO.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/UnionParamDTO.java @@ -1,7 +1,7 @@ package io.dataease.api.dataset.union; import io.dataease.api.dataset.dto.DatasetTableDTO; -import io.dataease.api.dataset.union.model.SQLObj; +import io.dataease.extensions.view.model.SQLObj; import lombok.Data; import java.io.Serializable; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/VisualizationLinkJumpApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/VisualizationLinkJumpApi.java index c8b1d3ca3d..8c4445fc4e 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/VisualizationLinkJumpApi.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/VisualizationLinkJumpApi.java @@ -5,8 +5,7 @@ import io.dataease.api.visualization.dto.VisualizationComponentDTO; import io.dataease.api.visualization.dto.VisualizationLinkJumpDTO; import io.dataease.api.visualization.request.VisualizationLinkJumpBaseRequest; import io.dataease.api.visualization.response.VisualizationLinkJumpBaseResponse; -import io.dataease.api.visualization.vo.VisualizationViewTableVO; -import io.dataease.dto.dataset.DatasetTableFieldDTO; +import io.dataease.extensions.view.dto.DatasetTableFieldDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.GetMapping; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationLinkageDTO.java b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationLinkageDTO.java index dfe8e1c52a..bbf9146a5a 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationLinkageDTO.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationLinkageDTO.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.dataease.api.visualization.vo.VisualizationLinkageFieldVO; import io.dataease.api.visualization.vo.VisualizationLinkageVO; -import io.dataease.dto.dataset.DatasetTableFieldDTO; +import io.dataease.extensions.view.dto.DatasetTableFieldDTO; import lombok.Data; import java.util.ArrayList; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationViewTableDTO.java b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationViewTableDTO.java index c633f373ac..aed12f2826 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationViewTableDTO.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationViewTableDTO.java @@ -1,7 +1,8 @@ package io.dataease.api.visualization.dto; -import io.dataease.api.chart.dto.ChartViewDTO; -import io.dataease.dto.dataset.DatasetTableFieldDTO; + +import io.dataease.extensions.view.dto.ChartViewDTO; +import io.dataease.extensions.view.dto.DatasetTableFieldDTO; import lombok.Data; import java.util.List; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/DataVisualizationVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/DataVisualizationVO.java index 96b3aa606d..c207f398a7 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/DataVisualizationVO.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/DataVisualizationVO.java @@ -2,14 +2,13 @@ package io.dataease.api.visualization.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.dataease.api.chart.dto.ChartViewDTO; import io.dataease.api.template.dto.VisualizationTemplateExtendDataDTO; +import io.dataease.extensions.view.dto.ChartViewDTO; import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; import java.util.HashMap; -import java.util.List; import java.util.Map; @Data @@ -159,7 +158,7 @@ public class DataVisualizationVO implements Serializable { private VisualizationWatermarkVO watermarkInfo; - public DataVisualizationVO(Long id, String name, String type,Integer version, String canvasStyleData, String componentData, Map canvasViewInfo, Map extendDataInfo) { + public DataVisualizationVO(Long id, String name, String type, Integer version, String canvasStyleData, String componentData, Map canvasViewInfo, Map extendDataInfo) { this.id = id; this.name = name; this.type = type; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationViewTableVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationViewTableVO.java index eddb388960..28f34d27db 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationViewTableVO.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationViewTableVO.java @@ -2,7 +2,7 @@ package io.dataease.api.visualization.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.dataease.dto.dataset.DatasetTableFieldDTO; +import io.dataease.extensions.view.dto.DatasetTableFieldDTO; import lombok.Data; import java.util.List; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/dto/DataSetRowPermissionsTreeDTO.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/dto/DataSetRowPermissionsTreeDTO.java index 6925aaa7bc..915b50b89e 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/dto/DataSetRowPermissionsTreeDTO.java +++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/dto/DataSetRowPermissionsTreeDTO.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.dataease.api.permissions.role.vo.RoleVO; import io.dataease.api.permissions.user.vo.UserFormVO; +import io.dataease.extensions.view.dto.DatasetRowPermissionsTreeObj; import lombok.Getter; import lombok.Setter; diff --git a/sdk/common/pom.xml b/sdk/common/pom.xml index 1f3dbc8095..00c119a828 100644 --- a/sdk/common/pom.xml +++ b/sdk/common/pom.xml @@ -124,6 +124,12 @@ + + io.dataease + extensions-view + ${project.version} + + diff --git a/sdk/extensions/extensions-view/pom.xml b/sdk/extensions/extensions-view/pom.xml new file mode 100644 index 0000000000..85b4d10df4 --- /dev/null +++ b/sdk/extensions/extensions-view/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + + io.dataease + extensions + ${dataease.version} + + + extensions-view + + + 21 + 21 + UTF-8 + + + \ No newline at end of file diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartCustomFilterItemDTO.java b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartCustomFilterItemDTO.java similarity index 91% rename from sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartCustomFilterItemDTO.java rename to sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartCustomFilterItemDTO.java index cdf0fbeeb3..64ef55c378 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartCustomFilterItemDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartCustomFilterItemDTO.java @@ -1,4 +1,4 @@ -package io.dataease.api.chart.dto; +package io.dataease.extensions.view.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartDimensionDTO.java b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartDimensionDTO.java similarity index 88% rename from sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartDimensionDTO.java rename to sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartDimensionDTO.java index 6f27787ddd..da48eccb79 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartDimensionDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartDimensionDTO.java @@ -1,4 +1,4 @@ -package io.dataease.api.chart.dto; +package io.dataease.extensions.view.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/request/ChartDrillRequest.java b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartDrillRequest.java similarity index 63% rename from sdk/api/api-base/src/main/java/io/dataease/api/chart/request/ChartDrillRequest.java rename to sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartDrillRequest.java index f36d644b59..04a699eb5a 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/request/ChartDrillRequest.java +++ b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartDrillRequest.java @@ -1,6 +1,5 @@ -package io.dataease.api.chart.request; +package io.dataease.extensions.view.dto; -import io.dataease.api.chart.dto.ChartDimensionDTO; import lombok.Data; import java.util.List; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartExtFilterDTO.java b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartExtFilterDTO.java similarity index 77% rename from sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartExtFilterDTO.java rename to sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartExtFilterDTO.java index 0222811996..142d1148ab 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartExtFilterDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartExtFilterDTO.java @@ -1,7 +1,6 @@ -package io.dataease.api.chart.dto; +package io.dataease.extensions.view.dto; + -import io.dataease.api.dataset.dto.SqlVariableDetails; -import io.dataease.dto.dataset.DatasetTableFieldDTO; import lombok.Data; import java.util.List; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/request/ChartExtRequest.java b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartExtRequest.java similarity index 76% rename from sdk/api/api-base/src/main/java/io/dataease/api/chart/request/ChartExtRequest.java rename to sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartExtRequest.java index 4a7060f255..19d55a89a5 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/request/ChartExtRequest.java +++ b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartExtRequest.java @@ -1,7 +1,6 @@ -package io.dataease.api.chart.request; +package io.dataease.extensions.view.dto; + -import io.dataease.api.chart.dto.ChartExtFilterDTO; -import io.dataease.api.chart.dto.PermissionProxy; import lombok.Data; import java.util.List; @@ -29,7 +28,7 @@ public class ChartExtRequest { private Long user = null; - private PermissionProxy proxy; + // private PermissionProxy proxy; private Long goPage; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartFieldCompareCustomDTO.java b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartFieldCompareCustomDTO.java similarity index 89% rename from sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartFieldCompareCustomDTO.java rename to sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartFieldCompareCustomDTO.java index 7e466d50e0..15eb3b3da5 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartFieldCompareCustomDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartFieldCompareCustomDTO.java @@ -1,4 +1,4 @@ -package io.dataease.api.chart.dto; +package io.dataease.extensions.view.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartFieldCompareDTO.java b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartFieldCompareDTO.java similarity index 90% rename from sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartFieldCompareDTO.java rename to sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartFieldCompareDTO.java index 291e6dd089..ea3ace75b5 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartFieldCompareDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartFieldCompareDTO.java @@ -1,4 +1,4 @@ -package io.dataease.api.chart.dto; +package io.dataease.extensions.view.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartFieldCustomFilterDTO.java b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartFieldCustomFilterDTO.java similarity index 76% rename from sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartFieldCustomFilterDTO.java rename to sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartFieldCustomFilterDTO.java index bbe6552c21..0f399e6ae7 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartFieldCustomFilterDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartFieldCustomFilterDTO.java @@ -1,6 +1,5 @@ -package io.dataease.api.chart.dto; +package io.dataease.extensions.view.dto; -import io.dataease.dto.dataset.DatasetTableFieldDTO; import lombok.Data; import java.util.List; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartSeniorAssistCfgDTO.java b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartSeniorAssistCfgDTO.java similarity index 80% rename from sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartSeniorAssistCfgDTO.java rename to sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartSeniorAssistCfgDTO.java index d51c175e10..eefa6d2a84 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartSeniorAssistCfgDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartSeniorAssistCfgDTO.java @@ -1,9 +1,10 @@ -package io.dataease.api.chart.dto; +package io.dataease.extensions.view.dto; import lombok.Data; import java.util.List; + @Data public class ChartSeniorAssistCfgDTO { private boolean enable; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartSeniorAssistDTO.java b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartSeniorAssistDTO.java similarity index 94% rename from sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartSeniorAssistDTO.java rename to sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartSeniorAssistDTO.java index 5c05f1987f..86d4a93352 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartSeniorAssistDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartSeniorAssistDTO.java @@ -1,4 +1,4 @@ -package io.dataease.api.chart.dto; +package io.dataease.extensions.view.dto; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonSerialize; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartViewBaseDTO.java b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewBaseDTO.java similarity index 97% rename from sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartViewBaseDTO.java rename to sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewBaseDTO.java index 335ec085ef..de153848f0 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartViewBaseDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewBaseDTO.java @@ -1,9 +1,9 @@ -package io.dataease.api.chart.dto; +package io.dataease.extensions.view.dto; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.dataease.api.chart.filter.FilterTreeObj; +import io.dataease.extensions.view.filter.FilterTreeObj; import lombok.Data; import java.io.Serializable; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartViewDTO.java b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewDTO.java similarity index 90% rename from sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartViewDTO.java rename to sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewDTO.java index e0ea03afb7..006426dd41 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartViewDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewDTO.java @@ -1,8 +1,7 @@ -package io.dataease.api.chart.dto; +package io.dataease.extensions.view.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.dataease.api.chart.request.ChartExtRequest; import lombok.Data; import java.util.List; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartViewFieldBaseDTO.java b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewFieldBaseDTO.java similarity index 87% rename from sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartViewFieldBaseDTO.java rename to sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewFieldBaseDTO.java index 8ec59644c4..680df7caed 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartViewFieldBaseDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewFieldBaseDTO.java @@ -1,6 +1,5 @@ -package io.dataease.api.chart.dto; +package io.dataease.extensions.view.dto; -import io.dataease.dto.dataset.DatasetTableFieldDTO; import lombok.Data; import java.io.Serializable; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartViewFieldDTO.java b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewFieldDTO.java similarity index 91% rename from sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartViewFieldDTO.java rename to sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewFieldDTO.java index e819d7b907..0f25bec208 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartViewFieldDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewFieldDTO.java @@ -1,4 +1,4 @@ -package io.dataease.api.chart.dto; +package io.dataease.extensions.view.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartViewFieldFilterDTO.java b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewFieldFilterDTO.java similarity index 75% rename from sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartViewFieldFilterDTO.java rename to sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewFieldFilterDTO.java index 4f42f61136..7e108219e4 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartViewFieldFilterDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewFieldFilterDTO.java @@ -1,8 +1,6 @@ -package io.dataease.api.chart.dto; +package io.dataease.extensions.view.dto; import lombok.Data; -import lombok.Getter; -import lombok.Setter; import java.io.Serializable; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/dto/DatasetRowPermissionsTreeItem.java b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/DatasetRowPermissionsTreeItem.java similarity index 89% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/dto/DatasetRowPermissionsTreeItem.java rename to sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/DatasetRowPermissionsTreeItem.java index 0a6780d5fc..3eb6f98bb8 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/dto/DatasetRowPermissionsTreeItem.java +++ b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/DatasetRowPermissionsTreeItem.java @@ -1,9 +1,8 @@ -package io.dataease.api.permissions.dataset.dto; +package io.dataease.extensions.view.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.dataease.dto.dataset.DatasetTableFieldDTO; import lombok.Data; import java.io.Serializable; diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/dto/DatasetRowPermissionsTreeObj.java b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/DatasetRowPermissionsTreeObj.java similarity index 85% rename from sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/dto/DatasetRowPermissionsTreeObj.java rename to sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/DatasetRowPermissionsTreeObj.java index eb91378c10..4e9d1730d7 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/dto/DatasetRowPermissionsTreeObj.java +++ b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/DatasetRowPermissionsTreeObj.java @@ -1,4 +1,4 @@ -package io.dataease.api.permissions.dataset.dto; +package io.dataease.extensions.view.dto; import lombok.Data; diff --git a/sdk/common/src/main/java/io/dataease/dto/dataset/DatasetTableFieldDTO.java b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/DatasetTableFieldDTO.java similarity index 98% rename from sdk/common/src/main/java/io/dataease/dto/dataset/DatasetTableFieldDTO.java rename to sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/DatasetTableFieldDTO.java index a9597b9c7e..9259328ffc 100644 --- a/sdk/common/src/main/java/io/dataease/dto/dataset/DatasetTableFieldDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/DatasetTableFieldDTO.java @@ -1,4 +1,4 @@ -package io.dataease.dto.dataset; +package io.dataease.extensions.view.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/FormatterCfgDTO.java b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/FormatterCfgDTO.java similarity index 89% rename from sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/FormatterCfgDTO.java rename to sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/FormatterCfgDTO.java index 1b6a5bd226..33ad371814 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/FormatterCfgDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/FormatterCfgDTO.java @@ -1,4 +1,4 @@ -package io.dataease.api.chart.dto; +package io.dataease.extensions.view.dto; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/SqlVariableDetails.java b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/SqlVariableDetails.java similarity index 96% rename from sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/SqlVariableDetails.java rename to sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/SqlVariableDetails.java index 3695098db8..c8cccefb4a 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/SqlVariableDetails.java +++ b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/SqlVariableDetails.java @@ -1,4 +1,4 @@ -package io.dataease.api.dataset.dto; +package io.dataease.extensions.view.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/factory/PluginsChartFactory.java b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/factory/PluginsChartFactory.java new file mode 100644 index 0000000000..be344f6c7c --- /dev/null +++ b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/factory/PluginsChartFactory.java @@ -0,0 +1,22 @@ +package io.dataease.extensions.view.factory; + +import io.dataease.extensions.view.template.PluginsChartTemplate; + +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +public class PluginsChartFactory { + + private static final Map templateMap = new ConcurrentHashMap<>(); + + public static PluginsChartTemplate getInstance(String render, String type) { + String key = render + "_" + type; + return templateMap.get(key); + } + + public static void loadTemplate(String render, String type, PluginsChartTemplate template) { + String key = render + "_" + type; + if (templateMap.containsKey(key)) return; + templateMap.put(key, template); + } +} diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/filter/FilterTreeItem.java b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/filter/FilterTreeItem.java similarity index 88% rename from sdk/api/api-base/src/main/java/io/dataease/api/chart/filter/FilterTreeItem.java rename to sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/filter/FilterTreeItem.java index c506b0c92c..38e56daaa1 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/filter/FilterTreeItem.java +++ b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/filter/FilterTreeItem.java @@ -1,8 +1,8 @@ -package io.dataease.api.chart.filter; +package io.dataease.extensions.view.filter; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.dataease.dto.dataset.DatasetTableFieldDTO; +import io.dataease.extensions.view.dto.DatasetTableFieldDTO; import lombok.Data; import java.io.Serializable; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/filter/FilterTreeObj.java b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/filter/FilterTreeObj.java similarity index 80% rename from sdk/api/api-base/src/main/java/io/dataease/api/chart/filter/FilterTreeObj.java rename to sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/filter/FilterTreeObj.java index 6841a150e5..57e042a525 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/filter/FilterTreeObj.java +++ b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/filter/FilterTreeObj.java @@ -1,4 +1,4 @@ -package io.dataease.api.chart.filter; +package io.dataease.extensions.view.filter; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/model/SQLMeta.java b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/model/SQLMeta.java similarity index 95% rename from sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/model/SQLMeta.java rename to sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/model/SQLMeta.java index e08bb078c8..7bd2b33f0a 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/model/SQLMeta.java +++ b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/model/SQLMeta.java @@ -1,4 +1,4 @@ -package io.dataease.api.dataset.union.model; +package io.dataease.extensions.view.model; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/model/SQLObj.java b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/model/SQLObj.java similarity index 93% rename from sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/model/SQLObj.java rename to sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/model/SQLObj.java index 9f4218f54e..18e9efe965 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/model/SQLObj.java +++ b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/model/SQLObj.java @@ -1,4 +1,4 @@ -package io.dataease.api.dataset.union.model; +package io.dataease.extensions.view.model; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/template/PluginsChartTemplate.java b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/template/PluginsChartTemplate.java new file mode 100644 index 0000000000..c64ad94fd4 --- /dev/null +++ b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/template/PluginsChartTemplate.java @@ -0,0 +1,40 @@ +package io.dataease.extensions.view.template; + +import io.dataease.extensions.view.dto.ChartViewDTO; +import io.dataease.extensions.view.dto.ChartViewFieldDTO; +import io.dataease.extensions.view.dto.DatasetTableFieldDTO; +import io.dataease.extensions.view.model.SQLMeta; + +import java.util.List; +import java.util.Map; + +public abstract class PluginsChartTemplate { + + public abstract Map> formatChartAxis(ChartViewDTO view); + + /*public Map> formatChartAxis(ChartViewDTO view) { + Map> result = new HashMap<>(); + + List xAxisBase = new ArrayList<>(view.getXAxis()); + result.put("xAxisBase", xAxisBase); + List xAxis = new ArrayList<>(view.getXAxis()); + result.put("xAxis", xAxis); + List xAxisExt = new ArrayList<>(view.getXAxisExt()); + result.put("xAxisExt", xAxisExt); + List yAxis = new ArrayList<>(view.getYAxis()); + result.put("yAxis", yAxis); + List extStack = new ArrayList<>(view.getExtStack()); + result.put("extStack", extStack); + List extBubble = new ArrayList<>(view.getExtBubble()); + result.put("extBubble", extBubble); + List drill = new ArrayList<>(view.getDrillFields()); + result.put("drill", drill); + List viewFields = new ArrayList<>(view.getViewFields()); + result.put("viewFields", viewFields); + return result; + }*/ + + public abstract ChartViewDTO calcResult(SQLMeta sqlMeta, List xaxis, List yaxis, + List allFields, boolean crossDs, Map dsTypeMap); + +} diff --git a/sdk/extensions/pom.xml b/sdk/extensions/pom.xml new file mode 100644 index 0000000000..a56c714bc1 --- /dev/null +++ b/sdk/extensions/pom.xml @@ -0,0 +1,32 @@ + + + 4.0.0 + + io.dataease + sdk + ${dataease.version} + + + pom + + extensions-view + + + extensions + + + 21 + 21 + UTF-8 + + + + + com.fasterxml.jackson.core + jackson-databind + + + + \ No newline at end of file diff --git a/sdk/pom.xml b/sdk/pom.xml index 36ca599108..59309d36a9 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -16,6 +16,7 @@ common api distributed + extensions \ No newline at end of file