Merge pull request #11945 from dataease/pr@dev-v2@perf_threshold_view

perf(X-Pack): 阈值告警-兼容流向地图、热力图

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;
 }

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}

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<Long> chartIdList) {}
+    public void disuse(List<Long> chartIdList) {
+    }
 
     @Transactional
     public void deleteBySceneId(Long sceneId, List<Long> 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<List<ChartViewFieldDTO>> tokenType = new TypeReference<>() {};
+        TypeReference<List<ChartViewFieldDTO>> 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;
     }
 

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<ChartViewFieldDTO> extLabel = details.getExtLabel();
+        if (CollectionUtils.isNotEmpty(extLabel)) {
+            result.addAll(extLabel);
+        }
+        List<ChartViewFieldDTO> extTooltip = details.getExtTooltip();
+        if (CollectionUtils.isNotEmpty(extTooltip)) {
+            result.addAll(extTooltip);
+        }
+        List<ChartViewFieldDTO> extColor = details.getExtColor();
+        if (CollectionUtils.isNotEmpty(extColor)) {
+            result.addAll(extColor);
+        }
+        List<ChartViewFieldDTO> flowMapStartName = details.getFlowMapStartName();
+        if (CollectionUtils.isNotEmpty(flowMapStartName)) {
+            result.addAll(flowMapStartName);
+        }
+        List<ChartViewFieldDTO> flowMapEndName = details.getFlowMapEndName();
+        if (CollectionUtils.isNotEmpty(flowMapEndName)) {
+            result.addAll(flowMapEndName);
+        }
         return result;
     }
 

de-xpack

@@ -1 +1 @@
-Subproject commit 79f4a54d4c15b7eeabb8286793f9268ec29805ac
+Subproject commit 2e0b320c998bdb2ba7962de4c73d11f69b34735c

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<ChartViewFieldDTO> extBubble;
 
+    private List<ChartViewFieldDTO> flowMapStartName;
+
+    private List<ChartViewFieldDTO> flowMapEndName;
+
+    private List<ChartViewFieldDTO> extColor;
+
+    private List<ChartViewFieldDTO> extLabel;
+
+    private List<ChartViewFieldDTO> extTooltip;
+
 }