From 0f1b93d53d11880e91aa311aca1706d9cfe402ca Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Thu, 11 Apr 2024 19:29:05 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E5=B7=A5=E4=BD=9C=E5=8F=B0):=20?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=A2=9E=E5=8A=A0=E8=B5=84=E6=BA=90=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7=E7=AD=89=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/auto/entity/VisualizationTemplate.java | 16 +++++++++++++++- .../auto/mapper/VisualizationTemplateMapper.java | 2 +- .../server/DataVisualizationServer.java | 5 ++++- .../src/main/resources/db/desktop/V2.6__ddl.sql | 6 +++++- .../main/resources/db/migration/V2.6__ddl.sql | 6 +++++- core/core-frontend/src/utils/imgUtils.ts | 1 + .../api/template/vo/VisualizationTemplateVO.java | 5 +++++ .../visualization/vo/DataVisualizationVO.java | 4 +++- 8 files changed, 39 insertions(+), 6 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/template/dao/auto/entity/VisualizationTemplate.java b/core/core-backend/src/main/java/io/dataease/template/dao/auto/entity/VisualizationTemplate.java index 122d0d7989..b2922f8f97 100644 --- a/core/core-backend/src/main/java/io/dataease/template/dao/auto/entity/VisualizationTemplate.java +++ b/core/core-backend/src/main/java/io/dataease/template/dao/auto/entity/VisualizationTemplate.java @@ -9,7 +9,7 @@ import java.io.Serializable; *

