center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #7286 from dataease/pr@dev@feat_merge

Browse Source 
feat: 视图过滤器历史数据兼容
This commit is contained in:
Junjun 2023-12-22 12:04:30 +08:00 committed by GitHub
commit edd34c6874
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
View File

@ -34,6 +34,7 @@ import io.dataease.plugins.common.constants.DatasetType;
import io.dataease.plugins.common.constants.DatasourceTypes;
import io.dataease.plugins.common.constants.datasource.SQLConstants;
import io.dataease.plugins.common.dto.chart.ChartFieldCompareDTO;
import io.dataease.plugins.common.dto.chart.ChartFieldCustomFilterDTO;
import io.dataease.plugins.common.dto.chart.ChartViewFieldDTO;
import io.dataease.plugins.common.dto.dataset.SqlVariableDetails;
import io.dataease.plugins.common.exception.DataEaseException;
@ -57,7 +58,6 @@ import io.dataease.service.datasource.DatasourceService;
import io.dataease.service.engine.EngineService;
import io.dataease.service.panel.PanelGroupExtendDataService;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.ListUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.pentaho.di.core.util.UUIDUtil;
@ -124,6 +124,8 @@ public class ChartViewService {
private DatasetTableFieldMapper datasetTableFieldMapper;
@Resource
private ChartFilterTreeService chartFilterTreeService;
@Resource
private ChartViewOldDataMergeService chartViewOldDataMergeService;
private static final Logger logger = LoggerFactory.getLogger(ChartViewService.class);
@ -285,6 +287,9 @@ public class ChartViewService {
if (result == null) {
DataEaseException.throwException(Translator.get("i18n_chart_delete"));
}
// trans chart filter
tranChartFilter(result);
DatasetTable datasetTable = dataSetTableService.get(result.getTableId());
if (ObjectUtils.isNotEmpty(datasetTable)) {
result.setDatasetMode(datasetTable.getMode());
@ -2339,4 +2344,26 @@ public class ChartViewService {
}
return list;
}
public void tranChartFilter(ChartViewDTO view) {
Type filterTokenType = new TypeToken<List<ChartFieldCustomFilterDTO>>() {
}.getType();
List<ChartFieldCustomFilterDTO> fieldCustomFilter;
// 尝试将历史数据转成list，如果转换出现异常，则忽略该视图继续执行下一个
try {
fieldCustomFilter = gson.fromJson(view.getCustomFilter(), filterTokenType);
} catch (Exception e) {
return;
}
if (CollectionUtils.isEmpty(fieldCustomFilter)) {
// 将 '[]' 转换成 '{}'
view.setCustomFilter("{}");
} else {
// array -> tree
FilterTreeObj tree = chartViewOldDataMergeService.transArr2Obj(fieldCustomFilter);
view.setCustomFilter(gson.toJson(tree));
}
}
}