forked from github/dataease
feat: 计算字段支持自定义参数
This commit is contained in:
parent
9685eaec18
commit
ec006caa4a
@ -10,6 +10,7 @@ import io.dataease.chart.dao.auto.mapper.CoreChartViewMapper;
|
|||||||
import io.dataease.chart.dao.ext.mapper.ExtChartViewMapper;
|
import io.dataease.chart.dao.ext.mapper.ExtChartViewMapper;
|
||||||
import io.dataease.dataset.dao.auto.entity.CoreDatasetTableField;
|
import io.dataease.dataset.dao.auto.entity.CoreDatasetTableField;
|
||||||
import io.dataease.dataset.dao.auto.mapper.CoreDatasetTableFieldMapper;
|
import io.dataease.dataset.dao.auto.mapper.CoreDatasetTableFieldMapper;
|
||||||
|
import io.dataease.dataset.manage.DatasetTableFieldManage;
|
||||||
import io.dataease.dataset.manage.PermissionManage;
|
import io.dataease.dataset.manage.PermissionManage;
|
||||||
import io.dataease.dataset.utils.TableUtils;
|
import io.dataease.dataset.utils.TableUtils;
|
||||||
import io.dataease.engine.constant.ExtFieldConstant;
|
import io.dataease.engine.constant.ExtFieldConstant;
|
||||||
@ -57,6 +58,9 @@ public class ChartViewManege {
|
|||||||
@Resource
|
@Resource
|
||||||
private ExtChartViewMapper extChartViewMapper;
|
private ExtChartViewMapper extChartViewMapper;
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private DatasetTableFieldManage datasetTableFieldManage;
|
||||||
|
|
||||||
private ObjectMapper objectMapper = new ObjectMapper();
|
private ObjectMapper objectMapper = new ObjectMapper();
|
||||||
|
|
||||||
@Transactional
|
@Transactional
|
||||||
@ -111,7 +115,14 @@ public class ChartViewManege {
|
|||||||
public List<ChartViewDTO> listBySceneId(Long sceneId) {
|
public List<ChartViewDTO> listBySceneId(Long sceneId) {
|
||||||
QueryWrapper<CoreChartView> wrapper = new QueryWrapper<>();
|
QueryWrapper<CoreChartView> wrapper = new QueryWrapper<>();
|
||||||
wrapper.eq("scene_id", sceneId);
|
wrapper.eq("scene_id", sceneId);
|
||||||
return transChart(coreChartViewMapper.selectList(wrapper));
|
List<ChartViewDTO> chartViewDTOS = transChart(coreChartViewMapper.selectList(wrapper));
|
||||||
|
for (ChartViewDTO dto : chartViewDTOS) {
|
||||||
|
QueryWrapper<CoreDatasetTableField> wp = new QueryWrapper<>();
|
||||||
|
wp.eq("dataset_group_id", dto.getTableId());
|
||||||
|
List<CoreDatasetTableField> coreDatasetTableFields = coreDatasetTableFieldMapper.selectList(wp);
|
||||||
|
dto.setCalParams(Utils.getParams(datasetTableFieldManage.transDTO(coreDatasetTableFields)));
|
||||||
|
}
|
||||||
|
return chartViewDTOS;
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<ChartViewDTO> transChart(List<CoreChartView> list) {
|
public List<ChartViewDTO> transChart(List<CoreChartView> list) {
|
||||||
|
Loading…
Reference in New Issue
Block a user