From e93a07743a6a6c1460f9364477026ce636abeff1 Mon Sep 17 00:00:00 2001 From: "hong.yang" Date: Fri, 22 Sep 2023 10:19:48 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=96=B0=E5=A2=9E=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3=EF=BC=9B?= =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E3=80=81=E7=BB=84=E4=BB=B6=E5=A4=8D=E5=88=B6?= =?UTF-8?q?=E6=97=B6=E5=90=8C=E6=97=B6=E5=A4=8D=E5=88=B6=E5=B0=81=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 新增组件模拟数据接口;大屏、组件复制时同时复制封面 --- .../service/impl/BizComponentServiceImpl.java | 39 ++++++++++++++++++- .../chart/controller/ChartDataController.java | 15 ++++--- .../service/impl/DataRoomPageServiceImpl.java | 37 ++++++++++++++++++ 3 files changed, 85 insertions(+), 6 deletions(-) diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/biz/component/service/impl/BizComponentServiceImpl.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/biz/component/service/impl/BizComponentServiceImpl.java index 6d870091..2f4294a8 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/biz/component/service/impl/BizComponentServiceImpl.java +++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/biz/component/service/impl/BizComponentServiceImpl.java @@ -11,6 +11,7 @@ import com.gccloud.dataroom.core.utils.CodeGenerateUtils; import com.gccloud.common.exception.GlobalException; import com.gccloud.common.vo.PageVO; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.exception.ExceptionUtils; import org.springframework.stereotype.Service; @@ -165,7 +166,7 @@ public class BizComponentServiceImpl extends ServiceImpl getChartData(@RequestBody ChartDataSearchDTO chartDataSearchDTO) { PageEntity pageEntity = pageService.getByCode(chartDataSearchDTO.getPageCode()); AssertUtils.isTrue(pageEntity != null, "页面不存在"); @@ -70,6 +67,14 @@ public class ChartDataController { return getChartData(chartDataSearchDTO, config, chart); } + @GetMapping("/mock/{type}") + @ApiOperation(value = "图表模拟数据", position = 30, notes = "获取指定类型的图表模拟数据", produces = MediaType.APPLICATION_JSON_VALUE) + public R getMockData(@PathVariable String type) { + ChartDataVO mockData = ChartMockData.getMockData(type); + return R.success(mockData); + } + + /** * 获取图表数据 * @param chartDataSearchDTO diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/manage/service/impl/DataRoomPageServiceImpl.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/manage/service/impl/DataRoomPageServiceImpl.java index e2b2385d..6f46b870 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/manage/service/impl/DataRoomPageServiceImpl.java +++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/manage/service/impl/DataRoomPageServiceImpl.java @@ -25,6 +25,7 @@ import com.gccloud.common.vo.PageVO; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.exception.ExceptionUtils; import org.springframework.stereotype.Service; @@ -143,6 +144,35 @@ public class DataRoomPageServiceImpl extends ServiceImpl