From 8c2525ce6adca254f2bc1e041a64500fb4ba5330 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 13 Aug 2024 18:18:17 +0800 Subject: [PATCH] =?UTF-8?q?perf(X-Pack):=20=E9=98=88=E5=80=BC=E5=91=8A?= =?UTF-8?q?=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/ext/mapper/ExtChartViewMapper.java | 16 ++++++++++ .../chart/manage/ChartViewManege.java | 5 +++ .../chart/server/ChartViewServer.java | 6 ++++ .../src/components/icon-custom/src/Icon.vue | 4 ++- .../visualization/ComponentEditBar.vue | 2 +- .../io/dataease/api/chart/ChartViewApi.java | 4 +++ .../io/dataease/api/chart/vo/ChartBaseVO.java | 31 +++++++++++++++++++ .../dataease/api/threshold/ThresholdApi.java | 5 +++ .../api/threshold/dto/ThresholdCreator.java | 6 ++-- .../threshold/dto/ThresholdGridRequest.java | 2 ++ 10 files changed, 75 insertions(+), 6 deletions(-) create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/chart/vo/ChartBaseVO.java 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 b0db442ac7..e64704efa4 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 @@ -1,5 +1,6 @@ package io.dataease.chart.dao.ext.mapper; +import io.dataease.api.chart.vo.ChartBaseVO; import io.dataease.api.chart.vo.ViewSelectorVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -14,4 +15,19 @@ public interface ExtChartViewMapper { select id, scene_id as pid, title, type from core_chart_view where type != 'VQuery' and scene_id = #{resourceId} """) List queryViewOption(@Param("resourceId") Long resourceId); + + @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 + from core_chart_view ccv + left join data_visualization_info dvi on dvi.id = ccv.scene_id + where ccv.id = #{id} + """) + ChartBaseVO queryChart(@Param("id") Long 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 b5768b8cf6..ff50bd340e 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 @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; +import io.dataease.api.chart.vo.ChartBaseVO; import io.dataease.api.chart.vo.ViewSelectorVO; import io.dataease.chart.dao.auto.entity.CoreChartView; import io.dataease.chart.dao.auto.mapper.CoreChartViewMapper; @@ -244,6 +245,10 @@ public class ChartViewManege { coreDatasetTableFieldMapper.delete(queryWrapper); } + public ChartBaseVO chartBaseInfo(Long id) { + return extChartViewMapper.queryChart(id); + } + public DatasetTableFieldDTO createCountField(Long id) { DatasetTableFieldDTO dto = new DatasetTableFieldDTO(); dto.setId(-1L); diff --git a/core/core-backend/src/main/java/io/dataease/chart/server/ChartViewServer.java b/core/core-backend/src/main/java/io/dataease/chart/server/ChartViewServer.java index ecfb167754..12f06f4794 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/server/ChartViewServer.java +++ b/core/core-backend/src/main/java/io/dataease/chart/server/ChartViewServer.java @@ -1,6 +1,7 @@ package io.dataease.chart.server; import io.dataease.api.chart.ChartViewApi; +import io.dataease.api.chart.vo.ChartBaseVO; import io.dataease.extensions.view.dto.ChartViewDTO; import io.dataease.extensions.view.dto.ChartViewFieldDTO; import io.dataease.api.chart.vo.ViewSelectorVO; @@ -72,4 +73,9 @@ public class ChartViewServer implements ChartViewApi { public void deleteFieldByChart(Long chartId) { chartViewManege.deleteFieldByChartId(chartId); } + + @Override + public ChartBaseVO chartBaseInfo(Long id) { + return chartViewManege.chartBaseInfo(id); + } } diff --git a/core/core-frontend/src/components/icon-custom/src/Icon.vue b/core/core-frontend/src/components/icon-custom/src/Icon.vue index c7deac92e6..e079846a2d 100644 --- a/core/core-frontend/src/components/icon-custom/src/Icon.vue +++ b/core/core-frontend/src/components/icon-custom/src/Icon.vue @@ -9,6 +9,7 @@ import _403 from '@/assets/svg/403.svg' import APIDs from '@/assets/svg/API-ds.svg' import Apache_Hive from '@/assets/svg/Apache Hive.svg' import Checkbox from '@/assets/svg/Checkbox.svg' +import clock from '@/assets/svg/clock.svg' import DM from '@/assets/svg/DM.svg' import DataEase from '@/assets/svg/DataEase.svg' import Elasticsearch from '@/assets/svg/Elasticsearch.svg' @@ -1340,7 +1341,8 @@ const iconMap = { 'word-cloud': wordCloud, calculate, 'icon_file-doc_colorful': icon_file_doc_colorful, - icon_font + icon_font, + clock } const props = defineProps({ diff --git a/core/core-frontend/src/components/visualization/ComponentEditBar.vue b/core/core-frontend/src/components/visualization/ComponentEditBar.vue index daea31495f..d8916ca2e0 100644 --- a/core/core-frontend/src/components/visualization/ComponentEditBar.vue +++ b/core/core-frontend/src/components/visualization/ComponentEditBar.vue @@ -143,7 +143,7 @@ pager(@PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize, @RequestBody ThresholdGridRequest request); + @Operation(summary = "查询表单") + @GetMapping("/formInfo/{id}") + ThresholdCreator formInfo(@PathVariable("id") Long id); + @Operation(summary = "切换可用") @PostMapping("/switch") void switchEnable(@RequestBody ThresholdSwitchRequest request); diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/threshold/dto/ThresholdCreator.java b/sdk/api/api-base/src/main/java/io/dataease/api/threshold/dto/ThresholdCreator.java index 852656c7a9..5dcd5aae91 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/threshold/dto/ThresholdCreator.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/threshold/dto/ThresholdCreator.java @@ -20,9 +20,7 @@ public class ThresholdCreator extends BaseReciDTO implements Serializable { private Integer rateType = 1; - private Integer rateValue = 1; - - private Long rateTime; + private String rateValue; private Long resourceId; @@ -40,5 +38,5 @@ public class ThresholdCreator extends BaseReciDTO implements Serializable { private String msgContent; - private Boolean repeat = true; + private Boolean repeatSend = true; } diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/threshold/dto/ThresholdGridRequest.java b/sdk/api/api-base/src/main/java/io/dataease/api/threshold/dto/ThresholdGridRequest.java index 1ff98bab2e..baaae96f23 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/threshold/dto/ThresholdGridRequest.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/threshold/dto/ThresholdGridRequest.java @@ -21,4 +21,6 @@ public class ThresholdGridRequest implements Serializable { private List timeList; + private Long chartId; + }