diff --git a/core/core-backend/pom.xml b/core/core-backend/pom.xml
index f738ba5..2587cad 100644
--- a/core/core-backend/pom.xml
+++ b/core/core-backend/pom.xml
@@ -3,33 +3,40 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- gisbi
+ core
io.gisbi
- 1.0.0
+ 2.0.0
+
4.0.0
jar
core-backend
+
+
+ commons-net
+ commons-net
+ 3.8.0
+
com.google.guava
guava
- ${guava.version}
+ 33.0.0-jre
io.gisbi
api-base
- 1.0.0
+ 2.0.0
io.gisbi
common
- 1.0.0
+ 2.0.0
io.gisbi
api-sync
- 1.0.0
+ 2.0.0
com.mysql
@@ -38,18 +45,18 @@
org.apache.commons
commons-dbcp2
- ${commons-dbcp2.version}
+ 2.6.0
org.antlr
antlr
- ${antlr.version}
+ 3.5.2
junit
junit
- ${junit.version}
+ 4.13.2
test
@@ -73,7 +80,6 @@
hutool-all
5.8.8
-
org.springframework.boot
spring-boot-starter-websocket
@@ -93,15 +99,10 @@
org.apache.commons
commons-lang3
-
- cn.hutool
- hutool-all
- 5.8.38
-
io.gisbi
api-permissions
- 1.0.0
+ 2.0.0
@@ -125,12 +126,12 @@
org.seleniumhq.selenium
selenium-java
- ${selenium-java.version}
+ 4.19.1
org.eclipse.angus
angus-mail
- ${angus-mail.version}
+ 2.0.3
org.eclipse.angus
@@ -141,13 +142,13 @@
com.itextpdf
itext7-core
- ${itextpdf.version}
+ 8.0.4
pom
com.vladsch.flexmark
flexmark-all
- ${flexmark.version}
+ 0.62.2
diff --git a/core/core-backend/src/main/java/io/gisbi/MybatisPlusGenerator.java b/core/core-backend/src/main/java/io/gisbi/MybatisPlusGenerator.java
index c5db994..a621a48 100644
--- a/core/core-backend/src/main/java/io/gisbi/MybatisPlusGenerator.java
+++ b/core/core-backend/src/main/java/io/gisbi/MybatisPlusGenerator.java
@@ -14,7 +14,7 @@ public class MybatisPlusGenerator {
* 第一 我嫌麻烦
* 第二 后面配置会放到nacos读起来更麻烦了
*/
- private static final String url = "jdbc:mysql://localhost:3306/dataease?autoReconnect=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false";
+ private static final String url = "jdbc:mysql://localhost:3306/gisbi?autoReconnect=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false";
private static final String username = "root";
private static final String password = "123456";
diff --git a/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/DefaultChartHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/DefaultChartHandler.java
index 7f00f9c..1fd82ad 100644
--- a/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/DefaultChartHandler.java
+++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/DefaultChartHandler.java
@@ -1,12 +1,14 @@
package io.gisbi.chart.charts.impl;
+import com.beust.jcommander.Strings;
+import io.gisbi.api.dataset.union.DatasetGroupInfoDTO;
import io.gisbi.chart.charts.ChartHandlerManager;
import io.gisbi.chart.constant.ChartConstants;
import io.gisbi.chart.manage.ChartDataManage;
import io.gisbi.chart.manage.ChartViewManege;
import io.gisbi.chart.utils.ChartDataBuild;
-import io.gisbi.dataset.manage.DatasetTableFieldManage;
import io.gisbi.constant.SQLConstants;
+import io.gisbi.dataset.manage.DatasetTableFieldManage;
import io.gisbi.engine.sql.SQLProvider;
import io.gisbi.engine.trans.Dimension2SQLObj;
import io.gisbi.engine.trans.Quota2SQLObj;
@@ -82,7 +84,7 @@ public class DefaultChartHandler extends AbstractChartPlugin {
var desensitizationList = (Map) formatResult.getContext().get("desensitizationList");
if (MapUtils.isNotEmpty(desensitizationList)) {
formatResult.getAxisMap().forEach((axis, fields) -> {
- fields.removeIf(f -> desensitizationList.containsKey(f.getDataeaseName()));
+ fields.removeIf(f -> desensitizationList.containsKey(f.getGisbiName()));
});
}
return (T) new CustomFilterResult(filterList, formatResult.getContext());
@@ -107,8 +109,9 @@ public class DefaultChartHandler extends AbstractChartPlugin {
dsList.add(next.getValue().getType());
}
boolean needOrder = Utils.isNeedOrder(dsList);
- boolean crossDs = Utils.isCrossDs(dsMap);
+ boolean crossDs = ((DatasetGroupInfoDTO) formatResult.getContext().get("dataset")).getIsCross();
DatasourceRequest datasourceRequest = new DatasourceRequest();
+ datasourceRequest.setIsCross(crossDs);
datasourceRequest.setDsList(dsMap);
var xAxis = formatResult.getAxisMap().get(ChartAxis.xAxis);
var yAxis = formatResult.getAxisMap().get(ChartAxis.yAxis);
@@ -168,8 +171,8 @@ public class DefaultChartHandler extends AbstractChartPlugin {
dataMap.putAll(calcResult.getData());
dataMap.putAll(mapTableNormal);
dataMap.put("sourceFields", allFields);
- mergeAssistField(calcResult.getDynamicAssistFields(), calcResult.getAssistData());
- dataMap.put("dynamicAssistLines", calcResult.getDynamicAssistFields());
+ List chartSeniorAssistDTOS = mergeAssistField(calcResult.getDynamicAssistFields(), calcResult.getAssistData(), calcResult.getDynamicAssistFieldsOriginList(), calcResult.getAssistDataOriginList());
+ dataMap.put("dynamicAssistLines", chartSeniorAssistDTOS);
view.setData(dataMap);
view.setSql(Base64.getEncoder().encodeToString(calcResult.getQuerySql().getBytes()));
view.setDrill(isDrill);
@@ -177,18 +180,30 @@ public class DefaultChartHandler extends AbstractChartPlugin {
return view;
}
-
- protected void mergeAssistField(List dynamicAssistFields, List assistData) {
- if (ObjectUtils.isEmpty(assistData)) {
- return;
- }
- String[] strings = assistData.get(0);
- for (int i = 0; i < dynamicAssistFields.size(); i++) {
- if (i < strings.length) {
- ChartSeniorAssistDTO chartSeniorAssistDTO = dynamicAssistFields.get(i);
- chartSeniorAssistDTO.setValue(strings[i]);
+ protected List mergeAssistField(List dynamicAssistFields, List assistData, List dynamicAssistFieldsOriginList, List assistDataOriginList) {
+ List list = new ArrayList<>();
+ if (ObjectUtils.isNotEmpty(assistData)) {
+ String[] strings = assistData.getFirst();
+ for (int i = 0; i < dynamicAssistFields.size(); i++) {
+ if (i < strings.length) {
+ ChartSeniorAssistDTO chartSeniorAssistDTO = dynamicAssistFields.get(i);
+ chartSeniorAssistDTO.setValue(strings[i]);
+ list.add(chartSeniorAssistDTO);
+ }
}
}
+
+ if (ObjectUtils.isNotEmpty(assistDataOriginList)) {
+ String[] stringsOriginList = assistDataOriginList.getLast();// 取最后一项，如果有其他运算逻辑需要取明细数据可增加逻辑
+ for (int i = 0; i < dynamicAssistFieldsOriginList.size(); i++) {
+ if (i < stringsOriginList.length) {
+ ChartSeniorAssistDTO chartSeniorAssistDTO = dynamicAssistFieldsOriginList.get(i);
+ chartSeniorAssistDTO.setValue(stringsOriginList[i]);
+ list.add(chartSeniorAssistDTO);
+ }
+ }
+ }
+ return list;
}
protected List getDynamicAssistFields(ChartViewDTO view) {
@@ -370,7 +385,7 @@ public class DefaultChartHandler extends AbstractChartPlugin {
return conditionField;
}
- protected String assistSQL(String sql, List assistFields, Map dsMap) {
+ protected String assistSQL(String sql, List assistFields, Map dsMap, boolean crossDs) {
// get datasource prefix and suffix
String dsType = dsMap.entrySet().iterator().next().getValue().getType();
String prefix = "";
@@ -391,25 +406,54 @@ public class DefaultChartHandler extends AbstractChartPlugin {
}
}
- boolean crossDs = Utils.isCrossDs(dsMap);
- StringBuilder stringBuilder = new StringBuilder();
+ List fieldList = new ArrayList<>();
for (int i = 0; i < assistFields.size(); i++) {
ChartViewFieldDTO dto = assistFields.get(i);
+ if (StringUtils.equalsIgnoreCase(dto.getSummary(), "last_item")) {
+ continue;
+ }
if (crossDs) {
- if (i == (assistFields.size() - 1)) {
- stringBuilder.append(dto.getSummary() + "(" + dto.getOriginName() + ")");
- } else {
- stringBuilder.append(dto.getSummary() + "(" + dto.getOriginName() + "),");
- }
+ fieldList.add(dto.getSummary() + "(" + dto.getOriginName() + ")");
} else {
- if (i == (assistFields.size() - 1)) {
- stringBuilder.append(dto.getSummary() + "(" + prefix + dto.getOriginName() + suffix + ")");
+ fieldList.add(dto.getSummary() + "(" + prefix + dto.getOriginName() + suffix + ")");
+ }
+ }
+ return "SELECT " + Strings.join(",", fieldList) + " FROM (" + sql + ") tmp";
+ }
+
+ protected String assistSQLOriginList(String sql, List assistFields, Map dsMap, boolean crossDs) {
+ // get datasource prefix and suffix
+ String dsType = dsMap.entrySet().iterator().next().getValue().getType();
+ String prefix = "";
+ String suffix = "";
+ if (Arrays.stream(DatasourceConfiguration.DatasourceType.values()).map(DatasourceConfiguration.DatasourceType::getType).toList().contains(dsType)) {
+ DatasourceConfiguration.DatasourceType datasourceType = DatasourceConfiguration.DatasourceType.valueOf(dsType);
+ prefix = datasourceType.getPrefix();
+ suffix = datasourceType.getSuffix();
+ } else {
+ List xpackPluginsDatasourceVOS = pluginManage.queryPluginDs();
+ List list = xpackPluginsDatasourceVOS.stream().filter(ele -> StringUtils.equals(ele.getType(), dsType)).toList();
+ if (ObjectUtils.isNotEmpty(list)) {
+ XpackPluginsDatasourceVO first = list.getFirst();
+ prefix = first.getPrefix();
+ suffix = first.getSuffix();
+ } else {
+ DEException.throwException("当前数据源插件不存在");
+ }
+ }
+
+ List fieldList = new ArrayList<>();
+ for (int i = 0; i < assistFields.size(); i++) {
+ ChartViewFieldDTO dto = assistFields.get(i);
+ if (StringUtils.equalsIgnoreCase(dto.getSummary(), "last_item")) {
+ if (crossDs) {
+ fieldList.add(dto.getOriginName());
} else {
- stringBuilder.append(dto.getSummary() + "(" + prefix + dto.getOriginName() + suffix + "),");
+ fieldList.add(prefix + dto.getOriginName() + suffix);
}
}
}
- return "SELECT " + stringBuilder + " FROM (" + sql + ") tmp";
+ return "SELECT " + Strings.join(",", fieldList) + " FROM (" + sql + ") tmp";
}
protected List mergeIds(List xAxisExt, List extStack) {
@@ -522,26 +566,29 @@ public class DefaultChartHandler extends AbstractChartPlugin {
if (CollectionUtils.isEmpty(data)) {
break;
}
- if (StringUtils.containsAny(chartType, "group", "stack")) {
+ if (Objects.isNull(extStack)) {
+ extStack = Arrays.asList();
+ }
+ if (Objects.isNull(xAxisExt)) {
+ xAxisExt = Arrays.asList();
+ }
+ boolean isStack = StringUtils.containsIgnoreCase(chartType, "stack") && CollectionUtils.isNotEmpty(extStack);
+ boolean isGroup = StringUtils.containsIgnoreCase(chartType, "group")
+ || (CollectionUtils.isNotEmpty(xAxisExt));
+ if (isStack || isGroup) {
if (CollectionUtils.isEmpty(xAxis)) {
break;
}
- if (StringUtils.containsIgnoreCase(chartType, "stack") && extStack.isEmpty()) {
- break;
- }
- if (StringUtils.containsIgnoreCase(chartType, "group") && xAxisExt.isEmpty()) {
- break;
- }
final Map mainIndexMap = new HashMap<>();
final List> mainMatrix = new ArrayList<>();
// 排除group和stack的字段
List groupStackAxisIds = mergeIds(xAxisExt, extStack);
- List finalXAxisBase = xAxis.stream().filter(ele->!groupStackAxisIds.contains(String.valueOf(ele.getId()))).toList();
- if (CollectionUtils.isEmpty(finalXAxisBase) && CollectionUtils.isNotEmpty(xAxis)) {
- finalXAxisBase.add(xAxis.get(0));
+ List xAxisBase = xAxis.stream().filter(ele -> !groupStackAxisIds.contains(String.valueOf(ele.getId()))).collect(Collectors.toList());
+ if (CollectionUtils.isEmpty(xAxisBase) && CollectionUtils.isNotEmpty(xAxis)) {
+ xAxisBase.add(xAxis.get(0));
}
data.forEach(item -> {
- String[] mainAxisArr = Arrays.copyOfRange(item, 0, finalXAxisBase.size());
+ String[] mainAxisArr = Arrays.copyOfRange(item, 0, xAxisBase.size());
String mainAxis = StringUtils.join(mainAxisArr, '-');
Integer index = mainIndexMap.get(mainAxis);
if (index == null) {
@@ -555,21 +602,24 @@ public class DefaultChartHandler extends AbstractChartPlugin {
}
});
int finalDataIndex = dataIndex;
- int subEndIndex = finalXAxisBase.size();
- if (StringUtils.containsIgnoreCase(chartType, "group")) {
+ int subEndIndex = xAxisBase.size();
+ if (CollectionUtils.isNotEmpty(xAxisExt)
+ || StringUtils.containsIgnoreCase(chartType, "group")
+ || StringUtils.containsIgnoreCase(chartType, "-mix")) {
subEndIndex += xAxisExt.size();
}
if (StringUtils.containsIgnoreCase(chartType, "stack")) {
subEndIndex += extStack.size();
}
int finalSubEndIndex = subEndIndex;
+ // 存储上次的值
+ Map preDataMap = new HashMap<>();
//滑动累加
for (int k = 1; k < mainMatrix.size(); k++) {
List preDataItems = mainMatrix.get(k - 1);
List curDataItems = mainMatrix.get(k);
- Map preDataMap = new HashMap<>();
preDataItems.forEach(preDataItem -> {
- String[] groupStackAxisArr = Arrays.copyOfRange(preDataItem, finalXAxisBase.size(), finalSubEndIndex);
+ String[] groupStackAxisArr = Arrays.copyOfRange(preDataItem, xAxisBase.size(), finalSubEndIndex);
String groupStackAxis = StringUtils.join(groupStackAxisArr, '-');
String preVal = preDataItem[finalDataIndex];
if (StringUtils.isBlank(preVal)) {
@@ -578,13 +628,19 @@ public class DefaultChartHandler extends AbstractChartPlugin {
preDataMap.put(groupStackAxis, new BigDecimal(preVal));
});
curDataItems.forEach(curDataItem -> {
- String[] groupStackAxisArr = Arrays.copyOfRange(curDataItem, finalXAxisBase.size(), finalSubEndIndex);
+ String[] groupStackAxisArr = Arrays.copyOfRange(curDataItem, xAxisBase.size(), finalSubEndIndex);
String groupStackAxis = StringUtils.join(groupStackAxisArr, '-');
BigDecimal preValue = preDataMap.get(groupStackAxis);
if (preValue != null) {
curDataItem[finalDataIndex] = new BigDecimal(curDataItem[finalDataIndex])
.add(preValue)
.toString();
+ } else {
+ if (preDataMap.containsKey(groupStackAxis)) {
+ curDataItem[finalDataIndex] = new BigDecimal(curDataItem[finalDataIndex])
+ .add(preDataMap.get(groupStackAxis))
+ .toString();
+ }
}
});
}
diff --git a/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/YoyChartHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/YoyChartHandler.java
index d4af6b9..438d0af 100644
--- a/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/YoyChartHandler.java
+++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/YoyChartHandler.java
@@ -2,6 +2,7 @@ package io.gisbi.chart.charts.impl;
import com.fasterxml.jackson.core.type.TypeReference;
+import io.gisbi.api.dataset.union.DatasetGroupInfoDTO;
import io.gisbi.engine.sql.SQLProvider;
import io.gisbi.engine.trans.ExtWhere2Str;
import io.gisbi.engine.utils.Utils;
@@ -74,7 +75,7 @@ public class YoyChartHandler extends DefaultChartHandler {
dsList.add(next.getValue().getType());
}
boolean needOrder = Utils.isNeedOrder(dsList);
- boolean crossDs = Utils.isCrossDs(dsMap);
+ boolean crossDs = ((DatasetGroupInfoDTO) formatResult.getContext().get("dataset")).getIsCross();
// 这里拿到的可能有一年前的数据
var expandedResult = (T) super.calcChartResult(view, formatResult, filterResult, sqlMap, sqlMeta, provider);
// 检查同环比过滤，拿到实际数据
@@ -86,6 +87,7 @@ public class YoyChartHandler extends DefaultChartHandler {
var originSql = SQLProvider.createQuerySQL(sqlMeta, true, needOrder, view);
originSql = provider.rebuildSQL(originSql, sqlMeta, crossDs, dsMap);
var request = new DatasourceRequest();
+ request.setIsCross(crossDs);
request.setDsList(dsMap);
request.setQuery(originSql);
logger.debug("calcite yoy sql: " + originSql);
diff --git a/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/bar/BarHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/bar/BarHandler.java
index 7e83893..8510cb0 100644
--- a/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/bar/BarHandler.java
+++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/bar/BarHandler.java
@@ -1,5 +1,6 @@
package io.gisbi.chart.charts.impl.bar;
+import io.gisbi.api.dataset.union.DatasetGroupInfoDTO;
import io.gisbi.chart.charts.impl.YoyChartHandler;
import io.gisbi.engine.utils.Utils;
import io.gisbi.extensions.datasource.dto.DatasourceRequest;
@@ -8,6 +9,8 @@ import io.gisbi.extensions.datasource.model.SQLMeta;
import io.gisbi.extensions.datasource.provider.Provider;
import io.gisbi.extensions.view.dto.*;
import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
@@ -42,7 +45,7 @@ public class BarHandler extends YoyChartHandler {
dsList.add(next.getValue().getType());
}
boolean needOrder = Utils.isNeedOrder(dsList);
- boolean crossDs = Utils.isCrossDs(dsMap);
+ boolean crossDs = ((DatasetGroupInfoDTO) formatResult.getContext().get("dataset")).getIsCross();
var result = (T) super.calcChartResult(view, formatResult, filterResult, sqlMap, sqlMeta, provider);
try {
//如果有同环比过滤,应该用原始sql
@@ -52,13 +55,28 @@ public class BarHandler extends YoyChartHandler {
var assistFields = getAssistFields(dynamicAssistFields, yAxis);
if (CollectionUtils.isNotEmpty(assistFields)) {
var req = new DatasourceRequest();
+ req.setIsCross(crossDs);
req.setDsList(dsMap);
- var assistSql = assistSQL(originSql, assistFields, dsMap);
- req.setQuery(assistSql);
- logger.debug("calcite assistSql sql: " + assistSql);
- var assistData = (List) provider.fetchResultField(req).get("data");
- result.setAssistData(assistData);
- result.setDynamicAssistFields(dynamicAssistFields);
+
+ List assists = dynamicAssistFields.stream().filter(ele -> !StringUtils.equalsIgnoreCase(ele.getSummary(), "last_item")).toList();
+ if (ObjectUtils.isNotEmpty(assists)) {
+ var assistSql = assistSQL(originSql, assistFields, dsMap, crossDs);
+ req.setQuery(assistSql);
+ logger.debug("calcite assistSql sql: " + assistSql);
+ var assistData = (List) provider.fetchResultField(req).get("data");
+ result.setAssistData(assistData);
+ result.setDynamicAssistFields(assists);
+ }
+
+ List assistsOriginList = dynamicAssistFields.stream().filter(ele -> StringUtils.equalsIgnoreCase(ele.getSummary(), "last_item")).toList();
+ if (ObjectUtils.isNotEmpty(assistsOriginList)) {
+ var assistSqlOriginList = assistSQLOriginList(originSql, assistFields, dsMap, crossDs);
+ req.setQuery(assistSqlOriginList);
+ logger.debug("calcite assistSql sql origin list: " + assistSqlOriginList);
+ var assistDataOriginList = (List) provider.fetchResultField(req).get("data");
+ result.setAssistDataOriginList(assistDataOriginList);
+ result.setDynamicAssistFieldsOriginList(assistsOriginList);
+ }
}
} catch (Exception e) {
e.printStackTrace();
diff --git a/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/line/LineHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/line/LineHandler.java
index 5f90baa..1265f41 100644
--- a/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/line/LineHandler.java
+++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/line/LineHandler.java
@@ -1,5 +1,6 @@
package io.gisbi.chart.charts.impl.line;
+import io.gisbi.api.dataset.union.DatasetGroupInfoDTO;
import io.gisbi.chart.charts.impl.YoyChartHandler;
import io.gisbi.chart.utils.ChartDataBuild;
import io.gisbi.extensions.datasource.dto.DatasourceRequest;
@@ -9,6 +10,8 @@ import io.gisbi.extensions.datasource.provider.Provider;
import io.gisbi.extensions.view.dto.*;
import lombok.Getter;
import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
@@ -55,6 +58,7 @@ public class LineHandler extends YoyChartHandler {
for (Map.Entry next : dsMap.entrySet()) {
dsList.add(next.getValue().getType());
}
+ boolean crossDs = ((DatasetGroupInfoDTO) formatResult.getContext().get("dataset")).getIsCross();
var result = (T) super.calcChartResult(view, formatResult, filterResult, sqlMap, sqlMeta, provider);
try {
//如果有同环比过滤,应该用原始sql
@@ -64,13 +68,28 @@ public class LineHandler extends YoyChartHandler {
var assistFields = getAssistFields(dynamicAssistFields, yAxis);
if (CollectionUtils.isNotEmpty(assistFields)) {
var req = new DatasourceRequest();
+ req.setIsCross(crossDs);
req.setDsList(dsMap);
- var assistSql = assistSQL(originSql, assistFields, dsMap);
- req.setQuery(assistSql);
- logger.debug("calcite assistSql sql: " + assistSql);
- var assistData = (List) provider.fetchResultField(req).get("data");
- result.setAssistData(assistData);
- result.setDynamicAssistFields(dynamicAssistFields);
+
+ List assists = dynamicAssistFields.stream().filter(ele -> !StringUtils.equalsIgnoreCase(ele.getSummary(), "last_item")).toList();
+ if (ObjectUtils.isNotEmpty(assists)) {
+ var assistSql = assistSQL(originSql, assistFields, dsMap, crossDs);
+ req.setQuery(assistSql);
+ logger.debug("calcite assistSql sql: " + assistSql);
+ var assistData = (List) provider.fetchResultField(req).get("data");
+ result.setAssistData(assistData);
+ result.setDynamicAssistFields(assists);
+ }
+
+ List assistsOriginList = dynamicAssistFields.stream().filter(ele -> StringUtils.equalsIgnoreCase(ele.getSummary(), "last_item")).toList();
+ if (ObjectUtils.isNotEmpty(assistsOriginList)) {
+ var assistSqlOriginList = assistSQLOriginList(originSql, assistFields, dsMap, crossDs);
+ req.setQuery(assistSqlOriginList);
+ logger.debug("calcite assistSql sql origin list: " + assistSqlOriginList);
+ var assistDataOriginList = (List) provider.fetchResultField(req).get("data");
+ result.setAssistDataOriginList(assistDataOriginList);
+ result.setDynamicAssistFieldsOriginList(assistsOriginList);
+ }
}
} catch (Exception e) {
e.printStackTrace();
diff --git a/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/line/StackAreaHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/line/StackAreaHandler.java
index 70b9a4f..fe67e90 100644
--- a/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/line/StackAreaHandler.java
+++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/line/StackAreaHandler.java
@@ -1,5 +1,6 @@
package io.gisbi.chart.charts.impl.line;
+import io.gisbi.api.dataset.union.DatasetGroupInfoDTO;
import io.gisbi.chart.charts.impl.YoyChartHandler;
import io.gisbi.chart.utils.ChartDataBuild;
import io.gisbi.engine.utils.Utils;
@@ -11,6 +12,7 @@ import io.gisbi.extensions.view.dto.*;
import lombok.Getter;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
@@ -89,7 +91,7 @@ public class StackAreaHandler extends YoyChartHandler {
dsList.add(next.getValue().getType());
}
boolean needOrder = Utils.isNeedOrder(dsList);
- boolean crossDs = Utils.isCrossDs(dsMap);
+ boolean crossDs = ((DatasetGroupInfoDTO) formatResult.getContext().get("dataset")).getIsCross();
var result = (T) super.calcChartResult(view, formatResult, filterResult, sqlMap, sqlMeta, provider);
try {
//如果有同环比过滤,应该用原始sql
@@ -99,13 +101,28 @@ public class StackAreaHandler extends YoyChartHandler {
var assistFields = getAssistFields(dynamicAssistFields, yAxis);
if (CollectionUtils.isNotEmpty(assistFields)) {
var req = new DatasourceRequest();
+ req.setIsCross(crossDs);
req.setDsList(dsMap);
- var assistSql = assistSQL(originSql, assistFields, dsMap);
- req.setQuery(assistSql);
- logger.debug("calcite assist sql: " + assistSql);
- var assistData = (List) provider.fetchResultField(req).get("data");
- result.setAssistData(assistData);
- result.setDynamicAssistFields(dynamicAssistFields);
+
+ List assists = dynamicAssistFields.stream().filter(ele -> !StringUtils.equalsIgnoreCase(ele.getSummary(), "last_item")).toList();
+ if (ObjectUtils.isNotEmpty(assists)) {
+ var assistSql = assistSQL(originSql, assistFields, dsMap, crossDs);
+ req.setQuery(assistSql);
+ logger.debug("calcite assistSql sql: " + assistSql);
+ var assistData = (List) provider.fetchResultField(req).get("data");
+ result.setAssistData(assistData);
+ result.setDynamicAssistFields(assists);
+ }
+
+ List assistsOriginList = dynamicAssistFields.stream().filter(ele -> StringUtils.equalsIgnoreCase(ele.getSummary(), "last_item")).toList();
+ if (ObjectUtils.isNotEmpty(assistsOriginList)) {
+ var assistSqlOriginList = assistSQLOriginList(originSql, assistFields, dsMap, crossDs);
+ req.setQuery(assistSqlOriginList);
+ logger.debug("calcite assistSql sql origin list: " + assistSqlOriginList);
+ var assistDataOriginList = (List) provider.fetchResultField(req).get("data");
+ result.setAssistDataOriginList(assistDataOriginList);
+ result.setDynamicAssistFieldsOriginList(assistsOriginList);
+ }
}
} catch (Exception e) {
e.printStackTrace();
diff --git a/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/map/SymbolicMapHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/map/SymbolicMapHandler.java
index b19f87a..30ed621 100644
--- a/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/map/SymbolicMapHandler.java
+++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/map/SymbolicMapHandler.java
@@ -1,5 +1,6 @@
package io.gisbi.chart.charts.impl.map;
+import io.gisbi.api.dataset.union.DatasetGroupInfoDTO;
import io.gisbi.chart.charts.impl.GroupChartHandler;
import io.gisbi.chart.utils.ChartDataBuild;
import io.gisbi.dataset.manage.DatasetDataManage;
@@ -60,22 +61,23 @@ public class SymbolicMapHandler extends GroupChartHandler {
boolean needOrder = Utils.isNeedOrder(dsList);
boolean crossDs = Utils.isCrossDs(dsMap);
DatasourceRequest datasourceRequest = new DatasourceRequest();
+ datasourceRequest.setIsCross(((DatasetGroupInfoDTO) formatResult.getContext().get("dataset")).getIsCross());
datasourceRequest.setDsList(dsMap);
var xAxis = formatResult.getAxisMap().get(ChartAxis.xAxis);
var extBubble = formatResult.getAxisMap().get(ChartAxis.extBubble);
var allFields = (List) filterResult.getContext().get("allFields");
- List countField =chartViewManege.transFieldDTO(Collections.singletonList(chartViewManege.createCountField(view.getTableId())));
+ List countField = chartViewManege.transFieldDTO(Collections.singletonList(chartViewManege.createCountField(view.getTableId())));
List datasetTableFieldDTOList = FieldUtil.transFields(allFields);
SQLMeta sqlMeta1 = new SQLMeta();
BeanUtils.copyBean(sqlMeta1, sqlMeta);
Dimension2SQLObj.dimension2sqlObj(sqlMeta, xAxis, datasetTableFieldDTOList, crossDs, dsMap, Utils.getParams(datasetTableFieldDTOList), view.getCalParams(), pluginManage);
List yAxis = new ArrayList<>();
- if(!extBubble.isEmpty() && !"*".equals(extBubble.get(0).getDataeaseName())){
+ if (!extBubble.isEmpty() && !"*".equals(extBubble.get(0).getGisbiName())) {
yAxis.addAll(extBubble);
}
yAxis.addAll(countField);
datasetTableFieldDTOList.addAll(FieldUtil.transFields(countField));
- formatResult.getAxisMap().put(ChartAxis.yAxis,countField);
+ formatResult.getAxisMap().put(ChartAxis.yAxis, countField);
Quota2SQLObj.quota2sqlObj(sqlMeta, yAxis, datasetTableFieldDTOList, crossDs, dsMap, Utils.getParams(datasetTableFieldDTOList), view.getCalParams(), pluginManage);
String querySql = SQLProvider.createQuerySQL(sqlMeta, true, needOrder, view);
querySql = provider.rebuildSQL(querySql, sqlMeta, crossDs, dsMap);
@@ -102,6 +104,7 @@ public class SymbolicMapHandler extends GroupChartHandler {
logger.debug("calcite data preview sql: " + querySQL);
// 调用数据源的calcite获得data
DatasourceRequest datasourceRequest1 = new DatasourceRequest();
+ datasourceRequest1.setIsCross(((DatasetGroupInfoDTO) formatResult.getContext().get("dataset")).getIsCross());
datasourceRequest1.setQuery(querySQL);
datasourceRequest1.setDsList(dsMap);
detailData = (List) provider.fetchResultField(datasourceRequest1).get("data");
@@ -115,7 +118,7 @@ public class SymbolicMapHandler extends GroupChartHandler {
calcResult.setContext(filterResult.getContext());
calcResult.setQuerySql(querySql);
calcResult.setOriginData(data);
- formatResult.getAxisMap().put(ChartAxis.yAxis,new ArrayList<>());
+ formatResult.getAxisMap().put(ChartAxis.yAxis, new ArrayList<>());
return calcResult;
}
@@ -142,8 +145,8 @@ public class SymbolicMapHandler extends GroupChartHandler {
dataMap.putAll(calcResult.getData());
dataMap.putAll(mapTableNormal);
dataMap.put("sourceFields", allFields);
- mergeAssistField(calcResult.getDynamicAssistFields(), calcResult.getAssistData());
- dataMap.put("dynamicAssistLines", calcResult.getDynamicAssistFields());
+ List chartSeniorAssistDTOS = mergeAssistField(calcResult.getDynamicAssistFields(), calcResult.getAssistData(), calcResult.getDynamicAssistFieldsOriginList(), calcResult.getAssistDataOriginList());
+ dataMap.put("dynamicAssistLines", chartSeniorAssistDTOS);
view.setData(dataMap);
view.setSql(Base64.getEncoder().encodeToString(calcResult.getQuerySql().getBytes()));
view.setDrill(isDrill);
diff --git a/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/mix/MixHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/mix/MixHandler.java
index 9977cee..bd538c0 100644
--- a/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/mix/MixHandler.java
+++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/mix/MixHandler.java
@@ -1,5 +1,6 @@
package io.gisbi.chart.charts.impl.mix;
+import io.gisbi.api.dataset.union.DatasetGroupInfoDTO;
import io.gisbi.chart.charts.impl.YoyChartHandler;
import io.gisbi.chart.utils.ChartDataBuild;
import io.gisbi.engine.utils.Utils;
@@ -10,6 +11,7 @@ import io.gisbi.extensions.datasource.provider.Provider;
import io.gisbi.extensions.view.dto.*;
import lombok.Getter;
import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
@@ -80,7 +82,7 @@ public class MixHandler extends YoyChartHandler {
dsList.add(next.getValue().getType());
}
boolean needOrder = Utils.isNeedOrder(dsList);
- boolean crossDs = Utils.isCrossDs(dsMap);
+ boolean crossDs = ((DatasetGroupInfoDTO) formatResult.getContext().get("dataset")).getIsCross();
var leftResult = (T) super.calcChartResult(view, formatResult, filterResult, sqlMap, sqlMeta, provider);
var dynamicAssistFields = getDynamicAssistFields(view);
try {
@@ -91,13 +93,28 @@ public class MixHandler extends YoyChartHandler {
var assistFields = getAssistFields(leftAssistFields, yAxis);
if (CollectionUtils.isNotEmpty(assistFields)) {
var req = new DatasourceRequest();
+ req.setIsCross(crossDs);
req.setDsList(dsMap);
- var assistSql = assistSQL(originSql, assistFields, dsMap);
- req.setQuery(assistSql);
- logger.debug("calcite assistSql sql: " + assistSql);
- var assistData = (List) provider.fetchResultField(req).get("data");
- leftResult.setAssistData(assistData);
- leftResult.setDynamicAssistFields(leftAssistFields);
+
+ List assists = leftAssistFields.stream().filter(ele -> !StringUtils.equalsIgnoreCase(ele.getSummary(), "last_item")).toList();
+ if (ObjectUtils.isNotEmpty(assists)) {
+ var assistSql = assistSQL(originSql, assistFields, dsMap, crossDs);
+ req.setQuery(assistSql);
+ logger.debug("calcite assistSql sql: " + assistSql);
+ var assistData = (List) provider.fetchResultField(req).get("data");
+ leftResult.setAssistData(assistData);
+ leftResult.setDynamicAssistFields(assists);
+ }
+
+ List assistsOriginList = leftAssistFields.stream().filter(ele -> StringUtils.equalsIgnoreCase(ele.getSummary(), "last_item")).toList();
+ if (ObjectUtils.isNotEmpty(assistsOriginList)) {
+ var assistSqlOriginList = assistSQLOriginList(originSql, assistFields, dsMap, crossDs);
+ req.setQuery(assistSqlOriginList);
+ logger.debug("calcite assistSql sql origin list: " + assistSqlOriginList);
+ var assistDataOriginList = (List) provider.fetchResultField(req).get("data");
+ leftResult.setAssistDataOriginList(assistDataOriginList);
+ leftResult.setDynamicAssistFieldsOriginList(assistsOriginList);
+ }
}
} catch (Exception e) {
e.printStackTrace();
@@ -143,12 +160,28 @@ public class MixHandler extends YoyChartHandler {
var assistFields = getAssistFields(rightAssistFields, yAxis);
if (CollectionUtils.isNotEmpty(assistFields)) {
var req = new DatasourceRequest();
+ req.setIsCross(crossDs);
req.setDsList(dsMap);
- var assistSql = assistSQL(originSql, assistFields, dsMap);
- req.setQuery(assistSql);
- var assistData = (List) provider.fetchResultField(req).get("data");
- rightResult.setAssistData(assistData);
- rightResult.setDynamicAssistFields(rightAssistFields);
+
+ List assists = rightAssistFields.stream().filter(ele -> !StringUtils.equalsIgnoreCase(ele.getSummary(), "last_item")).toList();
+ if (ObjectUtils.isNotEmpty(assists)) {
+ var assistSql = assistSQL(originSql, assistFields, dsMap, crossDs);
+ req.setQuery(assistSql);
+ logger.debug("calcite assistSql sql: " + assistSql);
+ var assistData = (List) provider.fetchResultField(req).get("data");
+ rightResult.setAssistData(assistData);
+ rightResult.setDynamicAssistFields(assists);
+ }
+
+ List assistsOriginList = rightAssistFields.stream().filter(ele -> StringUtils.equalsIgnoreCase(ele.getSummary(), "last_item")).toList();
+ if (ObjectUtils.isNotEmpty(assistsOriginList)) {
+ var assistSqlOriginList = assistSQLOriginList(originSql, assistFields, dsMap, crossDs);
+ req.setQuery(assistSqlOriginList);
+ logger.debug("calcite assistSql sql origin list: " + assistSqlOriginList);
+ var assistDataOriginList = (List) provider.fetchResultField(req).get("data");
+ rightResult.setAssistDataOriginList(assistDataOriginList);
+ rightResult.setDynamicAssistFieldsOriginList(assistsOriginList);
+ }
}
} catch (Exception e) {
e.printStackTrace();
@@ -169,12 +202,12 @@ public class MixHandler extends YoyChartHandler {
var leftFields = new ArrayList();
leftFields.addAll(formatResult.getAxisMap().get(ChartAxis.xAxis));
leftFields.addAll(formatResult.getAxisMap().get(ChartAxis.yAxis));
- mergeAssistField(leftCalcResult.getDynamicAssistFields(), leftCalcResult.getAssistData());
+ List chartSeniorAssistDTOSLeft = mergeAssistField(leftCalcResult.getDynamicAssistFields(), leftCalcResult.getAssistData(), leftCalcResult.getDynamicAssistFieldsOriginList(), leftCalcResult.getAssistDataOriginList());
var leftOriginData = leftCalcResult.getOriginData();
var leftTable = ChartDataBuild.transTableNormal(leftFields, view, leftOriginData, desensitizationList);
var leftData = new HashMap(leftTable);
leftData.putAll(leftCalcResult.getData());
- leftData.put("dynamicAssistLines", leftCalcResult.getDynamicAssistFields());
+ leftData.put("dynamicAssistLines", chartSeniorAssistDTOSLeft);
var rightCalcResult = (ChartCalcDataResult) calcResult.getData().get("right");
var rightFields = new ArrayList();
@@ -183,12 +216,12 @@ public class MixHandler extends YoyChartHandler {
rightFields.addAll(subAxisMap.get(ChartAxis.xAxis));
rightFields.addAll(subAxisMap.get(ChartAxis.yAxis));
- mergeAssistField(rightCalcResult.getDynamicAssistFields(), rightCalcResult.getAssistData());
+ List chartSeniorAssistDTOSRight = mergeAssistField(rightCalcResult.getDynamicAssistFields(), rightCalcResult.getAssistData(), rightCalcResult.getDynamicAssistFieldsOriginList(), rightCalcResult.getAssistDataOriginList());
var rightOriginData = rightCalcResult.getOriginData();
var rightTable = ChartDataBuild.transTableNormal(rightFields, view, rightOriginData, desensitizationList);
var rightData = new HashMap(rightTable);
rightData.putAll(rightCalcResult.getData());
- rightData.put("dynamicAssistLines", rightCalcResult.getDynamicAssistFields());
+ rightData.put("dynamicAssistLines", chartSeniorAssistDTOSRight);
// 构建结果
Map chartData = new TreeMap<>();
@@ -205,7 +238,7 @@ public class MixHandler extends YoyChartHandler {
var isDrill = CollectionUtils.isNotEmpty(drillFilters);
view.setDrillFilters(drillFilters);
view.setDrill(isDrill);
- view.setSql(leftCalcResult.getQuerySql());
+ view.setSql(Base64.getEncoder().encodeToString(leftCalcResult.getQuerySql().getBytes()));
view.setData(chartData);
return view;
}
diff --git a/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/numeric/NumericalChartHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/numeric/NumericalChartHandler.java
index 1b91c0c..2c6041a 100644
--- a/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/numeric/NumericalChartHandler.java
+++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/numeric/NumericalChartHandler.java
@@ -1,5 +1,6 @@
package io.gisbi.chart.charts.impl.numeric;
+import io.gisbi.api.dataset.union.DatasetGroupInfoDTO;
import io.gisbi.chart.charts.impl.DefaultChartHandler;
import io.gisbi.chart.utils.ChartDataBuild;
import io.gisbi.engine.sql.SQLProvider;
@@ -33,6 +34,7 @@ public class NumericalChartHandler extends DefaultChartHandler {
boolean needOrder = Utils.isNeedOrder(dsList);
boolean crossDs = Utils.isCrossDs(dsMap);
DatasourceRequest datasourceRequest = new DatasourceRequest();
+ datasourceRequest.setIsCross(((DatasetGroupInfoDTO) formatResult.getContext().get("dataset")).getIsCross());
datasourceRequest.setDsList(dsMap);
var xAxis = formatResult.getAxisMap().get(ChartAxis.xAxis);
var yAxis = formatResult.getAxisMap().get(ChartAxis.yAxis);
@@ -67,14 +69,11 @@ public class NumericalChartHandler extends DefaultChartHandler {
String summary = (String) maxField.get("summary");
DatasetTableFieldDTO datasetTableField = datasetTableFieldManage.selectById(id);
if (ObjectUtils.isNotEmpty(datasetTableField)) {
- if (datasetTableField.getDeType() == 0 || datasetTableField.getDeType() == 1 || datasetTableField.getDeType() == 5) {
- if (!StringUtils.containsIgnoreCase(summary, "count")) {
- DEException.throwException(Translator.get("i18n_gauge_field_change"));
- }
- }
ChartViewFieldDTO dto = new ChartViewFieldDTO();
BeanUtils.copyBean(dto, datasetTableField);
- dto.setSummary(summary);
+ if (StringUtils.isEmpty(dto.getSummary())) {
+ dto.setSummary(summary);
+ }
return dto;
} else {
DEException.throwException(Translator.get("i18n_gauge_field_delete"));
diff --git a/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/pie/PieHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/pie/PieHandler.java
index a05cc7b..d4c50c6 100644
--- a/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/pie/PieHandler.java
+++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/pie/PieHandler.java
@@ -1,11 +1,15 @@
package io.gisbi.chart.charts.impl.pie;
import io.gisbi.chart.charts.impl.YoyChartHandler;
-import io.gisbi.extensions.view.dto.AxisFormatResult;
-import io.gisbi.extensions.view.dto.ChartAxis;
-import io.gisbi.extensions.view.dto.ChartViewDTO;
+import io.gisbi.extensions.view.dto.*;
import org.springframework.stereotype.Component;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
@Component
public class PieHandler extends YoyChartHandler {
@Override
@@ -26,4 +30,74 @@ public class PieHandler extends YoyChartHandler {
result.getAxisMap().put(ChartAxis.extTooltip, view.getExtTooltip());
return result;
}
+
+ @Override
+ public ChartViewDTO buildChart(ChartViewDTO view, ChartCalcDataResult calcResult, AxisFormatResult formatResult, CustomFilterResult filterResult) {
+ ChartViewDTO result = super.buildChart(view, calcResult, formatResult, filterResult);
+ filterPositiveData(result, "data", AxisChartDataAntVDTO.class);
+ filterPositiveData(result, "tableRow", Map.class, view.getYAxis().get(0).getGisbiName());
+ return result;
+ }
+
+ /**
+ * 过滤正数数据根据data
+ * @param result
+ * @param key
+ * @param clazz
+ * @param
+ */
+ private void filterPositiveData(ChartViewDTO result, String key, Class clazz) {
+ if (result.getData().containsKey(key)) {
+ List list = ((List) result.getData().get(key))
+ .stream()
+ .filter(item -> {
+ if (clazz == AxisChartDataAntVDTO.class) {
+ if (Objects.isNull(((AxisChartDataAntVDTO) item).getValue())) return false;
+ return ((AxisChartDataAntVDTO) item).getValue().compareTo(BigDecimal.ZERO) >= 0;
+ } else if (clazz == Map.class) {
+ return isPositive(((Map) item).get("value"));
+ }
+ return false;
+ })
+ .collect(Collectors.toList());
+ result.getData().put(key, list);
+ }
+ }
+
+ /**
+ * 过滤正数数据根据tableRow
+ * @param result
+ * @param key
+ * @param clazz
+ * @param yAxisName
+ * @param
+ */
+ private void filterPositiveData(ChartViewDTO result, String key, Class clazz, String yAxisName) {
+ if (result.getData().containsKey(key)) {
+ List list = ((List) result.getData().get(key))
+ .stream()
+ .filter(item -> {
+ if (clazz == Map.class) {
+ Object value = ((Map) item).get(yAxisName);
+ return isPositive(value);
+ }
+ return false;
+ })
+ .collect(Collectors.toList());
+ result.getData().put(key, list);
+ }
+ }
+
+ private boolean isPositive(Object value) {
+ if (value instanceof String) {
+ try {
+ return new BigDecimal((String) value).compareTo(BigDecimal.ZERO) >= 0;
+ } catch (NumberFormatException e) {
+ return false;
+ }
+ } else if (value instanceof BigDecimal) {
+ return ((BigDecimal) value).compareTo(BigDecimal.ZERO) >= 0;
+ }
+ return false;
+ }
}
diff --git a/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/table/TableHeatmapHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/table/TableHeatmapHandler.java
index dae3acf..1cfe918 100644
--- a/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/table/TableHeatmapHandler.java
+++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/table/TableHeatmapHandler.java
@@ -1,5 +1,6 @@
package io.gisbi.chart.charts.impl.table;
+import io.gisbi.api.dataset.union.DatasetGroupInfoDTO;
import io.gisbi.chart.charts.impl.DefaultChartHandler;
import io.gisbi.chart.utils.ChartDataBuild;
import io.gisbi.engine.sql.SQLProvider;
@@ -55,6 +56,7 @@ public class TableHeatmapHandler extends DefaultChartHandler {
boolean needOrder = Utils.isNeedOrder(dsList);
boolean crossDs = Utils.isCrossDs(dsMap);
DatasourceRequest datasourceRequest = new DatasourceRequest();
+ datasourceRequest.setIsCross(((DatasetGroupInfoDTO) formatResult.getContext().get("dataset")).getIsCross());
datasourceRequest.setDsList(dsMap);
var xAxis = formatResult.getAxisMap().get(ChartAxis.xAxis);
var yAxis = formatResult.getAxisMap().get(ChartAxis.yAxis);
diff --git a/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/table/TableInfoHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/table/TableInfoHandler.java
index 2d08831..3b3ad7e 100644
--- a/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/table/TableInfoHandler.java
+++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/table/TableInfoHandler.java
@@ -1,6 +1,7 @@
package io.gisbi.chart.charts.impl.table;
import io.gisbi.api.chart.dto.PageInfo;
+import io.gisbi.api.dataset.union.DatasetGroupInfoDTO;
import io.gisbi.chart.charts.impl.DefaultChartHandler;
import io.gisbi.engine.sql.SQLProvider;
import io.gisbi.engine.trans.Dimension2SQLObj;
@@ -65,6 +66,11 @@ public class TableInfoHandler extends DefaultChartHandler {
return (T) new CustomFilterResult(filterList, formatResult.getContext());
}
+ @Override
+ public Map buildResult(ChartViewDTO view, AxisFormatResult formatResult, CustomFilterResult filterResult, List data) {
+ return new HashMap<>();
+ }
+
@Override
public T calcChartResult(ChartViewDTO view, AxisFormatResult formatResult, CustomFilterResult filterResult, Map sqlMap, SQLMeta sqlMeta, Provider provider) {
var chartExtRequest = view.getChartExtRequest();
@@ -73,8 +79,9 @@ public class TableInfoHandler extends DefaultChartHandler {
for (Map.Entry next : dsMap.entrySet()) {
dsList.add(next.getValue().getType());
}
- boolean crossDs = Utils.isCrossDs(dsMap);
+ boolean crossDs = ((DatasetGroupInfoDTO) formatResult.getContext().get("dataset")).getIsCross();
DatasourceRequest datasourceRequest = new DatasourceRequest();
+ datasourceRequest.setIsCross(crossDs);
datasourceRequest.setDsList(dsMap);
var xAxis = formatResult.getAxisMap().get(ChartAxis.xAxis);
var allFields = (List) filterResult.getContext().get("allFields");
@@ -150,12 +157,28 @@ public class TableInfoHandler extends DefaultChartHandler {
if (CollectionUtils.isNotEmpty(assistFields)) {
var req = new DatasourceRequest();
req.setDsList(dsMap);
- var assistSql = assistSQL(querySql, assistFields, dsMap);
- req.setQuery(assistSql);
- logger.debug("calcite assistSql sql: " + assistSql);
- var assistData = (List) provider.fetchResultField(req).get("data");
- calcResult.setAssistData(assistData);
- calcResult.setDynamicAssistFields(dynamicAssistFields);
+
+ List assists = dynamicAssistFields.stream().filter(ele -> !StringUtils.equalsIgnoreCase(ele.getSummary(), "last_item")).toList();
+ if (ObjectUtils.isNotEmpty(assists)) {
+ var assistSql = assistSQL(originSql, assistFields, dsMap, crossDs);
+ var tmpSql = provider.rebuildSQL(assistSql, sqlMeta, crossDs, dsMap);
+ req.setQuery(tmpSql);
+ logger.debug("calcite assistSql sql: " + tmpSql);
+ var assistData = (List) provider.fetchResultField(req).get("data");
+ calcResult.setAssistData(assistData);
+ calcResult.setDynamicAssistFields(assists);
+ }
+
+ List assistsOriginList = dynamicAssistFields.stream().filter(ele -> StringUtils.equalsIgnoreCase(ele.getSummary(), "last_item")).toList();
+ if (ObjectUtils.isNotEmpty(assistsOriginList)) {
+ var assistSqlOriginList = assistSQLOriginList(originSql, assistFields, dsMap, crossDs);
+ var tmpSql = provider.rebuildSQL(assistSqlOriginList, sqlMeta, crossDs, dsMap);
+ req.setQuery(tmpSql);
+ logger.debug("calcite assistSql sql origin list: " + tmpSql);
+ var assistDataOriginList = (List) provider.fetchResultField(req).get("data");
+ calcResult.setAssistDataOriginList(assistDataOriginList);
+ calcResult.setDynamicAssistFieldsOriginList(assistsOriginList);
+ }
}
} catch (Exception e) {
e.printStackTrace();
diff --git a/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/table/TableNormalHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/table/TableNormalHandler.java
index 7fb8135..d6b0f12 100644
--- a/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/table/TableNormalHandler.java
+++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/table/TableNormalHandler.java
@@ -1,49 +1,213 @@
package io.gisbi.chart.charts.impl.table;
-import io.gisbi.chart.charts.impl.YoyChartHandler;
+import com.fasterxml.jackson.core.type.TypeReference;
+import io.gisbi.api.chart.dto.PageInfo;
+import io.gisbi.api.dataset.union.DatasetGroupInfoDTO;
+import io.gisbi.chart.charts.impl.DefaultChartHandler;
+import io.gisbi.engine.sql.SQLProvider;
+import io.gisbi.engine.trans.Dimension2SQLObj;
+import io.gisbi.engine.trans.ExtWhere2Str;
+import io.gisbi.engine.trans.Quota2SQLObj;
+import io.gisbi.engine.utils.Utils;
import io.gisbi.extensions.datasource.dto.DatasourceRequest;
import io.gisbi.extensions.datasource.dto.DatasourceSchemaDTO;
import io.gisbi.extensions.datasource.model.SQLMeta;
import io.gisbi.extensions.datasource.provider.Provider;
import io.gisbi.extensions.view.dto.*;
+import io.gisbi.extensions.view.util.ChartDataUtil;
+import io.gisbi.extensions.view.util.FieldUtil;
+import io.gisbi.utils.JsonUtil;
import lombok.Getter;
import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* @author jianneng
* @date 2024/9/11 11:37
**/
@Component
-public class TableNormalHandler extends YoyChartHandler {
+public class TableNormalHandler extends DefaultChartHandler {
@Getter
- private String type = "table-normal";
+ private final String type = "table-normal";
+
+ @Override
+ public T customFilter(ChartViewDTO view, List filterList, AxisFormatResult formatResult) {
+ var chartExtRequest = view.getChartExtRequest();
+ Map mapAttr = view.getCustomAttr();
+ Map basicStyle = (Map) mapAttr.get("basicStyle");
+ var tablePageMode = (String) basicStyle.get("tablePageMode");
+ formatResult.getContext().put("tablePageMode", tablePageMode);
+ if (StringUtils.equalsIgnoreCase(tablePageMode, "page")) {
+ if (chartExtRequest.getGoPage() == null) {
+ chartExtRequest.setGoPage(1L);
+ }
+ if (chartExtRequest.getPageSize() == null) {
+ int pageSize = (int) basicStyle.get("tablePageSize");
+ if (StringUtils.equalsIgnoreCase(view.getResultMode(), "custom")) {
+ chartExtRequest.setPageSize(Math.min(pageSize, view.getResultCount().longValue()));
+ } else {
+ chartExtRequest.setPageSize((long) pageSize);
+ }
+ }
+ } else {
+ if (StringUtils.equalsIgnoreCase(view.getResultMode(), "custom")) {
+ chartExtRequest.setGoPage(1L);
+ chartExtRequest.setPageSize(view.getResultCount().longValue());
+ } else if (!view.getIsExcelExport()) {
+ chartExtRequest.setGoPage(null);
+ chartExtRequest.setPageSize(null);
+ }
+ }
+ var yAxis = formatResult.getAxisMap().get(ChartAxis.yAxis);
+ String originFilterJson = (String) JsonUtil.toJSONString(filterList);
+ List originFilter = JsonUtil.parseList(originFilterJson, new TypeReference<>() {
+ });
+ boolean yoyFiltered = checkYoyFilter(originFilter, yAxis);
+ if (yoyFiltered) {
+ formatResult.getContext().put("expandedFilter", originFilter);
+ formatResult.getContext().put("yoyFiltered", true);
+ }
+ return (T) new CustomFilterResult(filterList, formatResult.getContext());
+ }
+
+ @Override
+ public Map buildResult(ChartViewDTO view, AxisFormatResult formatResult, CustomFilterResult filterResult, List data) {
+ return new HashMap<>();
+ }
@Override
public T calcChartResult(ChartViewDTO view, AxisFormatResult formatResult, CustomFilterResult filterResult, Map sqlMap, SQLMeta sqlMeta, Provider provider) {
+ var chartExtRequest = view.getChartExtRequest();
var dsMap = (Map) sqlMap.get("dsMap");
- var result = (T) super.calcChartResult(view, formatResult, filterResult, sqlMap, sqlMeta, provider);
+ List dsList = new ArrayList<>();
+ for (Map.Entry next : dsMap.entrySet()) {
+ dsList.add(next.getValue().getType());
+ }
+ boolean crossDs = ((DatasetGroupInfoDTO) formatResult.getContext().get("dataset")).getIsCross();
+ DatasourceRequest datasourceRequest = new DatasourceRequest();
+ datasourceRequest.setIsCross(crossDs);
+ datasourceRequest.setDsList(dsMap);
+ var xAxis = formatResult.getAxisMap().get(ChartAxis.xAxis);
+ var yAxis = formatResult.getAxisMap().get(ChartAxis.yAxis);
+
+ var allFields = (List) filterResult.getContext().get("allFields");
+ PageInfo pageInfo = new PageInfo();
+ pageInfo.setGoPage(chartExtRequest.getGoPage());
+ if (StringUtils.equalsIgnoreCase(view.getResultMode(), "custom")) {
+ pageInfo.setPageSize(Math.min(view.getResultCount() - (chartExtRequest.getGoPage() - 1) * chartExtRequest.getPageSize(), chartExtRequest.getPageSize()));
+ } else {
+ pageInfo.setPageSize(chartExtRequest.getPageSize());
+ }
+ Dimension2SQLObj.dimension2sqlObj(sqlMeta, xAxis, FieldUtil.transFields(allFields), crossDs, dsMap, Utils.getParams(FieldUtil.transFields(allFields)), view.getCalParams(), pluginManage);
+ Quota2SQLObj.quota2sqlObj(sqlMeta, yAxis, FieldUtil.transFields(allFields), crossDs, dsMap, Utils.getParams(FieldUtil.transFields(allFields)), view.getCalParams(), pluginManage);
+ String originSql = SQLProvider.createQuerySQL(sqlMeta, true, !StringUtils.equalsIgnoreCase(dsMap.values().iterator().next().getType(), "es"), view);// 分页强制加排序
+ String limit = ((pageInfo.getGoPage() != null && pageInfo.getPageSize() != null) ? " LIMIT " + pageInfo.getPageSize() + " OFFSET " + (pageInfo.getGoPage() - 1) * chartExtRequest.getPageSize() : "");
+ var querySql = originSql + limit;
+
+ var tablePageMode = (String) filterResult.getContext().get("tablePageMode");
+ var totalPageSql = "SELECT COUNT(*) FROM (" + SQLProvider.createQuerySQLNoSort(sqlMeta, true, view) + ") COUNT_TEMP";
+ if (StringUtils.isNotEmpty(totalPageSql) && StringUtils.equalsIgnoreCase(tablePageMode, "page")) {
+ totalPageSql = provider.rebuildSQL(totalPageSql, sqlMeta, crossDs, dsMap);
+ datasourceRequest.setQuery(totalPageSql);
+ datasourceRequest.setTotalPageFlag(true);
+ logger.debug("calcite total sql: " + totalPageSql);
+ List tmpData = (List) provider.fetchResultField(datasourceRequest).get("data");
+ var totalItems = ObjectUtils.isEmpty(tmpData) ? 0 : Long.valueOf(tmpData.get(0)[0]);
+ if (StringUtils.equalsIgnoreCase(view.getResultMode(), "custom")) {
+ totalItems = totalItems <= view.getResultCount() ? totalItems : view.getResultCount();
+ }
+ var totalPage = (totalItems / pageInfo.getPageSize()) + (totalItems % pageInfo.getPageSize() > 0 ? 1 : 0);
+ view.setTotalItems(totalItems);
+ view.setTotalPage(totalPage);
+ }
+
+ querySql = provider.rebuildSQL(querySql, sqlMeta, crossDs, dsMap);
+ datasourceRequest.setQuery(querySql);
+ logger.debug("calcite chart sql: " + querySql);
+ List data = (List) provider.fetchResultField(datasourceRequest).get("data");
+ //自定义排序
+ data = ChartDataUtil.resultCustomSort(xAxis, yAxis, view.getSortPriority(), data);
+
+ var yoyFiltered = filterResult.getContext().get("yoyFiltered") != null;
+ if (yoyFiltered) {
+ // 这里没加分页，因为加了分页参数可能会把原始数据挤出去
+ var expandedFilter = (List) filterResult.getContext().get("expandedFilter");
+ ExtWhere2Str.extWhere2sqlOjb(sqlMeta, expandedFilter, FieldUtil.transFields(allFields), crossDs, dsMap, Utils.getParams(FieldUtil.transFields(allFields)), view.getCalParams(), pluginManage);
+ var expandedSql = SQLProvider.createQuerySQL(sqlMeta, true, !StringUtils.equalsIgnoreCase(dsMap.values().iterator().next().getType(), "es"), view);
+ expandedSql = provider.rebuildSQL(expandedSql, sqlMeta, crossDs, dsMap);
+ var expandedReq = new DatasourceRequest();
+ expandedReq.setIsCross(crossDs);
+ expandedReq.setDsList(dsMap);
+ expandedReq.setQuery(expandedSql);
+ logger.debug("expanded sql: " + expandedSql);
+ var expandedData = (List) provider.fetchResultField(expandedReq).get("data");
+ logger.debug("expanded data: " + expandedData);
+ quickCalc(xAxis, yAxis, Collections.emptyList(), Collections.emptyList(), view.getType(), expandedData);
+ var resultData = new ArrayList();
+ for (String[] originDataLine : data) {
+ var originDim = new StringBuilder();
+ for (int i = 0; i < xAxis.size(); i++) {
+ originDim.append(originDataLine[i]);
+ }
+ for (String[] expandedDataLine : expandedData) {
+ var expandedDim = new StringBuilder();
+ for (int i = 0; i < xAxis.size(); i++) {
+ expandedDim.append(expandedDataLine[i]);
+ }
+ if (StringUtils.equals(originDim, expandedDim)) {
+ resultData.add(expandedDataLine);
+ break;
+ }
+ }
+ }
+ data = resultData;
+ } else {
+ quickCalc(xAxis, yAxis, Collections.emptyList(), Collections.emptyList(), view.getType(), data);
+ }
+ //数据重组逻辑可重载
+ var result = this.buildResult(view, formatResult, filterResult, data);
+ T calcResult = (T) new ChartCalcDataResult();
+ calcResult.setData(result);
+ calcResult.setContext(filterResult.getContext());
+ calcResult.setQuerySql(querySql);
+ calcResult.setOriginData(data);
try {
- var originSql = result.getQuerySql();
var dynamicAssistFields = getDynamicThresholdFields(view);
- var yAxis = formatResult.getAxisMap().get(ChartAxis.yAxis);
- var assistFields = getAssistFields(dynamicAssistFields, yAxis);
+ var assistFields = getAssistFields(dynamicAssistFields, yAxis, xAxis);
if (CollectionUtils.isNotEmpty(assistFields)) {
var req = new DatasourceRequest();
+ req.setIsCross(crossDs);
req.setDsList(dsMap);
- var assistSql = assistSQL(originSql, assistFields, dsMap);
- req.setQuery(assistSql);
- logger.debug("calcite assistSql sql: " + assistSql);
- var assistData = (List) provider.fetchResultField(req).get("data");
- result.setAssistData(assistData);
- result.setDynamicAssistFields(dynamicAssistFields);
+
+ List assists = dynamicAssistFields.stream().filter(ele -> !StringUtils.equalsIgnoreCase(ele.getSummary(), "last_item")).toList();
+ if (ObjectUtils.isNotEmpty(assists)) {
+ var assistSql = assistSQL(originSql, assistFields, dsMap, crossDs);
+ var tmpSql = provider.rebuildSQL(assistSql, sqlMeta, crossDs, dsMap);
+ req.setQuery(tmpSql);
+ logger.debug("calcite assistSql sql: " + tmpSql);
+ var assistData = (List) provider.fetchResultField(req).get("data");
+ calcResult.setAssistData(assistData);
+ calcResult.setDynamicAssistFields(assists);
+ }
+
+ List assistsOriginList = dynamicAssistFields.stream().filter(ele -> StringUtils.equalsIgnoreCase(ele.getSummary(), "last_item")).toList();
+ if (ObjectUtils.isNotEmpty(assistsOriginList)) {
+ var assistSqlOriginList = assistSQLOriginList(originSql, assistFields, dsMap, crossDs);
+ var tmpSql = provider.rebuildSQL(assistSqlOriginList, sqlMeta, crossDs, dsMap);
+ req.setQuery(tmpSql);
+ logger.debug("calcite assistSql sql origin list: " + tmpSql);
+ var assistDataOriginList = (List) provider.fetchResultField(req).get("data");
+ calcResult.setAssistDataOriginList(assistDataOriginList);
+ calcResult.setDynamicAssistFieldsOriginList(assistsOriginList);
+ }
}
} catch (Exception e) {
e.printStackTrace();
}
- return result;
+ return calcResult;
}
}
diff --git a/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/table/TablePivotHandler.java b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/table/TablePivotHandler.java
index b7bcd76..13f3b48 100644
--- a/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/table/TablePivotHandler.java
+++ b/core/core-backend/src/main/java/io/gisbi/chart/charts/impl/table/TablePivotHandler.java
@@ -1,5 +1,6 @@
package io.gisbi.chart.charts.impl.table;
+import io.gisbi.api.dataset.union.DatasetGroupInfoDTO;
import io.gisbi.chart.charts.impl.GroupChartHandler;
import io.gisbi.constant.DeTypeConstants;
import io.gisbi.engine.constant.ExtFieldConstant;
@@ -18,6 +19,7 @@ import io.gisbi.utils.IDUtils;
import io.gisbi.utils.JsonUtil;
import lombok.Getter;
import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
import reactor.util.function.Tuple2;
@@ -34,7 +36,8 @@ public class TablePivotHandler extends GroupChartHandler {
@Override
public T calcChartResult(ChartViewDTO view, AxisFormatResult formatResult, CustomFilterResult filterResult, Map sqlMap, SQLMeta sqlMeta, Provider provider) {
T result = super.calcChartResult(view, formatResult, filterResult, sqlMap, sqlMeta, provider);
- Map customCalc = calcCustomExpr(view, filterResult, sqlMap, sqlMeta, provider);
+ Map customCalc = calcCustomExpr(view, formatResult, filterResult, sqlMap, sqlMeta, provider);
+ boolean crossDs = ((DatasetGroupInfoDTO) formatResult.getContext().get("dataset")).getIsCross();
result.getData().put("customCalc", customCalc);
try {
var dsMap = (Map) sqlMap.get("dsMap");
@@ -44,13 +47,28 @@ public class TablePivotHandler extends GroupChartHandler {
var assistFields = getAssistFields(dynamicAssistFields, yAxis);
if (CollectionUtils.isNotEmpty(assistFields)) {
var req = new DatasourceRequest();
+ req.setIsCross(crossDs);
req.setDsList(dsMap);
- var assistSql = assistSQL(originSql, assistFields, dsMap);
- req.setQuery(assistSql);
- logger.debug("calcite assistSql sql: " + assistSql);
- var assistData = (List) provider.fetchResultField(req).get("data");
- result.setAssistData(assistData);
- result.setDynamicAssistFields(dynamicAssistFields);
+
+ List assists = dynamicAssistFields.stream().filter(ele -> !StringUtils.equalsIgnoreCase(ele.getSummary(), "last_item")).toList();
+ if (ObjectUtils.isNotEmpty(assists)) {
+ var assistSql = assistSQL(originSql, assistFields, dsMap, crossDs);
+ req.setQuery(assistSql);
+ logger.debug("calcite assistSql sql: " + assistSql);
+ var assistData = (List) provider.fetchResultField(req).get("data");
+ result.setAssistData(assistData);
+ result.setDynamicAssistFields(assists);
+ }
+
+ List assistsOriginList = dynamicAssistFields.stream().filter(ele -> StringUtils.equalsIgnoreCase(ele.getSummary(), "last_item")).toList();
+ if (ObjectUtils.isNotEmpty(assistsOriginList)) {
+ var assistSqlOriginList = assistSQLOriginList(originSql, assistFields, dsMap, crossDs);
+ req.setQuery(assistSqlOriginList);
+ logger.debug("calcite assistSql sql origin list: " + assistSqlOriginList);
+ var assistDataOriginList = (List) provider.fetchResultField(req).get("data");
+ result.setAssistDataOriginList(assistDataOriginList);
+ result.setDynamicAssistFieldsOriginList(assistsOriginList);
+ }
}
} catch (Exception e) {
e.printStackTrace();
@@ -58,7 +76,18 @@ public class TablePivotHandler extends GroupChartHandler {
return result;
}
- private Map calcCustomExpr(ChartViewDTO view, CustomFilterResult filterResult, Map sqlMap, SQLMeta sqlMeta, Provider provider) {
+ @Override
+ public Map buildResult(ChartViewDTO view, AxisFormatResult formatResult, CustomFilterResult filterResult, List data) {
+ var result = new HashMap();
+ var yoyFiltered = filterResult.getContext().get("yoyFiltered") != null;
+ // 带过滤同环比直接返回原始数据,再由视图重新组装
+ if (yoyFiltered) {
+ result.put("data", data);
+ }
+ return result;
+ }
+
+ private Map calcCustomExpr(ChartViewDTO view, AxisFormatResult formatResult, CustomFilterResult filterResult, Map sqlMap, SQLMeta sqlMeta, Provider provider) {
Object totalStr = JsonUtil.toJSONString(view.getCustomAttr().get("tableTotal"));
TableTotal tableTotal = JsonUtil.parseObject((String) totalStr, TableTotal.class);
var dsMap = (Map) sqlMap.get("dsMap");
@@ -67,7 +96,7 @@ public class TablePivotHandler extends GroupChartHandler {
dsList.add(next.getValue().getType());
}
boolean needOrder = Utils.isNeedOrder(dsList);
- boolean crossDs = Utils.isCrossDs(dsMap);
+ boolean crossDs = ((DatasetGroupInfoDTO) formatResult.getContext().get("dataset")).getIsCross();
DatasourceRequest datasourceRequest = new DatasourceRequest();
datasourceRequest.setDsList(dsMap);
var allFields = (List) filterResult.getContext().get("allFields");
@@ -178,7 +207,7 @@ public class TablePivotHandler extends GroupChartHandler {
var tmpData = new HashMap();
for (int i = 0; i < yAxis.size(); i++) {
var a = yAxis.get(i);
- tmpData.put(a.getDataeaseName(), data.getFirst()[i]);
+ tmpData.put(a.getGisbiName(), data.getFirst()[i]);
}
tmp.put("data", tmpData);
tmp.put("sql", Base64.getEncoder().encodeToString(querySql.getBytes()));
@@ -208,8 +237,8 @@ public class TablePivotHandler extends GroupChartHandler {
}
}
// 列总计里面的行小计
- if (col.isShowGrandTotals() && row.isShowGrandTotals() && rowAxis.size() >= 2) {
- var yAxis = getCustomFields(view, row.getCalcTotals().getCfg());
+ if (col.isShowGrandTotals() && row.isShowSubTotals() && rowAxis.size() >= 2) {
+ var yAxis = getCustomFields(view, row.getCalcSubTotals().getCfg());
if (!yAxis.isEmpty()) {
var tmpData = new ArrayList>();
dataMap.put("rowSubInColTotal", tmpData);
@@ -243,11 +272,11 @@ public class TablePivotHandler extends GroupChartHandler {
var tmpList = new ArrayList>();
tmpData.add(tmpList);
var subRow = rowAxis.subList(0, i + 1);
- var xAxis = new ArrayList<>(subRow);
for (int j = 0; j < colAxis.size(); j++) {
if (j == colAxis.size() - 1) {
break;
}
+ var xAxis = new ArrayList<>(subRow);
var subCol = colAxis.subList(0, j + 1);
xAxis.addAll(subCol);
var tmpAllList = new ArrayList<>(allFields);
@@ -272,7 +301,7 @@ public class TablePivotHandler extends GroupChartHandler {
var rowData = data.getFirst();
for (int i = 0; i < rowData.length; i++) {
var qAxis = quotaAxis.get(i);
- rootResult.put(qAxis.getDataeaseName(), rowData[i]);
+ rootResult.put(qAxis.getGisbiName(), rowData[i]);
}
return rootResult;
}
@@ -291,7 +320,7 @@ public class TablePivotHandler extends GroupChartHandler {
if (j == dimAxis.size() - 1) {
for (int k = 0; k < quotaAxis.size(); k++) {
var qAxis = quotaAxis.get(k);
- curSubMap.put(qAxis.getDataeaseName(), rowData[j + k + 1]);
+ curSubMap.put(qAxis.getGisbiName(), rowData[j + k + 1]);
}
}
}
@@ -303,6 +332,7 @@ public class TablePivotHandler extends GroupChartHandler {
List allFields, boolean crossDs, Map dsMap,
ChartViewDTO view, Provider provider, boolean needOrder) {
DatasourceRequest datasourceRequest = new DatasourceRequest();
+ datasourceRequest.setIsCross(crossDs);
datasourceRequest.setDsList(dsMap);
Dimension2SQLObj.dimension2sqlObj(sqlMeta, xAxis, FieldUtil.transFields(allFields), crossDs, dsMap, Utils.getParams(FieldUtil.transFields(allFields)), view.getCalParams(), pluginManage);
Quota2SQLObj.quota2sqlObj(sqlMeta, yAxis, FieldUtil.transFields(allFields), crossDs, dsMap, Utils.getParams(FieldUtil.transFields(allFields)), view.getCalParams(), pluginManage);
@@ -326,10 +356,10 @@ public class TablePivotHandler extends GroupChartHandler {
}
private List getCustomFields(ChartViewDTO view, List cfgList) {
- var quotaIds = view.getYAxis().stream().map(ChartViewFieldDTO::getDataeaseName).collect(Collectors.toSet());
+ var quotaIds = view.getYAxis().stream().map(ChartViewFieldDTO::getGisbiName).collect(Collectors.toSet());
var customFields = new ArrayList();
for (TableCalcTotalCfg totalCfg : cfgList) {
- if (!quotaIds.contains(totalCfg.getDataeaseName())) {
+ if (!quotaIds.contains(totalCfg.getGisbiName())) {
continue;
}
if (StringUtils.equalsIgnoreCase(totalCfg.getAggregation(), "CUSTOM")) {
diff --git a/core/core-backend/src/main/java/io/gisbi/chart/dao/ext/mapper/ExtChartViewMapper.java b/core/core-backend/src/main/java/io/gisbi/chart/dao/ext/mapper/ExtChartViewMapper.java
index c517bf8..34f1ade 100644
--- a/core/core-backend/src/main/java/io/gisbi/chart/dao/ext/mapper/ExtChartViewMapper.java
+++ b/core/core-backend/src/main/java/io/gisbi/chart/dao/ext/mapper/ExtChartViewMapper.java
@@ -1,7 +1,9 @@
package io.gisbi.chart.dao.ext.mapper;
import io.gisbi.api.chart.vo.ViewSelectorVO;
+import io.gisbi.chart.dao.auto.entity.CoreChartView;
import io.gisbi.chart.dao.ext.entity.ChartBasePO;
+import io.gisbi.extensions.view.dto.ChartViewDTO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -16,29 +18,21 @@ public interface ExtChartViewMapper {
""")
List queryViewOption(@Param("resourceId") Long resourceId);
+ ChartBasePO queryChart(@Param("id") Long id, @Param("resourceTable")String resourceTable);
+
+ List selectListCustom(@Param("sceneId") Long sceneId, @Param("resourceTable") String resourceTable);
+
+ void deleteViewsBySceneId(@Param("sceneId") Long sceneId, @Param("resourceTable") String resourceTable);
+
@Select("""
- select
- ccv.id as chart_id,
- ccv.title as chart_name,
- ccv.type as chart_type,
- ccv.table_id,
- dvi.id as resource_id,
- dvi.name as resource_name,
- dvi.type as resource_type,
- ccv.x_axis,
- ccv.x_axis_ext,
- ccv.y_axis,
- ccv.y_axis_ext,
- ccv.ext_stack,
- ccv.ext_bubble,
- ccv.ext_label,
- ccv.ext_tooltip,
- ccv.flow_map_start_name,
- ccv.flow_map_end_name,
- ccv.ext_color
- from core_chart_view ccv
- left join data_visualization_info dvi on dvi.id = ccv.scene_id
- where ccv.id = #{id}
+ SELECT id, scene_id as pid, title, type FROM (
+ SELECT id, scene_id, title, type FROM core_chart_view
+ WHERE id = #{viewId}
+ UNION ALL
+ SELECT id, scene_id, title, type FROM snapshot_core_chart_view
+ WHERE id = #{viewId}
+ ) combined_views
+ LIMIT 1
""")
- ChartBasePO queryChart(@Param("id") Long id);
+ ChartViewDTO findChartViewAround(@Param("viewId") String viewId);
}
diff --git a/core/core-backend/src/main/java/io/gisbi/chart/manage/ChartDataManage.java b/core/core-backend/src/main/java/io/gisbi/chart/manage/ChartDataManage.java
index 17d9a99..b01d3f1 100644
--- a/core/core-backend/src/main/java/io/gisbi/chart/manage/ChartDataManage.java
+++ b/core/core-backend/src/main/java/io/gisbi/chart/manage/ChartDataManage.java
@@ -1,14 +1,16 @@
package io.gisbi.chart.manage;
import io.gisbi.api.dataset.union.DatasetGroupInfoDTO;
-
+import io.gisbi.api.permissions.auth.dto.BusiPerCheckDTO;
import io.gisbi.api.permissions.dataset.dto.DataSetRowPermissionsTreeDTO;
import io.gisbi.chart.charts.ChartHandlerManager;
import io.gisbi.chart.constant.ChartConstants;
+import io.gisbi.constant.AuthEnum;
import io.gisbi.dataset.manage.DatasetGroupManage;
import io.gisbi.dataset.manage.DatasetSQLManage;
import io.gisbi.dataset.manage.DatasetTableFieldManage;
import io.gisbi.dataset.manage.PermissionManage;
+import io.gisbi.dataset.utils.DatasetUtils;
import io.gisbi.engine.sql.SQLProvider;
import io.gisbi.engine.trans.*;
import io.gisbi.engine.utils.SQLUtils;
@@ -28,6 +30,7 @@ import io.gisbi.extensions.view.plugin.AbstractChartPlugin;
import io.gisbi.extensions.view.util.FieldUtil;
import io.gisbi.i18n.Translator;
import io.gisbi.result.ResultCode;
+import io.gisbi.system.manage.CorePermissionManage;
import io.gisbi.utils.AuthUtils;
import io.gisbi.utils.BeanUtils;
import jakarta.annotation.Resource;
@@ -58,12 +61,14 @@ public class ChartDataManage {
@Resource
private ChartViewManege chartViewManege;
@Resource
+ private PermissionManage permissionManage;
+ @Resource
private ChartFilterTreeService chartFilterTreeService;
@Resource
private ChartHandlerManager chartHandlerManager;
- @Resource
- private PermissionManage permissionManage;
+ @Resource
+ private CorePermissionManage corePermissionManage;
@Autowired(required = false)
private PluginManageApi pluginManage;
@@ -132,17 +137,18 @@ public class ChartDataManage {
// row permission
List rowPermissionsTree = permissionManage.getRowPermissionsTree(table.getId(), chartExtRequest.getUser());
//将没有权限的列删掉
- List dataeaseNames = columnPermissionFields.stream().map(DatasetTableFieldDTO::getDataeaseName).collect(Collectors.toList());
+ List gisbiNames = columnPermissionFields.stream().map(DatasetTableFieldDTO::getGisbiName).collect(Collectors.toList());
//计数字段
- dataeaseNames.add("*");
+ gisbiNames.add("*");
AxisFormatResult formatResult = chartHandler.formatAxis(view);
+ formatResult.getContext().put("dataset", table);
formatResult.getContext().put("desensitizationList", desensitizationList);
var xAxis = formatResult.getAxisMap().get(ChartAxis.xAxis);
var yAxis = formatResult.getAxisMap().get(ChartAxis.yAxis);
formatResult.getContext().put("allFields", allFields);
var axisMap = formatResult.getAxisMap();
axisMap.forEach((axis, fields) -> {
- fields.removeIf(fieldDTO -> !dataeaseNames.contains(fieldDTO.getDataeaseName()));
+ fields.removeIf(fieldDTO -> !gisbiNames.contains(fieldDTO.getGisbiName()));
});
// 过滤来自仪表板的条件
@@ -225,11 +231,17 @@ public class ChartDataManage {
}
List filters = new ArrayList<>();
+ FilterTreeObj customLinkageFilter = null;
// 联动条件
if (ObjectUtils.isNotEmpty(chartExtRequest.getLinkageFilters())) {
- filters.addAll(chartExtRequest.getLinkageFilters());
+ for (ChartExtFilterDTO linkageFilter : chartExtRequest.getLinkageFilters()) {
+ if (3 == linkageFilter.getFilterType()) {
+ customLinkageFilter = linkageFilter.getCustomFilter();
+ } else {
+ filters.add(linkageFilter);
+ }
+ }
}
-
// 外部参数条件
if (ObjectUtils.isNotEmpty(chartExtRequest.getOuterParamsFilters())) {
filters.addAll(chartExtRequest.getOuterParamsFilters());
@@ -357,13 +369,17 @@ public class ChartDataManage {
}
// 字段过滤器
FilterTreeObj fieldCustomFilter = view.getCustomFilter();
+ // 指标表联动时 使用的CustomFilter
+ if (customLinkageFilter != null) {
+ fieldCustomFilter = customLinkageFilter;
+ }
chartFilterTreeService.searchFieldAndSet(fieldCustomFilter);
fieldCustomFilter = chartFilterTreeService.charReplace(fieldCustomFilter);
// 获取dsMap,union sql
Map sqlMap = datasetSQLManage.getUnionSQLForEdit(table, chartExtRequest);
String sql = (String) sqlMap.get("sql");
Map dsMap = (Map) sqlMap.get("dsMap");
- boolean crossDs = Utils.isCrossDs(dsMap);
+ boolean crossDs = table.getIsCross();
if (!crossDs) {
sql = Utils.replaceSchemaAlias(sql, dsMap);
}
@@ -592,11 +608,11 @@ public class ChartDataManage {
int getIndex = 0;
for (int i = 0; i < fieldList.size(); i++) {
ChartViewFieldDTO item = fieldList.get(i);
- if (StringUtils.equalsIgnoreCase(item.getSort(), "custom_sort")) {
+ if (StringUtils.equalsIgnoreCase(item.getSort(), "custom_sort")) {// 此处与已有的自定义字段对比
chartViewFieldDTO = item;
index = i;
}
- if (Objects.equals(item.getId(), field.getId())) {
+ if (Objects.equals(item.getId(), field.getId())) {// 获得当前自定义的字段
getIndex = i;
}
}
@@ -648,7 +664,7 @@ public class ChartDataManage {
// 获取图表所有字段配置
List allFields = getAllChartFields(view);
- // 处理堆叠/分组图表的特殊x轴配置
+ // 针对分组切换堆叠时会遇到的问题
if (StringUtils.equalsIgnoreCase(view.getType(), "bar-stack") || StringUtils.equalsIgnoreCase(view.getType(), "chart-mix-stack")) {
view.setXAxisExt(new ArrayList<>());
}
@@ -668,7 +684,6 @@ public class ChartDataManage {
xAxis.addAll(xAxisExt);
}
List yAxis = new ArrayList<>(view.getYAxis());
- // 合并扩展y轴配置（针对混合图表类型）
if (StringUtils.containsIgnoreCase(view.getType(), "chart-mix")) {
List yAxisExt = new ArrayList<>(view.getYAxisExt());
yAxis.addAll(yAxisExt);
@@ -678,6 +693,10 @@ public class ChartDataManage {
List sizeField = getSizeField(view);
yAxis.addAll(sizeField);
}
+ List extStack = new ArrayList<>(view.getExtStack());
+ List extBubble = new ArrayList<>(view.getExtBubble());
+ FilterTreeObj fieldCustomFilter = view.getCustomFilter();
+ List drill = new ArrayList<>(view.getDrillFields());
// 获取数据集权限信息
DatasetGroupInfoDTO table = datasetGroupManage.getDatasetGroupInfoDTO(view.getTableId(), null);
@@ -715,6 +734,7 @@ public class ChartDataManage {
}
break;
case "table-normal":
+ break;
case "bar-group":
case "bar-group-stack":
case "flow-map":
@@ -739,6 +759,7 @@ public class ChartDataManage {
// 初始化数据源请求对象
DatasourceRequest datasourceRequest = new DatasourceRequest();
datasourceRequest.setDsList(dsMap);
+ datasourceRequest.setIsCross(crossDs);
// 根据数据源类型选择查询提供器
Provider provider;
@@ -750,8 +771,10 @@ public class ChartDataManage {
// 执行数据查询
List data = new ArrayList<>();
+
String querySql = null;
- if (table.getMode() == 0) { // 直连模式处理
+ //如果不是插件图表 走原生逻辑
+ if (table.getMode() == 0) {// 直连
if (ObjectUtils.isEmpty(dsMap)) {
DEException.throwException(Translator.get("i18n_datasource_delete"));
}
@@ -768,21 +791,20 @@ public class ChartDataManage {
Table2SQLObj.table2sqlobj(sqlMeta, null, "(" + sql + ")", crossDs);
WhereTree2Str.transFilterTrees(sqlMeta, rowPermissionsTree, transFields(allFields), crossDs, dsMap, Utils.getParams(transFields(allFields)), view.getCalParams(), pluginManage);
- // 根据图表类型生成不同SQL逻辑
if (StringUtils.equalsAnyIgnoreCase(view.getType(), "indicator", "gauge", "liquid")) {
Quota2SQLObj.quota2sqlObj(sqlMeta, yAxis, transFields(allFields), crossDs, dsMap, Utils.getParams(transFields(allFields)), view.getCalParams(), pluginManage);
querySql = SQLProvider.createQuerySQL(sqlMeta, true, needOrder, view);
} else if (StringUtils.containsIgnoreCase(view.getType(), "stack")) {
List xFields = new ArrayList<>();
xFields.addAll(xAxis);
- xFields.addAll(view.getExtStack());
+ xFields.addAll(extStack);
Dimension2SQLObj.dimension2sqlObj(sqlMeta, xFields, transFields(allFields), crossDs, dsMap, Utils.getParams(transFields(allFields)), view.getCalParams(), pluginManage);
Quota2SQLObj.quota2sqlObj(sqlMeta, yAxis, transFields(allFields), crossDs, dsMap, Utils.getParams(transFields(allFields)), view.getCalParams(), pluginManage);
querySql = SQLProvider.createQuerySQL(sqlMeta, true, needOrder, view);
} else if (StringUtils.containsIgnoreCase(view.getType(), "scatter")) {
List yFields = new ArrayList<>();
yFields.addAll(yAxis);
- yFields.addAll(view.getExtBubble());
+ yFields.addAll(extBubble);
Dimension2SQLObj.dimension2sqlObj(sqlMeta, xAxis, transFields(allFields), crossDs, dsMap, Utils.getParams(transFields(allFields)), view.getCalParams(), pluginManage);
Quota2SQLObj.quota2sqlObj(sqlMeta, yFields, transFields(allFields), crossDs, dsMap, Utils.getParams(transFields(allFields)), view.getCalParams(), pluginManage);
querySql = SQLProvider.createQuerySQL(sqlMeta, true, needOrder, view);
@@ -804,7 +826,6 @@ public class ChartDataManage {
return data;
}
-
private List getAllChartFields(ChartViewDTO view) {
// get all fields
Map> stringListMap = chartViewManege.listByDQ(view.getTableId(), view.getId(), view);
@@ -837,14 +858,13 @@ public class ChartDataManage {
DEException.throwException(e);
}
} else {
- // 如果当前图表ID未存在于检查数据中，则记录为废弃ID
disuseChartIdList.add(chartViewDTO.getId());
}
});
- // 如果存在需要废弃的图表ID列表，则批量标记为废弃
- if (CollectionUtils.isNotEmpty(disuseChartIdList)) {
- chartViewManege.disuse(disuseChartIdList);
- }
+ // 阈值告警处理 统一在发布时处理
+// if (CollectionUtils.isNotEmpty(disuseChartIdList)) {
+// chartViewManege.disuse(disuseChartIdList);
+// }
}
}
@@ -879,19 +899,18 @@ public class ChartDataManage {
// 执行SQL查询获取原始数据
List sqlData = sqlData(view, view.getChartExtRequest(), fieldId);
-
- // 根据自定义排序规则对数据进行排序
- List result = customSort(
- Optional.ofNullable(targetField.getCustomSort()).orElse(new ArrayList<>()),
- sqlData,
- 0
- );
-
- // 提取第一列数据并去重生成最终结果列表
- return result.stream()
- .map(i -> i[0])
- .distinct()
- .collect(Collectors.toList());
+ List result = customSort(Optional.ofNullable(targetField.getCustomSort()).orElse(new ArrayList<>()), sqlData, 0);
+ return result.stream().map(i -> i[0]).distinct().collect(Collectors.toList());
}
+ public void encodeData(ChartViewDTO chartViewDTO) {
+ if (chartViewDTO.getData() != null) {
+ if (chartViewDTO.getType().startsWith("chart-mix")) {
+ DatasetUtils.listEncode((List) ((Map) chartViewDTO.getData().get("left")).get("sourceFields"));
+ DatasetUtils.listEncode((List) ((Map) chartViewDTO.getData().get("right")).get("sourceFields"));
+ } else {
+ DatasetUtils.listEncode((List) chartViewDTO.getData().get("sourceFields"));
+ }
+ }
+ }
}
diff --git a/core/core-backend/src/main/java/io/gisbi/chart/manage/ChartViewManege.java b/core/core-backend/src/main/java/io/gisbi/chart/manage/ChartViewManege.java
index 2604295..e459b51 100644
--- a/core/core-backend/src/main/java/io/gisbi/chart/manage/ChartViewManege.java
+++ b/core/core-backend/src/main/java/io/gisbi/chart/manage/ChartViewManege.java
@@ -10,6 +10,7 @@ import io.gisbi.chart.dao.auto.entity.CoreChartView;
import io.gisbi.chart.dao.auto.mapper.CoreChartViewMapper;
import io.gisbi.chart.dao.ext.entity.ChartBasePO;
import io.gisbi.chart.dao.ext.mapper.ExtChartViewMapper;
+import io.gisbi.constant.CommonConstants;
import io.gisbi.dataset.dao.auto.entity.CoreDatasetTableField;
import io.gisbi.dataset.dao.auto.mapper.CoreDatasetTableFieldMapper;
import io.gisbi.dataset.manage.DatasetTableFieldManage;
@@ -25,13 +26,16 @@ import io.gisbi.extensions.datasource.dto.FieldGroupDTO;
import io.gisbi.extensions.datasource.model.SQLObj;
import io.gisbi.extensions.view.dto.*;
import io.gisbi.extensions.view.filter.FilterTreeObj;
+import io.gisbi.i18n.Lang;
import io.gisbi.i18n.Translator;
import io.gisbi.utils.BeanUtils;
import io.gisbi.utils.IDUtils;
import io.gisbi.utils.JsonUtil;
import io.gisbi.utils.LogUtil;
import io.gisbi.visualization.dao.auto.entity.DataVisualizationInfo;
+import io.gisbi.visualization.dao.auto.entity.SnapshotCoreChartView;
import io.gisbi.visualization.dao.auto.mapper.DataVisualizationInfoMapper;
+import io.gisbi.visualization.dao.auto.mapper.SnapshotCoreChartViewMapper;
import jakarta.annotation.Resource;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
@@ -55,6 +59,8 @@ public class ChartViewManege {
@Resource
private CoreChartViewMapper coreChartViewMapper;
@Resource
+ private SnapshotCoreChartViewMapper snapshotCoreChartViewMapper;
+ @Resource
private ChartDataManage chartDataManage;
@Resource
private CoreDatasetTableFieldMapper coreDatasetTableFieldMapper;
@@ -82,18 +88,19 @@ public class ChartViewManege {
if (id == null) {
DEException.throwException(Translator.get("i18n_no_id"));
}
- CoreChartView coreChartView = coreChartViewMapper.selectById(id);
- CoreChartView record = transDTO2Record(chartViewDTO);
+ SnapshotCoreChartView coreChartView = snapshotCoreChartViewMapper.selectById(id);
+ SnapshotCoreChartView record = transDTO2Record(chartViewDTO);
if (ObjectUtils.isEmpty(coreChartView)) {
- coreChartViewMapper.insert(record);
+ snapshotCoreChartViewMapper.deleteById(record.getId());
+ snapshotCoreChartViewMapper.insert(record);
} else {
- UpdateWrapper updateWrapper = new UpdateWrapper<>();
+ UpdateWrapper updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("id", record.getId());
//富文本允许设置空的tableId 这里额外更新一下
if (record.getTableId() == null) {
updateWrapper.set("table_id", null);
}
- coreChartViewMapper.update(record, updateWrapper);
+ snapshotCoreChartViewMapper.update(record, updateWrapper);
}
return chartViewDTO;
}
@@ -113,10 +120,20 @@ public class ChartViewManege {
coreChartViewMapper.delete(wrapper);
}
- public ChartViewDTO getDetails(Long id) {
- CoreChartView coreChartView = coreChartViewMapper.selectById(id);
- if (ObjectUtils.isEmpty(coreChartView)) {
- return null;
+ public ChartViewDTO getDetails(Long id, String resourceTable) {
+ CoreChartView coreChartView = null;
+ if (CommonConstants.RESOURCE_TABLE.SNAPSHOT.equals(resourceTable)) {
+ SnapshotCoreChartView snapshotCoreChartView = snapshotCoreChartViewMapper.selectById(id);
+ if (ObjectUtils.isEmpty(snapshotCoreChartView)) {
+ return null;
+ }
+ coreChartView = new CoreChartView();
+ BeanUtils.copyBean(coreChartView, snapshotCoreChartView);
+ } else {
+ coreChartView = coreChartViewMapper.selectById(id);
+ if (ObjectUtils.isEmpty(coreChartView)) {
+ return null;
+ }
}
ChartViewDTO dto = transRecord2DTO(coreChartView);
return dto;
@@ -125,10 +142,10 @@ public class ChartViewManege {
/**
* sceneId 为仪表板或者数据大屏id
*/
- public List listBySceneId(Long sceneId) {
+ public List listBySceneId(Long sceneId, String resourceTable) {
QueryWrapper wrapper = new QueryWrapper<>();
wrapper.eq("scene_id", sceneId);
- List chartViewDTOS = transChart(coreChartViewMapper.selectList(wrapper));
+ List chartViewDTOS = transChart(extChartViewMapper.selectListCustom(sceneId, resourceTable));
if (!CollectionUtils.isEmpty(chartViewDTOS)) {
List tableIds = chartViewDTOS.stream()
.map(ChartViewDTO::getTableId)
@@ -192,8 +209,8 @@ public class ChartViewManege {
}).collect(Collectors.toList());
}
- public ChartViewDTO getChart(Long id) throws Exception {
- ChartViewDTO details = getDetails(id);
+ public ChartViewDTO getChart(Long id, String resourceTable) throws Exception {
+ ChartViewDTO details = getDetails(id, resourceTable);
if (details == null) {
return null;
}
@@ -220,9 +237,8 @@ public class ChartViewManege {
}).collect(Collectors.toList());
// filter column disable field
Map desensitizationList = new HashMap<>();
-// List datasetTableFieldDTOS = permissionManage.filterColumnPermissions(collect, desensitizationList, id, null);
List datasetTableFieldDTOS = collect;
- datasetTableFieldDTOS.forEach(ele -> ele.setDesensitized(desensitizationList.containsKey(ele.getDataeaseName())));
+ datasetTableFieldDTOS.forEach(ele -> ele.setDesensitized(desensitizationList.containsKey(ele.getGisbiName())));
datasetTableFieldDTOS.add(createCountField(id));
List list = transFieldDTO(datasetTableFieldDTOS);
@@ -282,8 +298,8 @@ public class ChartViewManege {
coreDatasetTableField.setExtField(2);
coreDatasetTableField.setOriginName("[" + id + "]");
coreDatasetTableField.setId(IDUtils.snowID());
- coreDatasetTableField.setDataeaseName(TableUtils.fieldNameShort(coreDatasetTableField.getId() + "_" + coreDatasetTableField.getOriginName()));
- coreDatasetTableField.setFieldShortName(coreDatasetTableField.getDataeaseName());
+ coreDatasetTableField.setGisbiName(TableUtils.fieldNameShort(coreDatasetTableField.getId() + "_" + coreDatasetTableField.getOriginName()));
+ coreDatasetTableField.setFieldShortName(coreDatasetTableField.getGisbiName());
coreDatasetTableFieldMapper.insert(coreDatasetTableField);
}
@@ -306,8 +322,8 @@ public class ChartViewManege {
coreDatasetTableFieldMapper.delete(queryWrapper);
}
- public ChartBaseVO chartBaseInfo(Long id) {
- ChartBasePO po = extChartViewMapper.queryChart(id);
+ public ChartBaseVO chartBaseInfo(Long id, String resourceTable) {
+ ChartBasePO po = extChartViewMapper.queryChart(id, resourceTable);
if (ObjectUtils.isEmpty(po)) return null;
ChartBaseVO vo = BeanUtils.copyBean(new ChartBaseVO(), po);
TypeReference> tokenType = new TypeReference<>() {
@@ -336,7 +352,7 @@ public class ChartViewManege {
dto.setDatasetGroupId(id);
dto.setOriginName("*");
dto.setName("记录数*");
- dto.setDataeaseName("*");
+ dto.setGisbiName("*");
dto.setType("INT");
dto.setChecked(true);
dto.setColumnIndex(999);
@@ -353,6 +369,7 @@ public class ChartViewManege {
BeanUtils.copyBean(dto, ele);
dto.setDateStyle("y_M_d");
dto.setDatePattern("date_sub");
+ dto.setDateShowFormat("y_M_d");
dto.setChartType("bar");
if (dto.getId() == -1L || dto.getDeType() == 0 || dto.getDeType() == 1 || dto.getDeType() == 7) {
@@ -365,7 +382,7 @@ public class ChartViewManege {
chartFieldCompareDTO.setType("none");
dto.setCompareCalc(chartFieldCompareDTO);
- dto.setFormatterCfg(new FormatterCfgDTO());
+ dto.setFormatterCfg(new FormatterCfgDTO().setUnitLanguage(Lang.isChinese() ? "ch" : "en"));
dto.setSort("none");
dto.setFilter(Collections.emptyList());
@@ -373,8 +390,8 @@ public class ChartViewManege {
}).collect(Collectors.toList());
}
- public CoreChartView transDTO2Record(ChartViewDTO dto) throws Exception {
- CoreChartView record = new CoreChartView();
+ public SnapshotCoreChartView transDTO2Record(ChartViewDTO dto) throws Exception {
+ SnapshotCoreChartView record = new SnapshotCoreChartView();
BeanUtils.copyBean(record, dto);
record.setxAxis(objectMapper.writeValueAsString(dto.getXAxis()));
@@ -400,7 +417,7 @@ public class ChartViewManege {
record.setFlowMapStartName(objectMapper.writeValueAsString(dto.getFlowMapStartName()));
record.setFlowMapEndName(objectMapper.writeValueAsString(dto.getFlowMapEndName()));
record.setExtColor(objectMapper.writeValueAsString(dto.getExtColor()));
-
+ record.setSortPriority(objectMapper.writeValueAsString(dto.getSortPriority()));
return record;
}
@@ -434,6 +451,8 @@ public class ChartViewManege {
dto.setFlowMapStartName(JsonUtil.parseList(record.getFlowMapStartName(), tokenType));
dto.setFlowMapEndName(JsonUtil.parseList(record.getFlowMapEndName(), tokenType));
dto.setExtColor(JsonUtil.parseList(record.getExtColor(), tokenType));
+ dto.setSortPriority(JsonUtil.parseList(record.getSortPriority(), new TypeReference>() {
+ }));
return dto;
@@ -462,4 +481,8 @@ public class ChartViewManege {
return result;
}
}
+
+ public ChartViewDTO findChartViewAround(String viewId) {
+ return extChartViewMapper.findChartViewAround(viewId);
+ }
}
diff --git a/core/core-backend/src/main/java/io/gisbi/chart/manage/ChartViewThresholdManage.java b/core/core-backend/src/main/java/io/gisbi/chart/manage/ChartViewThresholdManage.java
index a77a680..fdc27e3 100644
--- a/core/core-backend/src/main/java/io/gisbi/chart/manage/ChartViewThresholdManage.java
+++ b/core/core-backend/src/main/java/io/gisbi/chart/manage/ChartViewThresholdManage.java
@@ -20,6 +20,7 @@ import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
@@ -34,8 +35,8 @@ public class ChartViewThresholdManage {
@Resource
private ChartViewManege chartViewManege;
- public String convertThresholdRules(Long chartId, String thresholdRules) {
- ChartViewDTO details = chartViewManege.getDetails(chartId);
+ public String convertThresholdRules(Long chartId, String thresholdRules, String resourceTable) {
+ ChartViewDTO details = chartViewManege.getDetails(chartId, resourceTable);
return convertThresholdRules(details, thresholdRules);
}
@@ -251,7 +252,7 @@ public class ChartViewThresholdManage {
String thresholdRules = request.getThresholdRules();
Long chartId = request.getChartId();
try {
- ChartViewDTO chart = chartViewManege.getChart(chartId);
+ ChartViewDTO chart = chartViewManege.getChart(chartId, request.getResourceTable());
Map data = null;
if (ObjectUtils.isEmpty(chart) || MapUtils.isEmpty(data = chart.getData())) {
return new ThresholdCheckVO(false, null, "查询图表异常！", null);
@@ -280,9 +281,16 @@ public class ChartViewThresholdManage {
DatasetTableFieldDTO fieldDTO = fieldMap.get(id);
if (ObjectUtils.isEmpty(fieldDTO)) continue;
String fieldDTOName = fieldDTO.getName();
- String dataeaseName = fieldDTO.getDataeaseName();
- List valueList = rows.stream().map(row -> ObjectUtils.isEmpty(row.get(dataeaseName)) ? null : row.get(dataeaseName).toString()).collect(Collectors.toList());
- String replacement = fieldDTOName + ": " + JsonUtil.toJSONString(valueList);
+ String gisbiName = fieldDTO.getGisbiName();
+ String replacement = null;
+ if (fieldDTO.getDeType().equals(DeTypeConstants.DE_FLOAT) || fieldDTO.getDeType().equals(DeTypeConstants.DE_INT)) {
+ List valueList = rows.stream().map(row -> ObjectUtils.isEmpty(row.get(gisbiName)) ? null : stripTrailingZeros2String(row.get(gisbiName))).collect(Collectors.toList());
+ replacement = fieldDTOName + ": " + JsonUtil.toJSONString(valueList);
+ } else {
+ List valueList = rows.stream().map(row -> ObjectUtils.isEmpty(row.get(gisbiName)) ? null : row.get(gisbiName).toString()).collect(Collectors.toList());
+ replacement = fieldDTOName + ": " + JsonUtil.toJSONString(valueList);
+ }
+
// 替换文本
matcher.appendReplacement(sb, replacement);
}
@@ -297,6 +305,14 @@ public class ChartViewThresholdManage {
}
}
+ private String stripTrailingZeros2String(Object value) {
+ if (ObjectUtils.isEmpty(value)) {
+ return null;
+ }
+ if (!(value instanceof BigDecimal)) return value.toString();
+ return ((BigDecimal) value).stripTrailingZeros().toPlainString();
+ }
+
private void chartDynamicMap(List> rows, FilterTreeObj conditionTree, Map fieldMap) {
List items = conditionTree.getItems();
items.forEach(item -> {
@@ -404,13 +420,13 @@ public class ChartViewThresholdManage {
private String formatValue(List> rows, FilterTreeItem item) {
DatasetTableFieldDTO field = item.getField();
- String dataeaseName = field.getDataeaseName();
+ String gisbiName = field.getGisbiName();
String value = item.getValue();
Float tempFVal = StringUtils.equalsAny(value, "min", "max") ? null : 0f;
int validLen = 0;
for (Map row : rows) {
- Object o = row.get(dataeaseName);
+ Object o = row.get(gisbiName);
if (ObjectUtils.isEmpty(o)) continue;
float fvalue = Float.parseFloat(o.toString());
if (StringUtils.equals("min", value)) {
@@ -487,10 +503,10 @@ public class ChartViewThresholdManage {
}
private boolean rowMatch(Map row, FilterTreeItem item, DatasetTableFieldDTO fieldDTO) {
- String dataeaseName = fieldDTO.getDataeaseName();
+ String gisbiName = fieldDTO.getGisbiName();
String filterType = item.getFilterType();
Integer deType = fieldDTO.getDeType();
- Object valueObj = row.get(dataeaseName);
+ Object valueObj = row.get(gisbiName);
if (StringUtils.equals(filterType, "enum")) {
List enumValue = item.getEnumValue();
return ObjectUtils.isNotEmpty(valueObj) && enumValue.contains(valueObj);
diff --git a/core/core-backend/src/main/java/io/gisbi/chart/server/ChartDataServer.java b/core/core-backend/src/main/java/io/gisbi/chart/server/ChartDataServer.java
index 2675930..c90f161 100644
--- a/core/core-backend/src/main/java/io/gisbi/chart/server/ChartDataServer.java
+++ b/core/core-backend/src/main/java/io/gisbi/chart/server/ChartDataServer.java
@@ -5,7 +5,6 @@ import io.gisbi.api.chart.ChartDataApi;
import io.gisbi.api.chart.dto.ViewDetailField;
import io.gisbi.api.chart.request.ChartExcelRequest;
import io.gisbi.api.chart.request.ChartExcelRequestInner;
-import io.gisbi.auth.DeLinkPermit;
import io.gisbi.chart.constant.ChartConstants;
import io.gisbi.chart.manage.ChartDataManage;
import io.gisbi.constant.AuthConstant;
@@ -14,11 +13,13 @@ import io.gisbi.constant.CommonConstants;
import io.gisbi.dataset.server.DatasetFieldServer;
import io.gisbi.dataset.manage.PermissionManage;
import io.gisbi.constant.DeTypeConstants;
+import io.gisbi.dataset.utils.DatasetUtils;
import io.gisbi.exception.DEException;
import io.gisbi.exportCenter.manage.ExportCenterManage;
import io.gisbi.exportCenter.util.ExportCenterUtils;
import io.gisbi.extensions.datasource.dto.DatasetTableFieldDTO;
import io.gisbi.extensions.view.dto.*;
+import io.gisbi.i18n.Lang;
import io.gisbi.result.ResultCode;
import io.gisbi.utils.JsonUtil;
import io.gisbi.utils.LogUtil;
@@ -69,12 +70,12 @@ public class ChartDataServer implements ChartDataApi {
@Resource
private DatasetFieldServer datasetFieldServer;
- @Value("${dataease.export.page.size:50000}")
+ @Value("${gisbi.export.page.size:50000}")
private Integer extractPageSize;
private final Long sheetLimit = 1000000L;
- @DeLinkPermit("#p0.sceneId")
+
@Override
public ChartViewDTO getData(ChartViewDTO chartViewDTO) throws Exception {
try {
@@ -82,7 +83,11 @@ public class ChartDataServer implements ChartDataApi {
if (CommonConstants.VIEW_DATA_FROM.TEMPLATE.equalsIgnoreCase(chartViewDTO.getDataFrom())) {
return extendDataManage.getChartDataInfo(chartViewDTO.getId(), chartViewDTO);
} else {
- return chartDataManage.calcData(chartViewDTO);
+ DatasetUtils.viewDecode(chartViewDTO);
+ ChartViewDTO dto = chartDataManage.calcData(chartViewDTO);
+ DatasetUtils.viewEncode(dto);
+ chartDataManage.encodeData(dto);
+ return dto;
}
} catch (Exception e) {
DEException.throwException(ResultCode.DATA_IS_WRONG.code(), e.getMessage() + "\n\n" + ExceptionUtils.getStackTrace(e));
@@ -103,8 +108,8 @@ public class ChartDataServer implements ChartDataApi {
viewDTO.setType("table-info");
viewDTO.setRender("antv");
List sourceFields = datasetFieldServer.listByDatasetGroup(viewDTO.getTableId());
- List fileNames = permissionManage.filterColumnPermissions(sourceFields, new HashMap<>(), viewDTO.getTableId(), null).stream().map(DatasetTableFieldDTO::getDataeaseName).collect(Collectors.toList());
- sourceFields = sourceFields.stream().filter(datasetTableFieldDTO -> fileNames.contains(datasetTableFieldDTO.getDataeaseName())).collect(Collectors.toList());
+ List fileNames = permissionManage.filterColumnPermissions(sourceFields, new HashMap<>(), viewDTO.getTableId(), null).stream().map(DatasetTableFieldDTO::getGisbiName).collect(Collectors.toList());
+ sourceFields = sourceFields.stream().filter(datasetTableFieldDTO -> fileNames.contains(datasetTableFieldDTO.getGisbiName())).collect(Collectors.toList());
dsHeader = sourceFields.stream().map(DatasetTableFieldDTO::getName).toArray(String[]::new);
dsTypes = sourceFields.stream().map(DatasetTableFieldDTO::getDeType).toArray(Integer[]::new);
TypeReference> listTypeReference = new TypeReference>() {
@@ -120,7 +125,11 @@ public class ChartDataServer implements ChartDataApi {
} else {
viewDTO.setResultCount(viewLimit);
}
- chartViewInfo = getData(viewDTO);
+ if (CommonConstants.VIEW_DATA_FROM.TEMPLATE.equalsIgnoreCase(viewDTO.getDataFrom())) {
+ chartViewInfo = extendDataManage.getChartDataInfo(viewDTO.getId(), viewDTO);
+ } else {
+ chartViewInfo = chartDataManage.calcData(viewDTO);
+ }
List tableRow = (List) chartViewInfo.getData().get("sourceData");
if ("dataset".equals(request.getDownloadType())) {
request.setHeader(dsHeader);
@@ -214,13 +223,12 @@ public class ChartDataServer implements ChartDataApi {
}
- @DeLinkPermit("#p0.dvId")
@Override
public void innerExportDetails(ChartExcelRequest request, HttpServletResponse response) throws Exception {
HttpServletRequest httpServletRequest = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String linkToken = httpServletRequest.getHeader(AuthConstant.LINK_TOKEN_KEY);
- LogUtil.info(request.getViewInfo().getId() + " " + StringUtils.isNotEmpty(linkToken) + " " + request.isDataEaseBi());
- if ((StringUtils.isNotEmpty(linkToken) && !request.isDataEaseBi()) || (request.isDataEaseBi() && StringUtils.isEmpty(linkToken))) {
+ LogUtil.info(request.getViewInfo().getId() + " " + StringUtils.isNotEmpty(linkToken) + " " + request.isGisbiBi());
+ if ((StringUtils.isNotEmpty(linkToken) && !request.isGisbiBi()) || (request.isGisbiBi() && StringUtils.isEmpty(linkToken))) {
OutputStream outputStream = response.getOutputStream();
try {
Workbook wb = new SXSSFWorkbook();
@@ -238,7 +246,7 @@ public class ChartDataServer implements ChartDataApi {
//设置单元格填充样式(使用纯色背景颜色填充)
cellStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);
- if ("dataset".equals(request.getDownloadType()) || request.getViewInfo().getType().equalsIgnoreCase("table-info")) {
+ if ("dataset".equals(request.getDownloadType()) || request.getViewInfo().getType().equalsIgnoreCase("table-info") || request.getViewInfo().getType().equalsIgnoreCase("table-normal")) {
List details = new ArrayList<>();
Sheet detailsSheet;
Integer sheetIndex = 1;
@@ -251,9 +259,21 @@ public class ChartDataServer implements ChartDataApi {
if ((details.size() + extractPageSize) > sheetLimit || i == chartViewDTO.getTotalPage()) {
detailsSheet = wb.createSheet("数据" + sheetIndex);
Integer[] excelTypes = request.getExcelTypes();
- details.add(0, request.getHeader());
- ViewDetailField[] detailFields = request.getDetailFields();
Object[] header = request.getHeader();
+ request.getViewInfo().setXAxis(request.getViewInfo().getXAxis().stream().filter(ele -> !ele.isHide()).collect(Collectors.toList()));
+ request.getViewInfo().setYAxis(request.getViewInfo().getYAxis().stream().filter(ele -> !ele.isHide()).collect(Collectors.toList()));
+ request.getViewInfo().setXAxisExt(request.getViewInfo().getXAxisExt().stream().filter(ele -> !ele.isHide()).collect(Collectors.toList()));
+ request.getViewInfo().setYAxisExt(request.getViewInfo().getYAxisExt().stream().filter(ele -> !ele.isHide()).collect(Collectors.toList()));
+ request.getViewInfo().setExtStack(request.getViewInfo().getExtStack().stream().filter(ele -> !ele.isHide()).collect(Collectors.toList()));
+ List xAxis = new ArrayList<>();
+ xAxis.addAll(request.getViewInfo().getXAxis());
+ xAxis.addAll(request.getViewInfo().getYAxis());
+ xAxis.addAll(request.getViewInfo().getXAxisExt());
+ xAxis.addAll(request.getViewInfo().getYAxisExt());
+ xAxis.addAll(request.getViewInfo().getExtStack());
+ header = Arrays.stream(request.getHeader()).filter(item -> xAxis.stream().map(DatasetTableFieldDTO::getName).collect(Collectors.toList()).contains(item)).collect(Collectors.toList()).toArray();
+ details.add(0, header);
+ ViewDetailField[] detailFields = request.getDetailFields();
ChartDataServer.setExcelData(detailsSheet, cellStyle, header, details, detailFields, excelTypes, request.getViewInfo(), wb);
sheetIndex++;
details.clear();
@@ -268,7 +288,11 @@ public class ChartDataServer implements ChartDataApi {
ViewDetailField[] detailFields = request.getDetailFields();
Object[] header = request.getHeader();
Sheet detailsSheet = wb.createSheet("数据");
- setExcelData(detailsSheet, cellStyle, header, details, detailFields, excelTypes, request.getViewInfo(), null);
+ if (request.getViewInfo().getType().equalsIgnoreCase("table-normal")) {
+ setExcelData(detailsSheet, cellStyle, header, details, detailFields, excelTypes, request.getViewInfo(), wb);
+ } else {
+ setExcelData(detailsSheet, cellStyle, header, details, detailFields, excelTypes, request.getViewInfo(), null);
+ }
} else {
for (int i = 0; i < request.getMultiInfo().size(); i++) {
ChartExcelRequestInner requestInner = request.getMultiInfo().get(i);
@@ -293,12 +317,10 @@ public class ChartDataServer implements ChartDataApi {
DEException.throwException(e);
}
} else {
- exportCenterManage.addTask(request.getViewId(), "chart", request);
- return;
+ exportCenterManage.addTask(request.getViewId(), "chart", request, request.getBusiFlag());
}
}
- @DeLinkPermit("#p0.dvId")
@Override
public void innerExportDataSetDetails(ChartExcelRequest request, HttpServletResponse response) throws Exception {
this.innerExportDetails(request, response);
@@ -318,7 +340,9 @@ public class ChartDataServer implements ChartDataApi {
xAxis.addAll(viewInfo.getXAxisExt());
xAxis.addAll(viewInfo.getYAxisExt());
xAxis.addAll(viewInfo.getExtStack());
-
+ xAxis.addAll(viewInfo.getDrillFields());
+ TableHeader tableHeader = null;
+ Integer totalDepth = 0;
if (viewInfo.getType().equalsIgnoreCase("table-normal") || viewInfo.getType().equalsIgnoreCase("table-info")) {
for (ChartViewFieldDTO xAxi : xAxis) {
if (xAxi.getDeType().equals(DeTypeConstants.DE_INT) || xAxi.getDeType().equals(DeTypeConstants.DE_FLOAT)) {
@@ -328,6 +352,22 @@ public class ChartDataServer implements ChartDataApi {
styles.add(null);
}
}
+
+ Map customAttr = viewInfo.getCustomAttr();
+ Map tableHeaderMap = (Map) customAttr.get("tableHeader");
+ if (tableHeaderMap.get("headerGroup") != null && Boolean.parseBoolean(tableHeaderMap.get("headerGroup").toString())) {
+ var tmpHeader = JsonUtil.parseObject((String) JsonUtil.toJSONString(customAttr.get("tableHeader")), TableHeader.class);
+ // 校验字段数量和顺序
+ if (validateHeaderGroup(tmpHeader, viewInfo.getXAxis())) {
+ tableHeader = tmpHeader;
+ for (TableHeader.ColumnInfo column : tableHeader.getHeaderGroupConfig().getColumns()) {
+ totalDepth = Math.max(totalDepth, getDepth(column, 1));
+ }
+ for (TableHeader.ColumnInfo column : tableHeader.getHeaderGroupConfig().getColumns()) {
+ setWidth(column, 1);
+ }
+ }
+ }
}
boolean mergeHead = false;
@@ -374,9 +414,31 @@ public class ChartDataServer implements ChartDataApi {
mergeHead = true;
}
if (CollectionUtils.isNotEmpty(details) && (!mergeHead || details.size() > 2)) {
- int realDetailRowIndex = 2;
+ int realDetailRowIndex = tableHeader == null ? 2 : totalDepth;
+ if (tableHeader != null) {
+ cellStyle.setBorderTop(BorderStyle.THIN);
+ cellStyle.setBorderRight(BorderStyle.THIN);
+ cellStyle.setBorderBottom(BorderStyle.THIN);
+ cellStyle.setBorderLeft(BorderStyle.THIN);
+ Map rowMap = new HashMap<>();
+ for (Integer i = 0; i < totalDepth; i++) {
+ rowMap.put("row" + i, detailsSheet.createRow(i));
+ }
+ int width = 0;
+ Integer depth = 0;
+ for (TableHeader.ColumnInfo column : tableHeader.getHeaderGroupConfig().getColumns()) {
+ createCell(tableHeader, column, width, depth, detailsSheet, cellStyle, totalDepth, rowMap, xAxis);
+ width = width + column.getWidth();
+ }
+ }
for (int i = (mergeHead ? 2 : 0); i < details.size(); i++) {
- Row row = detailsSheet.createRow(realDetailRowIndex > 2 ? realDetailRowIndex : i);
+ int rowIndex = i;
+ if (tableHeader != null) {
+ rowIndex = realDetailRowIndex - 1 + i;
+ } else {
+ rowIndex = realDetailRowIndex > 2 ? realDetailRowIndex : i;
+ }
+ Row row = detailsSheet.createRow(rowIndex);
Object[] rowData = details.get(i);
if (rowData != null) {
for (int j = 0; j < rowData.length; j++) {
@@ -417,7 +479,7 @@ public class ChartDataServer implements ChartDataApi {
try {
if ((viewInfo.getType().equalsIgnoreCase("table-normal") || viewInfo.getType().equalsIgnoreCase("table-info")) && (xAxis.get(j).getDeType().equals(DeTypeConstants.DE_INT) || xAxis.get(j).getDeType().equals(DeTypeConstants.DE_FLOAT))) {
try {
- FormatterCfgDTO formatterCfgDTO = xAxis.get(j).getFormatterCfg() == null ? new FormatterCfgDTO() : xAxis.get(j).getFormatterCfg();
+ FormatterCfgDTO formatterCfgDTO = xAxis.get(j).getFormatterCfg() == null ? new FormatterCfgDTO().setUnitLanguage(Lang.isChinese() ? "ch" : "en") : xAxis.get(j).getFormatterCfg();
row.getCell(j).setCellStyle(styles.get(j));
row.getCell(j).setCellValue(Double.valueOf(cellValue(formatterCfgDTO, new BigDecimal(cellValObj.toString()))));
} catch (Exception e) {
@@ -436,10 +498,11 @@ public class ChartDataServer implements ChartDataApi {
} else {
if (!viewInfo.getType().equalsIgnoreCase("circle-packing")) {
Map senior = viewInfo.getSenior();
+ viewInfo.getCustomAttr().get("");
ChartSeniorFunctionCfgDTO functionCfgDTO = JsonUtil.parseObject((String) JsonUtil.toJSONString(senior.get("functionCfg")), ChartSeniorFunctionCfgDTO.class);
if (functionCfgDTO != null && StringUtils.isNotEmpty(functionCfgDTO.getEmptyDataStrategy()) && functionCfgDTO.getEmptyDataStrategy().equalsIgnoreCase("setZero")) {
if ((viewInfo.getType().equalsIgnoreCase("table-normal") || viewInfo.getType().equalsIgnoreCase("table-info"))) {
- if (functionCfgDTO.getEmptyDataFieldCtrl().contains(xAxis.get(j).getDataeaseName())) {
+ if (functionCfgDTO.getEmptyDataFieldCtrl().contains(xAxis.get(j).getGisbiName())) {
cell.setCellValue(0);
}
} else {
@@ -454,6 +517,123 @@ public class ChartDataServer implements ChartDataApi {
}
}
+ private static boolean validateHeaderGroup(TableHeader header, List fields) {
+ if (header == null) {
+ return false;
+ }
+ var columns = header.getHeaderGroupConfig().getColumns();
+ if (CollectionUtils.isEmpty(columns)) {
+ return false;
+ }
+ var leafColumn = getHeaderLeafColumn(columns);
+ if (CollectionUtils.isEmpty(leafColumn) || leafColumn.size() != fields.size()) {
+ return false;
+ }
+ for (int i = 0; i < leafColumn.size(); i++) {
+ var a = leafColumn.get(i);
+ var b = fields.get(i).getGisbiName();
+ if (!StringUtils.equals(a, b)) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ private static List getHeaderLeafColumn(List columns) {
+ var result = new ArrayList();
+ for (TableHeader.ColumnInfo column : columns) {
+ if (CollectionUtils.isEmpty(column.getChildren())) {
+ result.add(column.getKey());
+ } else {
+ result.addAll(getHeaderLeafColumn(column.getChildren()));
+ }
+ }
+ return result;
+ }
+
+ private static Integer getDepth(TableHeader.ColumnInfo column, Integer parentDepth) {
+ if (org.springframework.util.CollectionUtils.isEmpty(column.getChildren())) {
+ return parentDepth;
+ } else {
+ Integer depth = 0;
+ for (TableHeader.ColumnInfo child : column.getChildren()) {
+ depth = Math.max(depth, getDepth(child, parentDepth + 1));
+ }
+ return depth;
+ }
+ }
+
+ private static void createCell(TableHeader tableHeader, TableHeader.ColumnInfo column, Integer width, Integer depth, Sheet sheet, CellStyle cellStyle, Integer totaalDepth, Map rowMap, List xAxis) {
+ if (org.springframework.util.CollectionUtils.isEmpty(column.getChildren())) {
+ Integer toDepth = totaalDepth - 1 > depth ? totaalDepth - 1 : depth;
+ if (depth.equals(toDepth)) {
+ Cell cell = rowMap.get("row" + depth).createCell(width);
+ cell.setCellStyle(cellStyle);
+ cell.setCellValue(getDeFieldName(xAxis, column.getKey()));
+ } else {
+ for (int i = depth; i <= toDepth; i++) {
+ Cell cell1 = rowMap.get("row" + i).createCell(width);
+ cell1.setCellValue(getDeFieldName(xAxis, column.getKey()));
+ cell1.setCellStyle(cellStyle);
+ }
+ CellRangeAddress region = new CellRangeAddress(depth, toDepth, width, width);
+ sheet.addMergedRegion(region);
+
+ Cell mergedCell = rowMap.get("row" + depth).getCell(width);
+ mergedCell.setCellStyle(cellStyle);
+
+ }
+ } else {
+ Cell cell1 = rowMap.get("row" + depth).createCell(width);
+ cell1.setCellValue(getGroupName(tableHeader, column.getKey()));
+ cell1.setCellStyle(cellStyle);
+ Cell cell2 = rowMap.get("row" + depth).createCell(width + column.getWidth() - 1);
+ cell2.setCellValue(getGroupName(tableHeader, column.getKey()));
+ cell2.setCellStyle(cellStyle);
+ CellRangeAddress region = new CellRangeAddress(depth, depth, width, width + column.getWidth() - 1);
+ sheet.addMergedRegion(region);
+ Cell mergedCell = rowMap.get("row" + depth).getCell(width);
+ mergedCell.setCellStyle(cellStyle);
+ int subWith = width;
+ for (TableHeader.ColumnInfo child : column.getChildren()) {
+ createCell(tableHeader, child, subWith, depth + 1, sheet, cellStyle, totaalDepth, rowMap, xAxis);
+ subWith = subWith + child.getWidth();
+ }
+ }
+ }
+
+ private static String getGroupName(TableHeader tableHeader, String key) {
+ for (TableHeader.MetaInfo metaInfo : tableHeader.getHeaderGroupConfig().getMeta()) {
+ if (metaInfo.getField().equals(key)) {
+ return metaInfo.getName();
+ }
+ }
+ return "";
+ }
+
+ private static String getDeFieldName(List xAxis, String key) {
+ for (ChartViewFieldDTO xAxi : xAxis) {
+ if (xAxi.getGisbiName().equals(key)) {
+ return StringUtils.isNotBlank(xAxi.getChartShowName()) ? xAxi.getChartShowName() : xAxi.getName();
+ }
+ }
+ return "";
+ }
+
+ private static Integer setWidth(TableHeader.ColumnInfo column, Integer parentWidth) {
+ if (org.springframework.util.CollectionUtils.isEmpty(column.getChildren())) {
+ column.setWidth(parentWidth);
+ return parentWidth;
+ } else {
+ Integer depth = 0;
+ for (TableHeader.ColumnInfo child : column.getChildren()) {
+ depth = depth + setWidth(child, 1);
+ }
+ column.setWidth(depth);
+ return depth;
+ }
+ }
+
private static String cellValue(FormatterCfgDTO formatterCfgDTO, BigDecimal value) {
if (formatterCfgDTO.getType().equalsIgnoreCase("percent")) {
return value.toString();
@@ -474,22 +654,22 @@ public class ChartDataServer implements ChartDataApi {
if (formatter.getType().equals("auto")) {
String[] valueSplit = String.valueOf(value).split(".");
if (StringUtils.isEmpty(value) || !value.contains(".")) {
- formatStr = "0";
+ formatStr = "General";
} else {
formatStr = "0." + new String(new char[valueSplit.length]).replace('\0', '0');
}
switch (formatter.getUnit()) {
case 1000:
- formatStr = formatStr + "千";
+ formatStr = formatStr + "\"千\"";
break;
case 10000:
- formatStr = formatStr + "万";
+ formatStr = formatStr + "\"万\"";
break;
case 1000000:
- formatStr = formatStr + "百万";
+ formatStr = formatStr + "\"百万\"";
break;
case 100000000:
- formatStr = formatStr + "'亿'";
+ formatStr = formatStr + "\"亿\"";
break;
default:
break;
@@ -501,7 +681,7 @@ public class ChartDataServer implements ChartDataApi {
if (formatter.getSuffix().equals("%")) {
formatStr = formatStr + "\"%\"";
} else {
- formatStr = formatStr + formatter.getSuffix();
+ formatStr = formatStr + "\"" + formatter.getSuffix() + "\"";
}
}
}
@@ -513,16 +693,16 @@ public class ChartDataServer implements ChartDataApi {
}
switch (formatter.getUnit()) {
case 1000:
- formatStr = formatStr + "千";
+ formatStr = formatStr + "\"千\"";
break;
case 10000:
- formatStr = formatStr + "万";
+ formatStr = formatStr + "\"万\"";
break;
case 1000000:
- formatStr = formatStr + "百万";
+ formatStr = formatStr + "\"百万\"";
break;
case 100000000:
- formatStr = formatStr + "'亿'";
+ formatStr = formatStr + "\"亿\"";
break;
default:
break;
@@ -534,7 +714,7 @@ public class ChartDataServer implements ChartDataApi {
if (formatter.getSuffix().equals("%")) {
formatStr = formatStr + "\"%\"";
} else {
- formatStr = formatStr + formatter.getSuffix();
+ formatStr = formatStr + "\"" + formatter.getSuffix() + "\"";
}
}
} else if (formatter.getType().equals("percent")) {
diff --git a/core/core-backend/src/main/java/io/gisbi/chart/server/ChartViewServer.java b/core/core-backend/src/main/java/io/gisbi/chart/server/ChartViewServer.java
index 076d986..858bbb8 100644
--- a/core/core-backend/src/main/java/io/gisbi/chart/server/ChartViewServer.java
+++ b/core/core-backend/src/main/java/io/gisbi/chart/server/ChartViewServer.java
@@ -2,11 +2,13 @@ package io.gisbi.chart.server;
import io.gisbi.api.chart.ChartViewApi;
import io.gisbi.api.chart.vo.ChartBaseVO;
-import io.gisbi.extensions.view.dto.ChartViewDTO;
-import io.gisbi.extensions.view.dto.ChartViewFieldDTO;
import io.gisbi.api.chart.vo.ViewSelectorVO;
import io.gisbi.chart.manage.ChartViewManege;
+import io.gisbi.constant.CommonConstants;
+import io.gisbi.dataset.utils.DatasetUtils;
import io.gisbi.exception.DEException;
+import io.gisbi.extensions.view.dto.ChartViewDTO;
+import io.gisbi.extensions.view.dto.ChartViewFieldDTO;
import io.gisbi.result.ResultCode;
import jakarta.annotation.Resource;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -27,7 +29,7 @@ public class ChartViewServer implements ChartViewApi {
@Override
public ChartViewDTO getData(Long id) throws Exception {
try {
- return chartViewManege.getChart(id);
+ return chartViewManege.getChart(id, CommonConstants.RESOURCE_TABLE.CORE);
} catch (Exception e) {
DEException.throwException(ResultCode.DATA_IS_WRONG.code(), e.getMessage());
}
@@ -36,7 +38,10 @@ public class ChartViewServer implements ChartViewApi {
@Override
public Map> listByDQ(Long id, Long chartId, ChartViewDTO dto) {
- return chartViewManege.listByDQ(id, chartId, dto);
+ Map> stringListMap = chartViewManege.listByDQ(id, chartId, dto);
+ DatasetUtils.listEncode(stringListMap.get("dimensionList"));
+ DatasetUtils.listEncode(stringListMap.get("quotaList"));
+ return stringListMap;
}
@Override
@@ -50,8 +55,8 @@ public class ChartViewServer implements ChartViewApi {
}
@Override
- public ChartViewDTO getDetail(Long id) {
- return chartViewManege.getDetails(id);
+ public ChartViewDTO getDetail(Long id, String resourceTable) {
+ return chartViewManege.getDetails(id, resourceTable);
}
@Override
@@ -75,7 +80,7 @@ public class ChartViewServer implements ChartViewApi {
}
@Override
- public ChartBaseVO chartBaseInfo(Long id) {
- return chartViewManege.chartBaseInfo(id);
+ public ChartBaseVO chartBaseInfo(Long id, String resourceTable) {
+ return chartViewManege.chartBaseInfo(id, resourceTable);
}
}
diff --git a/core/core-backend/src/main/java/io/gisbi/chart/utils/ChartDataBuild.java b/core/core-backend/src/main/java/io/gisbi/chart/utils/ChartDataBuild.java
index 4d46e38..fcf405c 100644
--- a/core/core-backend/src/main/java/io/gisbi/chart/utils/ChartDataBuild.java
+++ b/core/core-backend/src/main/java/io/gisbi/chart/utils/ChartDataBuild.java
@@ -1180,13 +1180,13 @@ public class ChartDataBuild {
Map> groupDataList = detailData.stream().collect(Collectors.groupingBy(item -> "(" + StringUtils.join(ArrayUtils.subarray(item, 0, xEndIndex), ")-de-(") + ")"));
tableRow.forEach(row -> {
- String key = xAxis.stream().map(x -> String.format(format, row.get(x.getDataeaseName()).toString())).collect(Collectors.joining("-de-"));
+ String key = xAxis.stream().map(x -> String.format(format, row.get(x.getGisbiName()).toString())).collect(Collectors.joining("-de-"));
List detailFieldValueList = groupDataList.get(key);
List> detailValueMapList = detailFieldValueList.stream().map((detailArr -> {
Map temp = new HashMap<>();
for (int i = 0; i < realDetailFields.size(); i++) {
ChartViewFieldDTO realDetailField = realDetailFields.get(i);
- temp.put(realDetailField.getDataeaseName(), detailArr[detailIndex + i]);
+ temp.put(realDetailField.getGisbiName(), detailArr[detailIndex + i]);
}
return temp;
})).collect(Collectors.toList());
@@ -1196,7 +1196,7 @@ public class ChartDataBuild {
ChartViewFieldDTO detailFieldDTO = new ChartViewFieldDTO();
detailFieldDTO.setId(IDUtils.snowID());
detailFieldDTO.setName("detail");
- detailFieldDTO.setDataeaseName("detail");
+ detailFieldDTO.setGisbiName("detail");
fields.add(detailFieldDTO);
map.put("fields", fields);
map.put("detailFields", realDetailFields);
@@ -1299,21 +1299,21 @@ public class ChartDataBuild {
data.forEach(ele -> {
Map d = new HashMap<>();
for (int i = 0; i < fields.size(); i++) {
- if (ObjectUtils.isNotEmpty(desensitizationList.keySet()) && desensitizationList.containsKey(fields.get(i).getDataeaseName())) {
- String desensitizationValue = desensitizationValue(desensitizationList.get(fields.get(i).getDataeaseName()), String.valueOf(ele[i]));
+ if (ObjectUtils.isNotEmpty(desensitizationList.keySet()) && desensitizationList.containsKey(fields.get(i).getGisbiName())) {
+ String desensitizationValue = desensitizationValue(desensitizationList.get(fields.get(i).getGisbiName()), String.valueOf(ele[i]));
ele[i] = desensitizationValue;
- d.put(fields.get(i).getDataeaseName(), desensitizationValue);
+ d.put(fields.get(i).getGisbiName(), desensitizationValue);
continue;
}
if (i == ele.length) break;
ChartViewFieldDTO chartViewFieldDTO = fields.get(i);
if (chartViewFieldDTO.getDeType() == 0 || chartViewFieldDTO.getDeType() == 1 || chartViewFieldDTO.getDeType() == 5 || chartViewFieldDTO.getDeType() == 7) {
- d.put(fields.get(i).getDataeaseName(), StringUtils.isEmpty(ele[i]) ? "" : ele[i]);
+ d.put(fields.get(i).getGisbiName(), StringUtils.isEmpty(ele[i]) ? "" : ele[i]);
} else if (chartViewFieldDTO.getDeType() == 2 || chartViewFieldDTO.getDeType() == 3 || chartViewFieldDTO.getDeType() == 4) {
if (view.getIsExcelExport()) {
- d.put(fields.get(i).getDataeaseName(), StringUtils.isEmpty(ele[i]) ? "" : ele[i]);
+ d.put(fields.get(i).getGisbiName(), StringUtils.isEmpty(ele[i]) ? "" : ele[i]);
} else {
- d.put(fields.get(i).getDataeaseName(), StringUtils.isEmpty(ele[i]) ? null : new BigDecimal(ele[i]).setScale(8, RoundingMode.HALF_UP));
+ d.put(fields.get(i).getGisbiName(), StringUtils.isEmpty(ele[i]) ? null : new BigDecimal(ele[i]).setScale(8, RoundingMode.HALF_UP));
}
}
}
@@ -1383,10 +1383,7 @@ public class ChartDataBuild {
chartDimensionDTO.setValue(row[j]);
dimensionList.add(chartDimensionDTO);
}
- ChartDimensionDTO chartDimensionDTO = new ChartDimensionDTO();
- chartDimensionDTO.setId(extStack.get(0).getId());
- chartDimensionDTO.setValue(row[xAxis.size()]);
- dimensionList.add(chartDimensionDTO);
+
axisChartDataDTO.setDimensionList(dimensionList);
if (ObjectUtils.isNotEmpty(yAxis)) {
@@ -1785,19 +1782,19 @@ public class ChartDataBuild {
List> tableRow = (List>) map.get("tableRow");
final int xEndIndex = detailIndex;
Map> groupDataList = detailData.stream().collect(Collectors.groupingBy(item -> "(" + StringUtils.join(ArrayUtils.subarray(item, 0, xEndIndex), ")-de-(") + ")"));
- String extBubbleDataeaseName = ObjectUtils.isNotEmpty(extBubble) ? extBubble.get(0).getDataeaseName() : "";
+ String extBubblegisbiName = ObjectUtils.isNotEmpty(extBubble) ? extBubble.get(0).getGisbiName() : "";
tableRow.forEach(row -> {
- BigDecimal rowValue = row.get(extBubbleDataeaseName) == null ? BigDecimal.ZERO : new BigDecimal(row.get(extBubbleDataeaseName).toString());
- String key = xAxis.stream().map(x -> String.format(format, row.get(x.getDataeaseName()).toString())).collect(Collectors.joining("-de-"));
+ BigDecimal rowValue = row.get(extBubblegisbiName) == null ? BigDecimal.ZERO : new BigDecimal(row.get(extBubblegisbiName).toString());
+ String key = xAxis.stream().map(x -> String.format(format, row.get(x.getGisbiName()).toString())).collect(Collectors.joining("-de-"));
List detailFieldValueList = groupDataList.get(key);
List> detailValueMapList = Optional.ofNullable(detailFieldValueList).orElse(new ArrayList<>()).stream().map((detailArr -> {
Map temp = new HashMap<>();
for (int i = 0; i < realDetailFields.size(); i++) {
ChartViewFieldDTO realDetailField = realDetailFields.get(i);
- if (StringUtils.equalsIgnoreCase(extBubbleDataeaseName, realDetailField.getDataeaseName())) {
- temp.put(realDetailField.getDataeaseName(), rowValue);
+ if (StringUtils.equalsIgnoreCase(extBubblegisbiName, realDetailField.getGisbiName())) {
+ temp.put(realDetailField.getGisbiName(), rowValue);
} else {
- temp.put(realDetailField.getDataeaseName(), detailArr[detailIndex + i]);
+ temp.put(realDetailField.getGisbiName(), detailArr[detailIndex + i]);
}
}
return temp;
@@ -1807,10 +1804,10 @@ public class ChartDataBuild {
});
// 先过滤掉所有记录数字段
List filterCountAxis = fields.stream()
- .filter(item -> !StringUtils.equalsIgnoreCase(item.getDataeaseName(), "*"))
+ .filter(item -> !StringUtils.equalsIgnoreCase(item.getGisbiName(), "*"))
.collect(Collectors.toList());
// 如果气泡大小是记录数，添加到字段列表中
- if (ObjectUtils.isNotEmpty(extBubble) && "*".equals(extBubble.get(0).getDataeaseName())) {
+ if (ObjectUtils.isNotEmpty(extBubble) && "*".equals(extBubble.get(0).getGisbiName())) {
filterCountAxis.addAll(yAxis);
}
map.put("fields", filterCountAxis);
diff --git a/core/core-backend/src/main/java/io/gisbi/commons/constants/DataVisualizationConstants.java b/core/core-backend/src/main/java/io/gisbi/commons/constants/DataVisualizationConstants.java
index d5e47b7..1c56219 100644
--- a/core/core-backend/src/main/java/io/gisbi/commons/constants/DataVisualizationConstants.java
+++ b/core/core-backend/src/main/java/io/gisbi/commons/constants/DataVisualizationConstants.java
@@ -10,6 +10,9 @@ public class DataVisualizationConstants {
// 主工程
public static final String MAIN = "main";
+
+ // 主工程编辑区
+ public static final String MAIN_EDIT = "main-edit";
}
//新建仪表板来源
diff --git a/core/core-backend/src/main/java/io/gisbi/commons/utils/EncryptUtils.java b/core/core-backend/src/main/java/io/gisbi/commons/utils/EncryptUtils.java
index b5dcc58..bf1ab08 100644
--- a/core/core-backend/src/main/java/io/gisbi/commons/utils/EncryptUtils.java
+++ b/core/core-backend/src/main/java/io/gisbi/commons/utils/EncryptUtils.java
@@ -10,6 +10,7 @@ public class EncryptUtils extends CodingUtil {
private static final String secretKey = "www.fit2cloud.co";
private static final String iv = "1234567890123456";
+
public static Object aesEncrypt(Object o) {
if (o == null) {
return null;
diff --git a/core/core-backend/src/main/java/io/gisbi/commons/utils/ExcelWatermarkUtils.java b/core/core-backend/src/main/java/io/gisbi/commons/utils/ExcelWatermarkUtils.java
index 56529fc..86f5b09 100644
--- a/core/core-backend/src/main/java/io/gisbi/commons/utils/ExcelWatermarkUtils.java
+++ b/core/core-backend/src/main/java/io/gisbi/commons/utils/ExcelWatermarkUtils.java
@@ -1,5 +1,6 @@
package io.gisbi.commons.utils;
+import io.gisbi.api.permissions.user.vo.UserFormVO;
import io.gisbi.i18n.Translator;
import io.gisbi.utils.IPUtils;
import io.gisbi.visualization.dto.WatermarkContentDTO;
@@ -20,31 +21,31 @@ public class ExcelWatermarkUtils {
private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-// public static String transContent(WatermarkContentDTO watermarkContent, UserFormVO userInfo) {
-// String content = "";
-// switch (watermarkContent.getType()) {
-// case "custom" -> content = watermarkContent.getContent();
-// case "nickName" -> content = "${nickName}";
-// case "ip" -> content = "${ip}";
-// case "time" -> content = "${time}";
-// default -> content = "${username}";
-// }
-// String nickName = userInfo.getName().contains("i18n_") ?Translator.get(userInfo.getName()):userInfo.getName();
-// content = content.replaceAll("\\$\\{ip}", IPUtils.get() == null ? "127.0.0.1" : IPUtils.get());
-// content = content.replaceAll("\\$\\{username}", userInfo.getAccount());
-// content = content.replaceAll("\\$\\{nickName}", nickName);
-// content = content.replaceAll("\\$\\{time}", sdf.format(new Date()));
-// return content;
-// }
+ public static String transContent(WatermarkContentDTO watermarkContent, UserFormVO userInfo) {
+ String content = "";
+ switch (watermarkContent.getType()) {
+ case "custom" -> content = watermarkContent.getContent();
+ case "nickName" -> content = "${nickName}";
+ case "ip" -> content = "${ip}";
+ case "time" -> content = "${time}";
+ default -> content = "${username}";
+ }
+ String nickName = userInfo.getName().contains("i18n_") ?Translator.get(userInfo.getName()):userInfo.getName();
+ content = content.replaceAll("\\$\\{ip}", IPUtils.get() == null ? "127.0.0.1" : IPUtils.get());
+ content = content.replaceAll("\\$\\{username}", userInfo.getAccount());
+ content = content.replaceAll("\\$\\{nickName}", nickName);
+ content = content.replaceAll("\\$\\{time}", sdf.format(new Date()));
+ return content;
+ }
/**
* 添加水印图片到工作簿并返回图片 ID
*/
-// public static int addWatermarkImage(Workbook wb, WatermarkContentDTO watermarkContent, UserFormVO userInfo) {
-// byte[] imageBytes = createTextImage(transContent(watermarkContent, userInfo), watermarkContent); // 生成文字水印图片
-// return wb.addPicture(imageBytes, Workbook.PICTURE_TYPE_PNG); // 添加到工作簿并返回 ID
-// }
+ public static int addWatermarkImage(Workbook wb, WatermarkContentDTO watermarkContent, UserFormVO userInfo) {
+ byte[] imageBytes = createTextImage(transContent(watermarkContent, userInfo), watermarkContent); // 生成文字水印图片
+ return wb.addPicture(imageBytes, Workbook.PICTURE_TYPE_PNG); // 添加到工作簿并返回 ID
+ }
public static void addWatermarkToSheet(Sheet sheet, Integer pictureIdx) {
Drawing drawing = sheet.createDrawingPatriarch();
diff --git a/core/core-backend/src/main/java/io/gisbi/commons/utils/SqlparserUtils.java b/core/core-backend/src/main/java/io/gisbi/commons/utils/SqlparserUtils.java
index e6591d3..27eb09c 100644
--- a/core/core-backend/src/main/java/io/gisbi/commons/utils/SqlparserUtils.java
+++ b/core/core-backend/src/main/java/io/gisbi/commons/utils/SqlparserUtils.java
@@ -1,6 +1,9 @@
package io.gisbi.commons.utils;
import com.fasterxml.jackson.core.type.TypeReference;
+import io.gisbi.api.permissions.user.vo.UserFormVO;
+import io.gisbi.api.permissions.variable.dto.SysVariableValueDto;
+import io.gisbi.api.permissions.variable.dto.SysVariableValueItem;
import io.gisbi.exception.DEException;
import io.gisbi.extensions.datasource.api.PluginManageApi;
import io.gisbi.extensions.datasource.dto.DatasourceSchemaDTO;
@@ -18,7 +21,6 @@ import net.sf.jsqlparser.parser.CCJSqlParserUtil;
import net.sf.jsqlparser.statement.Statement;
import net.sf.jsqlparser.statement.select.*;
import net.sf.jsqlparser.util.deparser.ExpressionDeParser;
-import net.sf.jsqlparser.util.deparser.SelectDeParser;
import org.apache.calcite.sql.*;
import org.apache.calcite.sql.parser.SqlParser;
import org.apache.calcite.sql.util.SqlShuttle;
@@ -37,24 +39,29 @@ import static org.apache.calcite.sql.SqlKind.*;
public class SqlparserUtils {
public static final String regex = "\\$\\{(.*?)\\}";
- public static final String regex2 = "\\[(.*?)\\]";
- private static final String SubstitutedParams = "DATAEASE_PATAMS_BI";
+ public static final String regex2 = "\\$f2cde\\[(.*?)\\]";
+ private static final String SubstitutedParams = "gisbi_PATAMS_BI";
private static final String SysParamsSubstitutedParams = "DeSysParams_";
private static final String SubstitutedSql = " 'DE-BI' = 'DE-BI' ";
private boolean removeSysParams;
+ boolean hasVariables = false;
+ private UserFormVO userEntity;
private final List> sysParams = new ArrayList<>();
+ private static final String deVariablePattern = "\\$DE_PARAM\\{(.*?)\\}";
+
+ public String handleVariableDefaultValue(String sql, String sqlVariableDetails, boolean isEdit, boolean isFromDataSet, List parameters, boolean isCross, Map dsMap, PluginManageApi pluginManage, UserFormVO userEntity) {
+ Pattern r = Pattern.compile(deVariablePattern);
+ Matcher m = r.matcher(sql);
+ if (m.find()) {
+ return new DeSqlparserUtils().handleVariableDefaultValue(sql, sqlVariableDetails, isEdit, isFromDataSet, parameters, isCross, dsMap, pluginManage, userEntity);
+ }
- public String handleVariableDefaultValue(String sql, String sqlVariableDetails, boolean isEdit, boolean isFromDataSet, List parameters, boolean isCross, Map dsMap, PluginManageApi pluginManage) {
DatasourceSchemaDTO ds = dsMap.entrySet().iterator().next().getValue();
if (StringUtils.isEmpty(sql)) {
DEException.throwException(Translator.get("i18n_sql_not_empty"));
}
- try {
- this.removeSysParams = true;
- removeVariables(sql, ds.getType());
- } catch (Exception e) {
- DEException.throwException(e);
- }
+ this.userEntity = userEntity;
+ hasVariables = false;
sql = sql.trim();
if (sql.endsWith(";")) {
sql = sql.substring(0, sql.length() - 1);
@@ -139,40 +146,62 @@ public class SqlparserUtils {
return sql;
}
+ private static boolean isParams(String paramId) {
+ if (Arrays.asList("sysParams.userId", "sysParams.userEmail", "sysParams.userName").contains(paramId)) {
+ return true;
+ }
+ boolean isLong = false;
+ try {
+ Long.valueOf(paramId);
+ isLong = true;
+ } catch (Exception e) {
+ isLong = false;
+ }
+ if (paramId.length() >= 18 && isLong) {
+ return true;
+ }
+ return false;
+ }
private String removeVariables(final String sql, String dsType) throws Exception {
String tmpSql = sql.replaceAll("(?m)^\\s*$[\n\r]{0,}", "");
Pattern pattern = Pattern.compile(regex);
Matcher matcher = pattern.matcher(tmpSql);
- boolean hasVariables = false;
while (matcher.find()) {
hasVariables = true;
tmpSql = tmpSql.replace(matcher.group(), SubstitutedParams);
}
if (removeSysParams) {
for (Map sysParam : sysParams) {
- tmpSql = tmpSql.replaceAll(sysParam.get("replace"), sysParam.get("origin"));
+ tmpSql = tmpSql.replace(sysParam.get("replace"), sysParam.get("origin"));
}
pattern = Pattern.compile(regex2);
matcher = pattern.matcher(tmpSql);
while (matcher.find()) {
+ String paramId = matcher.group().substring(7, matcher.group().length() - 1);
+ if (!isParams(paramId)) {
+ continue;
+ }
hasVariables = true;
tmpSql = tmpSql.replace(matcher.group(), SubstitutedParams);
}
} else {
pattern = Pattern.compile(regex2);
matcher = pattern.matcher(tmpSql);
- sysParams.clear();
while (matcher.find()) {
+ String paramId = matcher.group().substring(7, matcher.group().length() - 1);
+ if (!isParams(paramId)) {
+ continue;
+ }
hasVariables = true;
- tmpSql = tmpSql.replace(matcher.group(), SysParamsSubstitutedParams + matcher.group().substring(1, matcher.group().length() - 1));
+ tmpSql = tmpSql.replace(matcher.group(), SysParamsSubstitutedParams + matcher.group().substring(7, matcher.group().length() - 1));
Map sysParam = new HashMap<>();
sysParam.put("origin", matcher.group());
- sysParam.put("replace", SysParamsSubstitutedParams + matcher.group().substring(1, matcher.group().length() - 1));
+ sysParam.put("replace", SysParamsSubstitutedParams + matcher.group().substring(7, matcher.group().length() - 1));
sysParams.add(sysParam);
}
}
- if(!hasVariables && !sql.contains(SubstitutedParams)){
+ if (!hasVariables && !sql.contains(SubstitutedParams)) {
return sql;
}
Statement statement = CCJSqlParserUtil.parse(tmpSql);
diff --git a/core/core-backend/src/main/java/io/gisbi/config/DeMvcConfig.java b/core/core-backend/src/main/java/io/gisbi/config/DeMvcConfig.java
index 7c25dc9..199a348 100644
--- a/core/core-backend/src/main/java/io/gisbi/config/DeMvcConfig.java
+++ b/core/core-backend/src/main/java/io/gisbi/config/DeMvcConfig.java
@@ -25,20 +25,20 @@ public class DeMvcConfig implements WebMvcConfigurer {
@Override
public void addResourceHandlers(ResourceHandlerRegistry registry) {
String workDir = FILE_PROTOCOL + ensureSuffix(WORK_DIR, FILE_SEPARATOR);
- String uploadUrlPattern = ensureBoth(URL_SEPARATOR + UPLOAD_URL_PREFIX, URL_SEPARATOR) + "**";
+ String uploadUrlPattern = ensureBoth(URL_SEPARATOR + UPLOAD_URL_PREFIX, AuthConstant.DE_API_PREFIX, URL_SEPARATOR) + "**";
registry.addResourceHandler(uploadUrlPattern).addResourceLocations(workDir);
// map
String mapDir = FILE_PROTOCOL + ensureSuffix(MAP_DIR, FILE_SEPARATOR);
- String mapUrlPattern = ensureBoth(MAP_URL, URL_SEPARATOR) + "**";
+ String mapUrlPattern = ensureBoth(MAP_URL, AuthConstant.DE_API_PREFIX, URL_SEPARATOR) + "**";
registry.addResourceHandler(mapUrlPattern).addResourceLocations(mapDir);
String geoDir = FILE_PROTOCOL + ensureSuffix(CUSTOM_MAP_DIR, FILE_SEPARATOR);
- String geoUrlPattern = ensureBoth(GEO_URL, URL_SEPARATOR) + "**";
+ String geoUrlPattern = ensureBoth(GEO_URL, AuthConstant.DE_API_PREFIX, URL_SEPARATOR) + "**";
registry.addResourceHandler(geoUrlPattern).addResourceLocations(geoDir);
String i18nDir = FILE_PROTOCOL + ensureSuffix(I18N_DIR, FILE_SEPARATOR);
- String i18nUrlPattern = ensureBoth(I18N_URL, URL_SEPARATOR) + "**";
+ String i18nUrlPattern = ensureBoth(I18N_URL, AuthConstant.DE_API_PREFIX, URL_SEPARATOR) + "**";
registry.addResourceHandler(i18nUrlPattern).addResourceLocations(i18nDir);
}
diff --git a/core/core-backend/src/main/java/io/gisbi/dataset/dao/auto/entity/CoreDatasetGroup.java b/core/core-backend/src/main/java/io/gisbi/dataset/dao/auto/entity/CoreDatasetGroup.java
index cccc84f..6116400 100644
--- a/core/core-backend/src/main/java/io/gisbi/dataset/dao/auto/entity/CoreDatasetGroup.java
+++ b/core/core-backend/src/main/java/io/gisbi/dataset/dao/auto/entity/CoreDatasetGroup.java
@@ -5,7 +5,7 @@ import java.io.Serializable;
/**
*
- *
+ * 数据集分组表
*
*
* @Author bi-coder
@@ -71,6 +71,9 @@ public class CoreDatasetGroup implements Serializable {
*/
private Long createTime;
+ /**
+ * Quartz 实例 ID
+ */
private String qrtzInstance;
/**
@@ -93,6 +96,11 @@ public class CoreDatasetGroup implements Serializable {
*/
private String unionSql;
+ /**
+ * 是否跨源
+ */
+ private Boolean isCross;
+
public Long getId() {
return id;
}
@@ -213,11 +221,18 @@ public class CoreDatasetGroup implements Serializable {
this.unionSql = unionSql;
}
+ public Boolean getIsCross() {
+ return isCross;
+ }
+
+ public void setIsCross(Boolean isCross) {
+ this.isCross = isCross;
+ }
+
@Override
public String toString() {
return "CoreDatasetGroup{" +
"id = " + id +
- ", appId = " + appId +
", name = " + name +
", pid = " + pid +
", level = " + level +
@@ -232,14 +247,7 @@ public class CoreDatasetGroup implements Serializable {
", updateBy = " + updateBy +
", lastUpdateTime = " + lastUpdateTime +
", unionSql = " + unionSql +
+ ", isCross = " + isCross +
"}";
}
-
- public String getAppId() {
- return appId;
- }
-
- public void setAppId(String appId) {
- this.appId = appId;
- }
}
diff --git a/core/core-backend/src/main/java/io/gisbi/dataset/dao/auto/entity/CoreDatasetTableField.java b/core/core-backend/src/main/java/io/gisbi/dataset/dao/auto/entity/CoreDatasetTableField.java
index 140030b..6fd060a 100644
--- a/core/core-backend/src/main/java/io/gisbi/dataset/dao/auto/entity/CoreDatasetTableField.java
+++ b/core/core-backend/src/main/java/io/gisbi/dataset/dao/auto/entity/CoreDatasetTableField.java
@@ -57,9 +57,9 @@ public class CoreDatasetTableField implements Serializable {
private String description;
/**
- * de字段名用作唯一标识
+ * 字段名用作唯一标识
*/
- private String dataeaseName;
+ private String gisbiName;
/**
* de字段别名
@@ -92,7 +92,7 @@ public class CoreDatasetTableField implements Serializable {
private Integer size;
/**
- * dataease字段类型：0-文本，1-时间，2-整型数值，3-浮点数值，4-布尔，5-地理位置，6-二进制
+ * gisbi字段类型：0-文本，1-时间，2-整型数值，3-浮点数值，4-布尔，5-地理位置，6-二进制
*/
private Integer deType;
@@ -205,12 +205,12 @@ public class CoreDatasetTableField implements Serializable {
this.description = description;
}
- public String getDataeaseName() {
- return dataeaseName;
+ public String getGisbiName() {
+ return gisbiName;
}
- public void setDataeaseName(String dataeaseName) {
- this.dataeaseName = dataeaseName;
+ public void setGisbiName(String gisbiName) {
+ this.gisbiName = gisbiName;
}
public String getFieldShortName() {
@@ -352,7 +352,7 @@ public class CoreDatasetTableField implements Serializable {
", originName = " + originName +
", name = " + name +
", description = " + description +
- ", dataeaseName = " + dataeaseName +
+ ", gisbiName = " + gisbiName +
", fieldShortName = " + fieldShortName +
", groupList = " + groupList +
", otherGroup = " + otherGroup +
diff --git a/core/core-backend/src/main/java/io/gisbi/dataset/dao/auto/mapper/CoreDatasetTableMapper.java b/core/core-backend/src/main/java/io/gisbi/dataset/dao/auto/mapper/CoreDatasetTableMapper.java
index 72109de..27bf299 100644
--- a/core/core-backend/src/main/java/io/gisbi/dataset/dao/auto/mapper/CoreDatasetTableMapper.java
+++ b/core/core-backend/src/main/java/io/gisbi/dataset/dao/auto/mapper/CoreDatasetTableMapper.java
@@ -1,10 +1,8 @@
package io.gisbi.dataset.dao.auto.mapper;
-import io.gisbi.application.system.domain.Role;
-import io.gisbi.dataset.dao.auto.entity.CoreDatasetTable;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import io.gisbi.dataset.dao.auto.entity.CoreDatasetTable;
import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
diff --git a/core/core-backend/src/main/java/io/gisbi/dataset/dao/ext/mapper/CoreDataSetExtMapper.java b/core/core-backend/src/main/java/io/gisbi/dataset/dao/ext/mapper/CoreDataSetExtMapper.java
index 0b92735..16e9d0e 100644
--- a/core/core-backend/src/main/java/io/gisbi/dataset/dao/ext/mapper/CoreDataSetExtMapper.java
+++ b/core/core-backend/src/main/java/io/gisbi/dataset/dao/ext/mapper/CoreDataSetExtMapper.java
@@ -19,6 +19,6 @@ public interface CoreDataSetExtMapper {
""")
List query(@Param("ew") QueryWrapper queryWrapper);
- @Select("select id, name, node_type, create_by, create_time, update_by, last_update_time from core_dataset_group where id = #{id}")
+ @Select("select id, name, node_type, create_by, create_time, update_by, last_update_time, is_cross from core_dataset_group where id = #{id}")
DataSetBarVO queryBarInfo(@Param("id") Long id);
}
diff --git a/core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetDataManage.java b/core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetDataManage.java
index 8881206..73c9aa1 100644
--- a/core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetDataManage.java
+++ b/core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetDataManage.java
@@ -1,20 +1,23 @@
package io.gisbi.dataset.manage;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.gisbi.api.chart.dto.DeSortField;
import io.gisbi.api.dataset.dto.*;
import io.gisbi.api.dataset.union.DatasetGroupInfoDTO;
import io.gisbi.api.dataset.union.DatasetTableInfoDTO;
+import io.gisbi.api.permissions.auth.dto.BusiPerCheckDTO;
+import io.gisbi.api.permissions.dataset.api.RowPermissionsApi;
+import io.gisbi.api.permissions.user.vo.UserFormVO;
import io.gisbi.chart.utils.ChartDataBuild;
import io.gisbi.commons.utils.SqlparserUtils;
+import io.gisbi.constant.AuthEnum;
+import io.gisbi.constant.SQLConstants;
import io.gisbi.dataset.constant.DatasetTableType;
-import io.gisbi.dataset.dao.auto.entity.CoreDatasetTable;
-import io.gisbi.dataset.dao.auto.entity.CoreDatasetTableField;
import io.gisbi.dataset.dao.auto.mapper.CoreDatasetTableFieldMapper;
import io.gisbi.dataset.dao.auto.mapper.CoreDatasetTableMapper;
import io.gisbi.dataset.utils.DatasetUtils;
import io.gisbi.dataset.utils.FieldUtils;
+import io.gisbi.dataset.utils.SqlUtils;
import io.gisbi.dataset.utils.TableUtils;
import io.gisbi.datasource.dao.auto.entity.CoreDatasource;
import io.gisbi.datasource.dao.auto.mapper.CoreDatasourceMapper;
@@ -22,7 +25,6 @@ import io.gisbi.datasource.manage.DataSourceManage;
import io.gisbi.datasource.manage.EngineManage;
import io.gisbi.datasource.utils.DatasourceUtils;
import io.gisbi.engine.constant.ExtFieldConstant;
-import io.gisbi.constant.SQLConstants;
import io.gisbi.engine.sql.SQLProvider;
import io.gisbi.engine.trans.*;
import io.gisbi.engine.utils.SQLUtils;
@@ -40,10 +42,8 @@ import io.gisbi.extensions.view.dto.ChartExtRequest;
import io.gisbi.extensions.view.dto.ColumnPermissionItem;
import io.gisbi.extensions.view.dto.SqlVariableDetails;
import io.gisbi.i18n.Translator;
-import io.gisbi.utils.BeanUtils;
-import io.gisbi.utils.IDUtils;
-import io.gisbi.utils.JsonUtil;
-import io.gisbi.utils.TreeUtils;
+import io.gisbi.system.manage.CorePermissionManage;
+import io.gisbi.utils.*;
import jakarta.annotation.Resource;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
@@ -58,6 +58,7 @@ import java.util.*;
import java.util.stream.Collectors;
import static io.gisbi.chart.manage.ChartDataManage.START_END_SEPARATOR;
+import static io.gisbi.dataset.utils.TableUtils.format;
/**
* @Author bi-coder
@@ -79,6 +80,10 @@ public class DatasetDataManage {
@Autowired(required = false)
private PluginManageApi pluginManage;
@Resource
+ private CorePermissionManage corePermissionManage;
+ @Autowired(required = false)
+ private RowPermissionsApi rowPermissionsApi;
+ @Resource
private CoreDatasetTableFieldMapper coreDatasetTableFieldMapper;
@Resource
private CoreDatasetTableMapper coreDatasetTableMapper;
@@ -87,7 +92,11 @@ public class DatasetDataManage {
private static Logger logger = LoggerFactory.getLogger(DatasetDataManage.class);
- public static final List notFullDs = List.of("mysql", "mariadb", "Excel", "API");
+ private RowPermissionsApi getRowPermissionsApi() {
+ return rowPermissionsApi;
+ }
+
+ public static final List notFullDs = List.of("mysql", "mariadb", "Excel", "API", "H2", "h2");
public List getTableFields(DatasetTableDTO datasetTableDTO) throws Exception {
List list = null;
@@ -97,7 +106,7 @@ public class DatasetDataManage {
if (StringUtils.equalsIgnoreCase(type, DatasetTableType.DB) || StringUtils.equalsIgnoreCase(type, DatasetTableType.SQL)) {
CoreDatasource coreDatasource = dataSourceManage.getCoreDatasource(datasetTableDTO.getDatasourceId());
DatasourceSchemaDTO datasourceSchemaDTO = new DatasourceSchemaDTO();
- if (StringUtils.equalsIgnoreCase("excel", coreDatasource.getType()) || coreDatasource.getType().contains(DatasourceConfiguration.DatasourceType.API.name())) {
+ if (coreDatasource.getType().contains(DatasourceConfiguration.DatasourceType.Excel.name()) || coreDatasource.getType().contains(DatasourceConfiguration.DatasourceType.API.name())) {
coreDatasource = engineManage.getDeEngine();
}
if (StringUtils.isNotEmpty(coreDatasource.getStatus()) && "Error".equalsIgnoreCase(coreDatasource.getStatus())) {
@@ -108,6 +117,7 @@ public class DatasetDataManage {
Provider provider = ProviderFactory.getProvider(coreDatasource.getType());
DatasourceRequest datasourceRequest = new DatasourceRequest();
+ datasourceRequest.setIsCross(datasetTableDTO.getIsCross());
datasourceRequest.setDsList(Map.of(datasourceSchemaDTO.getId(), datasourceSchemaDTO));
String sql;
if (StringUtils.equalsIgnoreCase(type, DatasetTableType.DB)) {
@@ -115,23 +125,34 @@ public class DatasetDataManage {
sql = TableUtils.tableName2Sql(datasourceSchemaDTO, tableInfoDTO.getTable()) + " LIMIT 0 OFFSET 0";
// replace schema alias, trans dialect
Map map = JsonUtil.parseObject(datasourceSchemaDTO.getConfiguration(), Map.class);
- if (ObjectUtils.isNotEmpty(map.get("schema"))) {
- sql = sql.replaceAll(SqlPlaceholderConstants.KEYWORD_PREFIX_REGEX + datasourceSchemaDTO.getSchemaAlias() + SqlPlaceholderConstants.KEYWORD_SUFFIX_REGEX, map.get("schema").toString());
+ if (!datasourceRequest.getIsCross()) {
+ if (ObjectUtils.isNotEmpty(map.get("schema"))) {
+ sql = sql.replaceAll(SqlPlaceholderConstants.KEYWORD_PREFIX_REGEX + datasourceSchemaDTO.getSchemaAlias() + SqlPlaceholderConstants.KEYWORD_SUFFIX_REGEX, String.format(format, map.get("schema").toString()) );
+ } else {
+ sql = sql.replaceAll(SqlPlaceholderConstants.KEYWORD_PREFIX_REGEX + datasourceSchemaDTO.getSchemaAlias() + SqlPlaceholderConstants.KEYWORD_SUFFIX_REGEX + "\\.", "");
+ }
+ sql = provider.transSqlDialect(sql, datasourceRequest.getDsList());
} else {
sql = sql.replaceAll(SqlPlaceholderConstants.KEYWORD_PREFIX_REGEX + datasourceSchemaDTO.getSchemaAlias() + SqlPlaceholderConstants.KEYWORD_SUFFIX_REGEX + "\\.", "");
+ String tableSchema = datasetSQLManage.putObj2Map(datasourceRequest.getDsList(), datasetTableDTO, datasourceRequest.getIsCross());
+ sql = SqlUtils.addSchema(sql, tableSchema);
}
- sql = provider.transSqlDialect(sql, datasourceRequest.getDsList());
} else {
// parser sql params and replace default value
String s = new String(Base64.getDecoder().decode(tableInfoDTO.getSql()));
- String originSql = new SqlparserUtils().handleVariableDefaultValue(s, datasetTableDTO.getSqlVariableDetails(), false, false, null, false, datasourceRequest.getDsList(), pluginManage);
+ String originSql = new SqlparserUtils().handleVariableDefaultValue(s, datasetTableDTO.getSqlVariableDetails(), true, false, null, datasourceRequest.getIsCross(), datasourceRequest.getDsList(), pluginManage, getUserEntity());
originSql = provider.replaceComment(originSql);
// add sql table schema
- sql = SQLUtils.buildOriginPreviewSql(SqlPlaceholderConstants.TABLE_PLACEHOLDER, 0, 0);
- sql = provider.transSqlDialect(sql, datasourceRequest.getDsList());
- // replace placeholder
- sql = provider.replaceTablePlaceHolder(sql, originSql);
+ if (!datasourceRequest.getIsCross()) {
+ sql = SQLUtils.buildOriginPreviewSql(SqlPlaceholderConstants.TABLE_PLACEHOLDER, 0, 0);
+ sql = provider.transSqlDialect(sql, datasourceRequest.getDsList());
+ // replace placeholder
+ sql = provider.replaceTablePlaceHolder(sql, originSql);
+ } else {
+ String tableSchema = datasetSQLManage.putObj2Map(datasourceRequest.getDsList(), datasetTableDTO, datasourceRequest.getIsCross());
+ sql = SqlUtils.addSchema(originSql, tableSchema);
+ }
}
datasourceRequest.setQuery(sql.replaceAll("\r\n", " ")
.replaceAll("\n", " "));
@@ -189,7 +210,11 @@ public class DatasetDataManage {
}).collect(Collectors.toList());
}
- public Map previewDataWithLimit(DatasetGroupInfoDTO datasetGroupInfoDTO, Integer start, Integer count, boolean checkPermission) throws Exception {
+ public Map