diff --git a/core/core-backend/src/main/java/io/dataease/chart/dao/ext/entity/ChartBasePO.java b/core/core-backend/src/main/java/io/dataease/chart/dao/ext/entity/ChartBasePO.java index a52783c44f..d490d876ed 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/dao/ext/entity/ChartBasePO.java +++ b/core/core-backend/src/main/java/io/dataease/chart/dao/ext/entity/ChartBasePO.java @@ -40,4 +40,14 @@ public class ChartBasePO implements Serializable { private String extBubble; + + private String flowMapStartName; + + private String flowMapEndName; + + private String extColor; + + private String extLabel; + + private String extTooltip; } diff --git a/core/core-backend/src/main/java/io/dataease/chart/dao/ext/mapper/ExtChartViewMapper.java b/core/core-backend/src/main/java/io/dataease/chart/dao/ext/mapper/ExtChartViewMapper.java index c6923370fc..8580789b3d 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/dao/ext/mapper/ExtChartViewMapper.java +++ b/core/core-backend/src/main/java/io/dataease/chart/dao/ext/mapper/ExtChartViewMapper.java @@ -30,7 +30,12 @@ public interface ExtChartViewMapper { ccv.y_axis, ccv.y_axis_ext, ccv.ext_stack, - ccv.ext_bubble + 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} diff --git a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java index 7fe8b9576f..fe002fae08 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java +++ b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java @@ -100,7 +100,8 @@ public class ChartViewManege { } @XpackInteract(value = "chartViewManage") - public void disuse(List chartIdList) {} + public void disuse(List chartIdList) { + } @Transactional public void deleteBySceneId(Long sceneId, List chartIds) { @@ -258,13 +259,23 @@ public class ChartViewManege { ChartBasePO po = extChartViewMapper.queryChart(id); if (ObjectUtils.isEmpty(po)) return null; ChartBaseVO vo = BeanUtils.copyBean(new ChartBaseVO(), po); - TypeReference> tokenType = new TypeReference<>() {}; + TypeReference> tokenType = new TypeReference<>() { + }; vo.setXAxis(JsonUtil.parseList(po.getXAxis(), tokenType)); vo.setXAxisExt(JsonUtil.parseList(po.getXAxisExt(), tokenType)); vo.setYAxis(JsonUtil.parseList(po.getYAxis(), tokenType)); vo.setYAxisExt(JsonUtil.parseList(po.getYAxisExt(), tokenType)); vo.setExtStack(JsonUtil.parseList(po.getExtStack(), tokenType)); vo.setExtBubble(JsonUtil.parseList(po.getExtBubble(), tokenType)); + vo.setFlowMapStartName(JsonUtil.parseList(po.getFlowMapStartName(), tokenType)); + vo.setFlowMapEndName(JsonUtil.parseList(po.getFlowMapEndName(), tokenType)); + if (StringUtils.isBlank(po.getExtColor()) || StringUtils.equals("null", po.getExtColor())) { + vo.setExtColor(new ArrayList<>()); + } else { + vo.setExtColor(JsonUtil.parseList(po.getExtColor(), tokenType)); + } + vo.setExtLabel(JsonUtil.parseList(po.getExtLabel(), tokenType)); + vo.setExtTooltip(JsonUtil.parseList(po.getExtTooltip(), tokenType)); return vo; } diff --git a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewThresholdManage.java b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewThresholdManage.java index d4a2f4d262..b2f55056a5 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewThresholdManage.java +++ b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewThresholdManage.java @@ -67,6 +67,26 @@ public class ChartViewThresholdManage { if (CollectionUtils.isNotEmpty(extBubble)) { result.addAll(extBubble); } + List extLabel = details.getExtLabel(); + if (CollectionUtils.isNotEmpty(extLabel)) { + result.addAll(extLabel); + } + List extTooltip = details.getExtTooltip(); + if (CollectionUtils.isNotEmpty(extTooltip)) { + result.addAll(extTooltip); + } + List extColor = details.getExtColor(); + if (CollectionUtils.isNotEmpty(extColor)) { + result.addAll(extColor); + } + List flowMapStartName = details.getFlowMapStartName(); + if (CollectionUtils.isNotEmpty(flowMapStartName)) { + result.addAll(flowMapStartName); + } + List flowMapEndName = details.getFlowMapEndName(); + if (CollectionUtils.isNotEmpty(flowMapEndName)) { + result.addAll(flowMapEndName); + } return result; } diff --git a/de-xpack b/de-xpack index 79f4a54d4c..2e0b320c99 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 79f4a54d4c15b7eeabb8286793f9268ec29805ac +Subproject commit 2e0b320c998bdb2ba7962de4c73d11f69b34735c diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/vo/ChartBaseVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/chart/vo/ChartBaseVO.java index 3e89697e05..ac881be32a 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/vo/ChartBaseVO.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/chart/vo/ChartBaseVO.java @@ -63,4 +63,14 @@ public class ChartBaseVO implements Serializable { */ private List extBubble; + private List flowMapStartName; + + private List flowMapEndName; + + private List extColor; + + private List extLabel; + + private List extTooltip; + }