* * @author fit2cloud - * @since 2024-01-16 + * @since 2024-04-11 */ @TableName("visualization_template") public class VisualizationTemplate implements Serializable { @@ -86,6 +86,11 @@ public class VisualizationTemplate implements Serializable { */ private Integer useCount; + /** + * 使用仪表板的版本 + */ + private Integer version; + public String getId() { return id; } @@ -198,6 +203,14 @@ public class VisualizationTemplate implements Serializable { this.useCount = useCount; } + public Integer getVersion() { + return version; + } + + public void setVersion(Integer version) { + this.version = version; + } + @Override public String toString() { return "VisualizationTemplate{" + @@ -215,6 +228,7 @@ public class VisualizationTemplate implements Serializable { ", templateData = " + templateData + ", dynamicData = " + dynamicData + ", useCount = " + useCount + + ", version = " + version + "}"; } } diff --git a/core/core-backend/src/main/java/io/dataease/template/dao/auto/mapper/VisualizationTemplateMapper.java b/core/core-backend/src/main/java/io/dataease/template/dao/auto/mapper/VisualizationTemplateMapper.java index 73bfdaff84..92903d6dc5 100644 --- a/core/core-backend/src/main/java/io/dataease/template/dao/auto/mapper/VisualizationTemplateMapper.java +++ b/core/core-backend/src/main/java/io/dataease/template/dao/auto/mapper/VisualizationTemplateMapper.java @@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper; *

* * @author fit2cloud - * @since 2024-01-16 + * @since 2024-04-11 */ @Mapper public interface VisualizationTemplateMapper extends BaseMapper { diff --git a/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java b/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java index a9ac3b277a..1cdf69a02a 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java @@ -282,6 +282,7 @@ public class DataVisualizationServer implements DataVisualizationApi { String staticResource = null; String name = null; String dvType = null; + Integer version = null; //内部模板新建 if (DataVisualizationConstants.NEW_PANEL_FROM.NEW_INNER_TEMPLATE.equals(newFrom)) { VisualizationTemplate visualizationTemplate = templateMapper.selectById(request.getTemplateId()); @@ -290,6 +291,7 @@ public class DataVisualizationServer implements DataVisualizationApi { dynamicData = visualizationTemplate.getDynamicData(); name = visualizationTemplate.getName(); dvType = visualizationTemplate.getDvType(); + version = visualizationTemplate.getVersion(); // 模板市场记录 coreOptRecentManage.saveOpt(request.getTemplateId(), OptConstants.OPT_RESOURCE_TYPE.TEMPLATE, OptConstants.OPT_TYPE.NEW); VisualizationTemplate visualizationTemplateUpdate = new VisualizationTemplate(); @@ -314,6 +316,7 @@ public class DataVisualizationServer implements DataVisualizationApi { staticResource = templateFileInfo.getStaticResource(); name = templateFileInfo.getName(); dvType = templateFileInfo.getDvType(); + version = templateFileInfo.getVersion(); // 模板市场记录 coreOptRecentManage.saveOpt(request.getResourceName(), OptConstants.OPT_RESOURCE_TYPE.TEMPLATE, OptConstants.OPT_TYPE.NEW); } @@ -347,7 +350,7 @@ public class DataVisualizationServer implements DataVisualizationApi { request.setCanvasStyleData(templateStyle); //Store static resource into the server staticResourceServer.saveFilesToServe(staticResource); - return new DataVisualizationVO(newDvId, name, dvType, templateStyle, templateData, canvasViewInfo, null); + return new DataVisualizationVO(newDvId, name, dvType,version, templateStyle, templateData, canvasViewInfo, null); } @Override diff --git a/core/core-backend/src/main/resources/db/desktop/V2.6__ddl.sql b/core/core-backend/src/main/resources/db/desktop/V2.6__ddl.sql index f0e29ec925..939728e750 100644 --- a/core/core-backend/src/main/resources/db/desktop/V2.6__ddl.sql +++ b/core/core-backend/src/main/resources/db/desktop/V2.6__ddl.sql @@ -3,4 +3,8 @@ ALTER TABLE `xpack_share` ALTER TABLE `data_visualization_info` ADD COLUMN `version` int NULL DEFAULT 3 COMMENT '可视化资源版本'; -update data_visualization_info set version = 2; \ No newline at end of file +update data_visualization_info set version = 2; + +ALTER TABLE `visualization_template` + ADD COLUMN `version` int NULL DEFAULT 3 COMMENT '使用资源的版本'; +update visualization_template set version = 2; diff --git a/core/core-backend/src/main/resources/db/migration/V2.6__ddl.sql b/core/core-backend/src/main/resources/db/migration/V2.6__ddl.sql index 5f185d4146..e86ca1fa80 100644 --- a/core/core-backend/src/main/resources/db/migration/V2.6__ddl.sql +++ b/core/core-backend/src/main/resources/db/migration/V2.6__ddl.sql @@ -3,4 +3,8 @@ ALTER TABLE `xpack_share` ALTER TABLE `data_visualization_info` ADD COLUMN `version` int NULL DEFAULT 3 COMMENT '可视化资源版本'; -update data_visualization_info set version = 2; \ No newline at end of file +update data_visualization_info set version = 2; + +ALTER TABLE `visualization_template` + ADD COLUMN `version` int NULL DEFAULT 3 COMMENT '使用资源的版本'; +update visualization_template set version = 2; \ No newline at end of file diff --git a/core/core-frontend/src/utils/imgUtils.ts b/core/core-frontend/src/utils/imgUtils.ts index 25262d3a0d..ec043569a9 100644 --- a/core/core-frontend/src/utils/imgUtils.ts +++ b/core/core-frontend/src/utils/imgUtils.ts @@ -49,6 +49,7 @@ export function download2AppTemplate(downloadType, canvasDom, name, callBack?) { templateType: 'self', snapshot: snapshot, dvType: dvInfo.value.type, + version: 3, canvasStyleData: JSON.stringify(canvasStyleData.value), componentData: JSON.stringify(componentData.value), dynamicData: JSON.stringify(canvasViewDataTemplate), diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/VisualizationTemplateVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/VisualizationTemplateVO.java index f560f3f9f0..a3137fc205 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/VisualizationTemplateVO.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/VisualizationTemplateVO.java @@ -81,6 +81,11 @@ public class VisualizationTemplateVO { */ private Integer useCount; + /** + * 版本号 + */ + private Integer version; + /** * 分类 */ diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/DataVisualizationVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/DataVisualizationVO.java index 8563b9c41e..96b3aa606d 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/DataVisualizationVO.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/DataVisualizationVO.java @@ -158,7 +158,8 @@ public class DataVisualizationVO implements Serializable { */ private VisualizationWatermarkVO watermarkInfo; - public DataVisualizationVO(Long id, String name, String type, String canvasStyleData, String componentData, Map canvasViewInfo, Map extendDataInfo) { + + public DataVisualizationVO(Long id, String name, String type,Integer version, String canvasStyleData, String componentData, Map canvasViewInfo, Map extendDataInfo) { this.id = id; this.name = name; this.type = type; @@ -166,5 +167,6 @@ public class DataVisualizationVO implements Serializable { this.componentData = componentData; this.canvasViewInfo = canvasViewInfo; this.extendDataInfo = extendDataInfo; + this.version = version; } }