From 5c091959267aba5d41e4272ca2eb2bbfd4587e6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=98=89=E8=B1=AA?= <42510293+ziyujiahao@users.noreply.github.com> Date: Wed, 17 Sep 2025 14:57:47 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BB=AA=E8=A1=A8=E6=9D=BF?= =?UTF-8?q?=E5=A4=96=E9=83=A8=E5=8F=82=E6=95=B0=E6=94=B9=E9=80=A0=20(#1701?= =?UTF-8?q?4)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...otVisualizationLinkJumpTargetViewInfo.java | 4 +- .../SnapshotVisualizationOuterParams.java | 8 ++-- .../SnapshotVisualizationOuterParamsInfo.java | 8 ++-- ...isualizationOuterParamsTargetViewInfo.java | 16 +++---- .../VisualizationLinkJumpTargetViewInfo.java | 4 +- .../auto/entity/VisualizationOuterParams.java | 8 ++-- .../entity/VisualizationOuterParamsInfo.java | 8 ++-- ...isualizationOuterParamsTargetViewInfo.java | 16 +++---- ...isualizationOuterParamsInfoRepository.java | 2 +- ...hotVisualizationOuterParamsRepository.java | 2 +- ...onOuterParamsTargetViewInfoRepository.java | 2 +- ...isualizationOuterParamsInfoRepository.java | 2 +- .../VisualizationOuterParamsRepository.java | 4 +- .../manage/CoreVisualizationManage.java | 32 +++++++------- .../server/VisualizationLinkJumpService.java | 2 +- .../VisualizationOuterParamsService.java | 42 +++++++++---------- .../VisualizationOuterParamsApi.java | 6 +-- .../vo/VisualizationOutParamsJumpVO.java | 5 ++- .../vo/VisualizationOuterParamsDsInfoVO.java | 5 ++- .../VisualizationOuterParamsFilterInfoVO.java | 8 +++- .../vo/VisualizationOuterParamsInfoVO.java | 8 +++- ...ualizationOuterParamsTargetViewInfoVO.java | 17 +++++--- .../vo/VisualizationOuterParamsVO.java | 17 +++++--- 23 files changed, 126 insertions(+), 100 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/SnapshotVisualizationLinkJumpTargetViewInfo.java b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/SnapshotVisualizationLinkJumpTargetViewInfo.java index 10d3d08e5a..c20d4f87a0 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/SnapshotVisualizationLinkJumpTargetViewInfo.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/SnapshotVisualizationLinkJumpTargetViewInfo.java @@ -31,12 +31,12 @@ public class SnapshotVisualizationLinkJumpTargetViewInfo { @Size(max = 50) @Comment("目标图表ID") @Column(name = "target_view_id", length = 50) - private String targetViewId; + private Long targetViewId; @Size(max = 50) @Comment("目标字段ID") @Column(name = "target_field_id", length = 50) - private String targetFieldId; + private Long targetFieldId; @Comment("复制来源") @Column(name = "copy_from") diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/SnapshotVisualizationOuterParams.java b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/SnapshotVisualizationOuterParams.java index 925627e89f..ef544f5282 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/SnapshotVisualizationOuterParams.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/SnapshotVisualizationOuterParams.java @@ -17,13 +17,13 @@ public class SnapshotVisualizationOuterParams { @Id @Size(max = 50) @Comment("主键") - @Column(name = "params_id", nullable = false, length = 50) - private String paramsId; + @Column(name = "params_id", nullable = false) + private Long paramsId; @Size(max = 50) @Comment("可视化资源ID") - @Column(name = "visualization_id", length = 50) - private String visualizationId; + @Column(name = "visualization_id") + private Long visualizationId; @Comment("是否启用外部参数标识（1-是，0-否）") @Column(name = "checked") diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/SnapshotVisualizationOuterParamsInfo.java b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/SnapshotVisualizationOuterParamsInfo.java index 3500aaefe4..cf58d745f9 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/SnapshotVisualizationOuterParamsInfo.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/SnapshotVisualizationOuterParamsInfo.java @@ -18,13 +18,13 @@ public class SnapshotVisualizationOuterParamsInfo { @Id @Size(max = 50) @Comment("主键") - @Column(name = "params_info_id", nullable = false, length = 50) - private String paramsInfoId; + @Column(name = "params_info_id", nullable = false) + private Long paramsInfoId; @Size(max = 50) @Comment("visualization_outer_params 表的 ID") - @Column(name = "params_id", length = 50) - private String paramsId; + @Column(name = "params_id") + private Long paramsId; @Size(max = 255) @Comment("参数名") diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/SnapshotVisualizationOuterParamsTargetViewInfo.java b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/SnapshotVisualizationOuterParamsTargetViewInfo.java index 17f866b192..57ed8e5097 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/SnapshotVisualizationOuterParamsTargetViewInfo.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/SnapshotVisualizationOuterParamsTargetViewInfo.java @@ -17,23 +17,23 @@ public class SnapshotVisualizationOuterParamsTargetViewInfo { @Id @Size(max = 50) @Comment("主键") - @Column(name = "target_id", nullable = false, length = 50) - private String targetId; + @Column(name = "target_id", nullable = false) + private Long targetId; @Size(max = 50) @Comment("visualization_outer_params_info 表的 ID") - @Column(name = "params_info_id", length = 50) - private String paramsInfoId; + @Column(name = "params_info_id") + private Long paramsInfoId; @Size(max = 50) @Comment("联动视图ID/联动过滤项ID") - @Column(name = "target_view_id", length = 50) - private String targetViewId; + @Column(name = "target_view_id") + private Long targetViewId; @Size(max = 50) @Comment("联动字段ID") - @Column(name = "target_field_id", length = 50) - private String targetFieldId; + @Column(name = "target_field_id") + private Long targetFieldId; @Size(max = 255) @Comment("复制来源") diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationLinkJumpTargetViewInfo.java b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationLinkJumpTargetViewInfo.java index d8c152ca1d..8e91f4b87c 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationLinkJumpTargetViewInfo.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationLinkJumpTargetViewInfo.java @@ -32,12 +32,12 @@ public class VisualizationLinkJumpTargetViewInfo { @Size(max = 50) @Comment("目标图表ID") @Column(name = "target_view_id", length = 50) - private String targetViewId; + private Long targetViewId; @Size(max = 50) @Comment("目标字段ID") @Column(name = "target_field_id", length = 50) - private String targetFieldId; + private Long targetFieldId; @Comment("复制来源") @Column(name = "copy_from") diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParams.java b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParams.java index 42d5095351..08e253a1e1 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParams.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParams.java @@ -18,13 +18,13 @@ public class VisualizationOuterParams { @Id @Size(max = 50) @Comment("主键") - @Column(name = "params_id", nullable = false, length = 50) - private String paramsId; + @Column(name = "params_id", nullable = false) + private Long paramsId; @Size(max = 50) @Comment("可视化资源ID") - @Column(name = "visualization_id", length = 50) - private String visualizationId; + @Column(name = "visualization_id") + private Long visualizationId; @Comment("是否启用外部参数标识（1-是，0-否）") @Column(name = "checked") diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParamsInfo.java b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParamsInfo.java index 95914465c1..10ac72e9d6 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParamsInfo.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParamsInfo.java @@ -16,13 +16,13 @@ public class VisualizationOuterParamsInfo { @Id @Size(max = 50) @Comment("主键") - @Column(name = "params_info_id", nullable = false, length = 50) - private String paramsInfoId; + @Column(name = "params_info_id", nullable = false) + private Long paramsInfoId; @Size(max = 50) @Comment("visualization_outer_params 表的 ID") - @Column(name = "params_id", length = 50) - private String paramsId; + @Column(name = "params_id") + private Long paramsId; @Size(max = 255) @Comment("参数名") diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParamsTargetViewInfo.java b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParamsTargetViewInfo.java index 5c5d1b63c6..16d30c5963 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParamsTargetViewInfo.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParamsTargetViewInfo.java @@ -18,23 +18,23 @@ public class VisualizationOuterParamsTargetViewInfo { @Id @Size(max = 50) @Comment("主键") - @Column(name = "target_id", nullable = false, length = 50) - private String targetId; + @Column(name = "target_id", nullable = false) + private Long targetId; @Size(max = 50) @Comment("visualization_outer_params_info 表的 ID") - @Column(name = "params_info_id", length = 50) - private String paramsInfoId; + @Column(name = "params_info_id") + private Long paramsInfoId; @Size(max = 50) @Comment("联动视图ID/联动过滤项ID") - @Column(name = "target_view_id", length = 50) - private String targetViewId; + @Column(name = "target_view_id") + private Long targetViewId; @Size(max = 50) @Comment("联动字段ID") - @Column(name = "target_field_id", length = 50) - private String targetFieldId; + @Column(name = "target_field_id") + private Long targetFieldId; @Size(max = 255) @Comment("复制来源") diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/SnapshotVisualizationOuterParamsInfoRepository.java b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/SnapshotVisualizationOuterParamsInfoRepository.java index f43ec5c264..50ba3b7240 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/SnapshotVisualizationOuterParamsInfoRepository.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/SnapshotVisualizationOuterParamsInfoRepository.java @@ -13,7 +13,7 @@ import java.util.List; public interface SnapshotVisualizationOuterParamsInfoRepository extends JpaRepository, JpaSpecificationExecutor { @Transactional - default void deleteByParamsIds(List paramsIds) { + default void deleteByParamsIds(List paramsIds) { Specification spec = (root, query, cb) -> cb.and(cb.in(root.get("paramsId")).value(paramsIds)); List entities = findAll(spec); diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/SnapshotVisualizationOuterParamsRepository.java b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/SnapshotVisualizationOuterParamsRepository.java index aef7a2dd37..fab12b66b2 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/SnapshotVisualizationOuterParamsRepository.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/SnapshotVisualizationOuterParamsRepository.java @@ -13,7 +13,7 @@ import java.util.List; public interface SnapshotVisualizationOuterParamsRepository extends JpaRepository, JpaSpecificationExecutor { @Transactional - default void deleteByVisualizationId(String visualizationId) { + default void deleteByVisualizationId(Long visualizationId) { Specification spec = (root, query, cb) -> cb.equal(root.get("visualizationId"), visualizationId); List list = findAll(spec); diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/SnapshotVisualizationOuterParamsTargetViewInfoRepository.java b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/SnapshotVisualizationOuterParamsTargetViewInfoRepository.java index d6d476700e..11bb45b724 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/SnapshotVisualizationOuterParamsTargetViewInfoRepository.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/SnapshotVisualizationOuterParamsTargetViewInfoRepository.java @@ -14,7 +14,7 @@ public interface SnapshotVisualizationOuterParamsTargetViewInfoRepository extend @Transactional - default void deleteByParamsInfoIds(List paramsInfoIds) { + default void deleteByParamsInfoIds(List paramsInfoIds) { Specification spec = (root, query, cb) -> cb.and(root.get("paramsInfoId").in(paramsInfoIds)); List entities = findAll(spec); diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationOuterParamsInfoRepository.java b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationOuterParamsInfoRepository.java index e847105703..6fd8190922 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationOuterParamsInfoRepository.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationOuterParamsInfoRepository.java @@ -13,7 +13,7 @@ public interface VisualizationOuterParamsInfoRepository extends JpaRepository paramsIds) { + default void deleteByParamsIds(List paramsIds) { Specification spec = (root, query, cb) -> cb.and(root.get("paramsId").in(paramsIds)); List entities = findAll(spec); diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationOuterParamsRepository.java b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationOuterParamsRepository.java index 250970e703..1ddb7110de 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationOuterParamsRepository.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationOuterParamsRepository.java @@ -12,10 +12,10 @@ import java.util.List; public interface VisualizationOuterParamsRepository extends JpaRepository, JpaSpecificationExecutor { - List findByVisualizationId(String visualizationId); + List findByVisualizationId(Long visualizationId); @Transactional - default void deleteByVisualizationId(String visualizationId) { + default void deleteByVisualizationId(Long visualizationId) { Specification spec = (root, query, cb) -> cb.equal(root.get("visualizationId"), visualizationId); List paramsList = findAll(spec); diff --git a/core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationManage.java b/core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationManage.java index 2c58bd3db7..de85b5b62f 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationManage.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationManage.java @@ -329,23 +329,23 @@ public class CoreVisualizationManage { QSnapshotVisualizationOuterParamsInfo snapshotVisualizationOuterParamsInfo = QSnapshotVisualizationOuterParamsInfo.snapshotVisualizationOuterParamsInfo; QSnapshotVisualizationOuterParams snapshotVisualizationOuterParams = QSnapshotVisualizationOuterParams.snapshotVisualizationOuterParams; QSnapshotVisualizationOuterParamsTargetViewInfo snapshotVisualizationOuterParamsTargetViewInfo = QSnapshotVisualizationOuterParamsTargetViewInfo.snapshotVisualizationOuterParamsTargetViewInfo; - List paramsInfoIds = queryFactory.select(snapshotVisualizationOuterParamsTargetViewInfo.targetId).from(snapshotVisualizationOuterParamsTargetViewInfo) + List paramsInfoIds = queryFactory.select(snapshotVisualizationOuterParamsTargetViewInfo.targetId).from(snapshotVisualizationOuterParamsTargetViewInfo) .innerJoin(snapshotVisualizationOuterParamsInfo).on(snapshotVisualizationOuterParamsTargetViewInfo.paramsInfoId.eq(snapshotVisualizationOuterParamsInfo.paramsInfoId)) .innerJoin(snapshotVisualizationOuterParams).on(snapshotVisualizationOuterParamsInfo.paramsId.eq(snapshotVisualizationOuterParams.paramsId)) - .where(snapshotVisualizationOuterParams.visualizationId.eq(dvId.toString())).fetch(); + .where(snapshotVisualizationOuterParams.visualizationId.eq(dvId)).fetch(); if (CollectionUtils.isNotEmpty(paramsInfoIds)) { snapshotVisualizationOuterParamsTargetViewInfoRepository.deleteByParamsInfoIds(paramsInfoIds); } - List paramsIds = queryFactory.select(snapshotVisualizationOuterParamsInfo.paramsId).from(snapshotVisualizationOuterParamsInfo) + List paramsIds = queryFactory.select(snapshotVisualizationOuterParamsInfo.paramsId).from(snapshotVisualizationOuterParamsInfo) .innerJoin(snapshotVisualizationOuterParams).on(snapshotVisualizationOuterParamsInfo.paramsId.eq(snapshotVisualizationOuterParams.paramsId)) - .where(snapshotVisualizationOuterParams.visualizationId.eq(dvId.toString())) + .where(snapshotVisualizationOuterParams.visualizationId.eq(dvId)) .fetch(); if (CollectionUtils.isNotEmpty(paramsIds)) { snapshotVisualizationOuterParamsInfoRepository.deleteByParamsIds(paramsIds); } - snapshotVisualizationOuterParamsRepository.deleteByVisualizationId(dvId.toString()); + snapshotVisualizationOuterParamsRepository.deleteByVisualizationId(dvId); //xpack 阈值告警 chartViewManege.removeThreshold(dvId, CommonConstants.RESOURCE_TABLE.SNAPSHOT); @@ -431,25 +431,25 @@ public class CoreVisualizationManage { QSnapshotVisualizationOuterParamsInfo snapshotVisualizationOuterParamsInfo = QSnapshotVisualizationOuterParamsInfo.snapshotVisualizationOuterParamsInfo; QSnapshotVisualizationOuterParams snapshotVisualizationOuterParams = QSnapshotVisualizationOuterParams.snapshotVisualizationOuterParams; - List paramsInfoIds = queryFactory.select(snapshotVisualizationOuterParamsTargetViewInfo.targetId) + List paramsInfoIds = queryFactory.select(snapshotVisualizationOuterParamsTargetViewInfo.targetId) .from(snapshotVisualizationOuterParamsTargetViewInfo) .innerJoin(snapshotVisualizationOuterParamsInfo).on(snapshotVisualizationOuterParamsTargetViewInfo.paramsInfoId.eq(snapshotVisualizationOuterParamsInfo.paramsInfoId)) .innerJoin(snapshotVisualizationOuterParams).on(snapshotVisualizationOuterParamsInfo.paramsId.eq(snapshotVisualizationOuterParams.paramsId)) - .where(snapshotVisualizationOuterParams.visualizationId.eq(dvId.toString())).fetch(); + .where(snapshotVisualizationOuterParams.visualizationId.eq(dvId)).fetch(); if (CollectionUtils.isNotEmpty(paramsInfoIds)) { snapshotVisualizationOuterParamsTargetViewInfoRepository.deleteByParamsInfoIds(paramsInfoIds); } QVisualizationOuterParamsInfo visualizationOuterParamsInfo = QVisualizationOuterParamsInfo.visualizationOuterParamsInfo; QVisualizationOuterParams visualizationOuterParams = QVisualizationOuterParams.visualizationOuterParams; - List paramsIds = queryFactory.select(visualizationOuterParamsInfo.paramsId).from(visualizationOuterParamsInfo) + List paramsIds = queryFactory.select(visualizationOuterParamsInfo.paramsId).from(visualizationOuterParamsInfo) .leftJoin(visualizationOuterParams).on(visualizationOuterParamsInfo.paramsId.eq(visualizationOuterParams.paramsId)) - .where(visualizationOuterParams.visualizationId.eq(dvId.toString())).fetch(); + .where(visualizationOuterParams.visualizationId.eq(dvId)).fetch(); if (CollectionUtils.isNotEmpty(paramsIds)) { visualizationOuterParamsInfoRepository.deleteByParamsIds(paramsIds); } - visualizationOuterParamsRepository.deleteByVisualizationId(dvId.toString()); + visualizationOuterParamsRepository.deleteByVisualizationId(dvId); //xpack 阈值告警 chartViewManege.removeThreshold(dvId, CommonConstants.RESOURCE_TABLE.CORE); } @@ -560,7 +560,7 @@ public class CoreVisualizationManage { )).from(visualizationOuterParamsTargetViewInfo) .leftJoin(visualizationOuterParamsInfo).on(visualizationOuterParamsTargetViewInfo.paramsInfoId.eq(visualizationOuterParamsInfo.paramsInfoId)) .leftJoin(visualizationOuterParams).on(visualizationOuterParams.paramsId.eq(visualizationOuterParamsInfo.paramsId)) - .where(visualizationOuterParams.visualizationId.eq(dvId.toString())).fetch().forEach(item -> { + .where(visualizationOuterParams.visualizationId.eq(dvId)).fetch().forEach(item -> { SnapshotVisualizationOuterParamsTargetViewInfo snapshotVisualizationOuterParamsTargetViewInfo = new SnapshotVisualizationOuterParamsTargetViewInfo(); BeanUtils.copyBean(snapshotVisualizationOuterParamsTargetViewInfo, item); snapshotVisualizationOuterParamsTargetViewInfoRepository.saveAndFlush(snapshotVisualizationOuterParamsTargetViewInfo); @@ -578,13 +578,13 @@ public class CoreVisualizationManage { visualizationOuterParamsInfo.enabledDefault )).from(visualizationOuterParamsInfo) .leftJoin(visualizationOuterParams).on(visualizationOuterParams.paramsId.eq(visualizationOuterParamsInfo.paramsId)) - .where(visualizationOuterParams.visualizationId.eq(dvId.toString())).fetch().forEach(item -> { + .where(visualizationOuterParams.visualizationId.eq(dvId)).fetch().forEach(item -> { SnapshotVisualizationOuterParamsInfo snapshotVisualizationOuterParamsInfo = new SnapshotVisualizationOuterParamsInfo(); BeanUtils.copyBean(snapshotVisualizationOuterParamsInfo, item); snapshotVisualizationOuterParamsInfoRepository.saveAndFlush(snapshotVisualizationOuterParamsInfo); }); - visualizationOuterParamsRepository.findByVisualizationId(dvId.toString()).forEach(item -> { + visualizationOuterParamsRepository.findByVisualizationId(dvId).forEach(item -> { SnapshotVisualizationOuterParams snapshotVisualizationOuterParams = new SnapshotVisualizationOuterParams(); BeanUtils.copyBean(snapshotVisualizationOuterParams, item); snapshotVisualizationOuterParamsRepository.saveAndFlush(snapshotVisualizationOuterParams); @@ -717,7 +717,7 @@ public class CoreVisualizationManage { )).from(snapshotVisualizationOuterParamsTargetViewInfo) .leftJoin(snapshotVisualizationOuterParamsInfo).on(snapshotVisualizationOuterParamsTargetViewInfo.paramsInfoId.eq(snapshotVisualizationOuterParamsInfo.paramsInfoId)) .leftJoin(snapshotVisualizationOuterParams).on(snapshotVisualizationOuterParams.paramsId.eq(snapshotVisualizationOuterParamsInfo.paramsId)) - .where(snapshotVisualizationOuterParams.visualizationId.eq(dvId.toString())).fetch().forEach(item -> { + .where(snapshotVisualizationOuterParams.visualizationId.eq(dvId)).fetch().forEach(item -> { VisualizationOuterParamsTargetViewInfo visualizationOuterParamsTargetViewInfo = new VisualizationOuterParamsTargetViewInfo(); BeanUtils.copyBean(visualizationOuterParamsTargetViewInfo, item); visualizationOuterParamsTargetViewInfoRepository.saveAndFlush(visualizationOuterParamsTargetViewInfo); @@ -736,7 +736,7 @@ public class CoreVisualizationManage { snapshotVisualizationOuterParamsInfo.enabledDefault )).from(snapshotVisualizationOuterParamsInfo) .leftJoin(snapshotVisualizationOuterParams).on(snapshotVisualizationOuterParamsInfo.paramsId.eq(snapshotVisualizationOuterParams.paramsId)) - .where(snapshotVisualizationOuterParams.visualizationId.eq(dvId.toString())).fetch().forEach(item -> { + .where(snapshotVisualizationOuterParams.visualizationId.eq(dvId)).fetch().forEach(item -> { VisualizationOuterParamsInfo visualizationOuterParamsInfo = new VisualizationOuterParamsInfo(); BeanUtils.copyBean(visualizationOuterParamsInfo, item); visualizationOuterParamsInfoRepository.saveAndFlush(visualizationOuterParamsInfo); @@ -750,7 +750,7 @@ public class CoreVisualizationManage { snapshotVisualizationOuterParams.remark, snapshotVisualizationOuterParams.copyFrom, snapshotVisualizationOuterParams.copyId - )).from(snapshotVisualizationOuterParams).where(snapshotVisualizationOuterParams.visualizationId.eq(dvId.toString())).fetch().forEach(item -> { + )).from(snapshotVisualizationOuterParams).where(snapshotVisualizationOuterParams.visualizationId.eq(dvId)).fetch().forEach(item -> { VisualizationOuterParams outerParams = new VisualizationOuterParams(); BeanUtils.copyBean(outerParams, item); visualizationOuterParamsRepository.saveAndFlush(outerParams); diff --git a/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationLinkJumpService.java b/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationLinkJumpService.java index a8e15e0e40..3b7c847940 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationLinkJumpService.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationLinkJumpService.java @@ -289,7 +289,7 @@ public class VisualizationLinkJumpService implements VisualizationLinkJumpApi { visualizationOuterParamsInfo.paramName.as("title") )).from(visualizationOuterParamsInfo) .leftJoin(visualizationOuterParams).on(visualizationOuterParamsInfo.paramsId.eq(visualizationOuterParams.paramsId)) - .where(visualizationOuterParams.visualizationId.eq(dvId.toString())).fetch().forEach(outParamsJumpVO -> { + .where(visualizationOuterParams.visualizationId.eq(dvId)).fetch().forEach(outParamsJumpVO -> { outParamsJumpVO.setType("outerParams"); outParamsJumpInfos.add(outParamsJumpVO); }); diff --git a/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationOuterParamsService.java b/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationOuterParamsService.java index 4b5350e83c..fabccb4571 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationOuterParamsService.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationOuterParamsService.java @@ -14,10 +14,10 @@ import io.dataease.constant.CommonConstants; import io.dataease.dao.auto.entity.CoreDatasetTable; import io.dataease.dao.auto.entity.QCoreDatasetGroup; import io.dataease.dataset.dao.auto.mapper.CoreDatasetTableRepository; -import io.dataease.constant.DeTypeConstants; import io.dataease.dataset.utils.FieldUtils; import io.dataease.extensions.view.dto.SqlVariableDetails; import io.dataease.utils.BeanUtils; +import io.dataease.utils.IDUtils; import io.dataease.utils.JsonUtil; import io.dataease.visualization.dao.auto.entity.*; import io.dataease.visualization.dao.auto.mapper.*; @@ -55,15 +55,15 @@ public class VisualizationOuterParamsService implements VisualizationOuterParams @Override - public VisualizationOuterParamsDTO queryWithVisualizationId(String visualizationId) { + public VisualizationOuterParamsDTO queryWithVisualizationId(Long visualizationId) { QSnapshotDataVisualizationInfo qSnapshotDataVisualizationInfo = QSnapshotDataVisualizationInfo.snapshotDataVisualizationInfo; QSnapshotVisualizationOuterParams qSnapshotVisualizationOuterParams = QSnapshotVisualizationOuterParams.snapshotVisualizationOuterParams; VisualizationOuterParamsDTO visualizationOuterParamsDTO = queryFactory.select(Projections.fields(VisualizationOuterParamsDTO.class, qSnapshotDataVisualizationInfo.id.as("visualizationId"), qSnapshotVisualizationOuterParams.checked.as("checked") )).from(qSnapshotDataVisualizationInfo) - .leftJoin(qSnapshotVisualizationOuterParams).on(qSnapshotDataVisualizationInfo.id.stringValue().eq(qSnapshotVisualizationOuterParams.visualizationId)) - .where(qSnapshotDataVisualizationInfo.id.stringValue().eq(visualizationId)).fetchFirst(); + .leftJoin(qSnapshotVisualizationOuterParams).on(qSnapshotDataVisualizationInfo.id.eq(qSnapshotVisualizationOuterParams.visualizationId)) + .where(qSnapshotDataVisualizationInfo.id.eq(visualizationId)).fetchFirst(); if (visualizationOuterParamsDTO != null && visualizationOuterParamsDTO.getChecked() == null) { visualizationOuterParamsDTO.setChecked(false); } @@ -72,9 +72,9 @@ public class VisualizationOuterParamsService implements VisualizationOuterParams @Override public void updateOuterParamsSet(VisualizationOuterParamsDTO outerParamsDTO) { - String visualizationId = outerParamsDTO.getVisualizationId(); + Long visualizationId = outerParamsDTO.getVisualizationId(); Assert.notNull(visualizationId, "visualizationId cannot be null"); - Map paramsInfoNameIdMap = new HashMap<>(); + Map paramsInfoNameIdMap = new HashMap<>(); QSnapshotVisualizationOuterParamsInfo qSnapshotVisualizationOuterParamsInfo = QSnapshotVisualizationOuterParamsInfo.snapshotVisualizationOuterParamsInfo; QSnapshotVisualizationOuterParams qSnapshotVisualizationOuterParams = QSnapshotVisualizationOuterParams.snapshotVisualizationOuterParams; List paramsInfoNameIdList = queryFactory.select(Projections.fields(SnapshotVisualizationOuterParamsInfo.class, @@ -91,7 +91,7 @@ public class VisualizationOuterParamsService implements VisualizationOuterParams QSnapshotVisualizationOuterParamsInfo snapshotVisualizationOuterParamsInfo = QSnapshotVisualizationOuterParamsInfo.snapshotVisualizationOuterParamsInfo; QSnapshotVisualizationOuterParams snapshotVisualizationOuterParams = QSnapshotVisualizationOuterParams.snapshotVisualizationOuterParams; QSnapshotVisualizationOuterParamsTargetViewInfo snapshotVisualizationOuterParamsTargetViewInfo = QSnapshotVisualizationOuterParamsTargetViewInfo.snapshotVisualizationOuterParamsTargetViewInfo; - List paramsInfoIds = queryFactory.select(snapshotVisualizationOuterParamsTargetViewInfo.targetId).from(snapshotVisualizationOuterParamsTargetViewInfo) + List paramsInfoIds = queryFactory.select(snapshotVisualizationOuterParamsTargetViewInfo.targetId).from(snapshotVisualizationOuterParamsTargetViewInfo) .innerJoin(snapshotVisualizationOuterParamsInfo).on(snapshotVisualizationOuterParamsTargetViewInfo.paramsInfoId.eq(snapshotVisualizationOuterParamsInfo.paramsInfoId)) .innerJoin(snapshotVisualizationOuterParams).on(snapshotVisualizationOuterParamsInfo.paramsId.eq(snapshotVisualizationOuterParams.paramsId)) .where(snapshotVisualizationOuterParams.visualizationId.eq(visualizationId)).fetch(); @@ -100,7 +100,7 @@ public class VisualizationOuterParamsService implements VisualizationOuterParams snapshotVisualizationOuterParamsTargetViewInfoRepository.deleteByParamsInfoIds(paramsInfoIds); } - List paramsIds = queryFactory.select(snapshotVisualizationOuterParamsInfo.paramsId).from(snapshotVisualizationOuterParamsInfo) + List paramsIds = queryFactory.select(snapshotVisualizationOuterParamsInfo.paramsId).from(snapshotVisualizationOuterParamsInfo) .innerJoin(snapshotVisualizationOuterParams).on(snapshotVisualizationOuterParamsInfo.paramsId.eq(snapshotVisualizationOuterParams.paramsId)) .where(snapshotVisualizationOuterParams.visualizationId.eq(visualizationId)) .fetch(); @@ -112,25 +112,25 @@ public class VisualizationOuterParamsService implements VisualizationOuterParams return; } // 插入新的数据 - String paramsId = UUID.randomUUID().toString(); + Long paramsId = IDUtils.snowID(); outerParamsDTO.setParamsId(paramsId); SnapshotVisualizationOuterParams newOuterParams = new SnapshotVisualizationOuterParams(); BeanUtils.copyBean(newOuterParams, outerParamsDTO); snapshotVisualizationOuterParamsRepository.saveAndFlush(newOuterParams); - Map finalParamsInfoNameIdMap = paramsInfoNameIdMap; + Map finalParamsInfoNameIdMap = paramsInfoNameIdMap; Optional.ofNullable(outerParamsDTO.getOuterParamsInfoArray()).orElse(new ArrayList<>()).forEach(outerParamsInfo -> { - String paramsInfoId = finalParamsInfoNameIdMap.get(outerParamsInfo.getParamName()); - if (StringUtils.isEmpty(paramsInfoId)) { - paramsInfoId = UUID.randomUUID().toString(); + Long paramsInfoId = finalParamsInfoNameIdMap.get(outerParamsInfo.getParamName()); + if (paramsInfoId != null) { + paramsInfoId = IDUtils.snowID(); } outerParamsInfo.setParamsInfoId(paramsInfoId); outerParamsInfo.setParamsId(paramsId); SnapshotVisualizationOuterParamsInfo newOuterParamsInfo = new SnapshotVisualizationOuterParamsInfo(); BeanUtils.copyBean(newOuterParamsInfo, outerParamsInfo); snapshotVisualizationOuterParamsInfoRepository.saveAndFlush(newOuterParamsInfo); - String finalParamsInfoId = paramsInfoId; + Long finalParamsInfoId = paramsInfoId; Optional.ofNullable(outerParamsInfo.getTargetViewInfoList()).orElse(new ArrayList<>()).forEach(targetViewInfo -> { - String targetViewInfoId = UUID.randomUUID().toString(); + Long targetViewInfoId = IDUtils.snowID(); targetViewInfo.setTargetId(targetViewInfoId); targetViewInfo.setParamsInfoId(finalParamsInfoId); SnapshotVisualizationOuterParamsTargetViewInfo newOuterParamsTargetViewInfo = new SnapshotVisualizationOuterParamsTargetViewInfo(); @@ -143,7 +143,7 @@ public class VisualizationOuterParamsService implements VisualizationOuterParams @DeLinkPermit @Override - public VisualizationOuterParamsBaseResponse getOuterParamsInfo(String visualizationId) { + public VisualizationOuterParamsBaseResponse getOuterParamsInfo(Long visualizationId) { QVisualizationOuterParams qVisualizationOuterParams = QVisualizationOuterParams.visualizationOuterParams; QVisualizationOuterParamsInfo qVisualizationOuterParamsInfo = QVisualizationOuterParamsInfo.visualizationOuterParamsInfo; @@ -154,7 +154,7 @@ public class VisualizationOuterParamsService implements VisualizationOuterParams qVisualizationOuterParamsInfo.required, qVisualizationOuterParamsInfo.defaultValue, qVisualizationOuterParamsInfo.enabledDefault, - visualizationOuterParamsTargetViewInfo.targetViewId.concat("#").concat(visualizationOuterParamsTargetViewInfo.targetViewId).as("targetInfo"))).from(qVisualizationOuterParams) + visualizationOuterParamsTargetViewInfo.targetViewId.stringValue().concat("#").concat(visualizationOuterParamsTargetViewInfo.targetViewId.stringValue()).as("targetInfo"))).from(qVisualizationOuterParams) .leftJoin(qVisualizationOuterParamsInfo).on(qVisualizationOuterParamsInfo.paramsId.eq(qVisualizationOuterParams.paramsId)) .leftJoin(visualizationOuterParamsTargetViewInfo).on(visualizationOuterParamsTargetViewInfo.paramsInfoId.eq(qVisualizationOuterParamsInfo.paramsInfoId)) .fetch(); @@ -164,7 +164,7 @@ public class VisualizationOuterParamsService implements VisualizationOuterParams } @Override - public List queryDsWithVisualizationId(String visualizationId) { + public List queryDsWithVisualizationId(Long visualizationId) { QCoreDatasetGroup qCoreDatasetGroup = QCoreDatasetGroup.coreDatasetGroup; QSnapshotCoreChartView qSnapshotCoreChartView = QSnapshotCoreChartView.snapshotCoreChartView; @@ -186,12 +186,12 @@ public class VisualizationOuterParamsService implements VisualizationOuterParams qCoreDatasetGroup.lastUpdateTime )).from(qCoreDatasetGroup) .innerJoin(qSnapshotCoreChartView).on(qCoreDatasetGroup.id.eq(qSnapshotCoreChartView.tableId).and(qSnapshotCoreChartView.type.ne("VQuery"))) - .innerJoin(qSnapshotDataVisualizationInfo).on(qSnapshotCoreChartView.sceneId.eq(Long.valueOf(qSnapshotDataVisualizationInfo.id.toString()))) - .where(qSnapshotCoreChartView.sceneId.eq(Long.valueOf(visualizationId)).and(qSnapshotDataVisualizationInfo.id.stringValue().eq(visualizationId))) + .innerJoin(qSnapshotDataVisualizationInfo).on(qSnapshotCoreChartView.sceneId.eq(qSnapshotDataVisualizationInfo.id)) + .where(qSnapshotCoreChartView.sceneId.eq(visualizationId).and(qSnapshotDataVisualizationInfo.id.eq(visualizationId))) .where(qSnapshotDataVisualizationInfo.componentData.like("%" + qSnapshotCoreChartView.id + "%")) .fetch(); if (!CollectionUtils.isEmpty(result)) { - List activeViewIds = dataVisualizationServer.getEnabledViewIds(Long.valueOf(visualizationId), CommonConstants.RESOURCE_TABLE.SNAPSHOT); + List activeViewIds = dataVisualizationServer.getEnabledViewIds(visualizationId, CommonConstants.RESOURCE_TABLE.SNAPSHOT); result.forEach(coreDatasetGroupVO -> { // 过滤已删除的图表 if (!CollectionUtils.isEmpty(coreDatasetGroupVO.getDatasetViews())) { diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/VisualizationOuterParamsApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/VisualizationOuterParamsApi.java index f207470d9a..f9853435c8 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/VisualizationOuterParamsApi.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/VisualizationOuterParamsApi.java @@ -15,7 +15,7 @@ public interface VisualizationOuterParamsApi { @GetMapping("/queryWithVisualizationId/{dvId}") @Operation(summary = "查询") - VisualizationOuterParamsDTO queryWithVisualizationId(@PathVariable("dvId") String dvId); + VisualizationOuterParamsDTO queryWithVisualizationId(@PathVariable("dvId") Long dvId); @PostMapping("/updateOuterParamsSet") @Operation(summary = "更新") @@ -23,9 +23,9 @@ public interface VisualizationOuterParamsApi { @GetMapping("/getOuterParamsInfo/{dvId}") @Operation(summary = "查询基础信息") - VisualizationOuterParamsBaseResponse getOuterParamsInfo(@PathVariable("dvId") String dvId); + VisualizationOuterParamsBaseResponse getOuterParamsInfo(@PathVariable("dvId") Long dvId); @GetMapping("/queryDsWithVisualizationId/{dvId}") @Operation(summary = "查询涉及数据集基础信息") - List queryDsWithVisualizationId(@PathVariable("dvId") String dvId); + List queryDsWithVisualizationId(@PathVariable("dvId") Long dvId); } diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOutParamsJumpVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOutParamsJumpVO.java index f323b810fc..4f8dd4a85c 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOutParamsJumpVO.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOutParamsJumpVO.java @@ -1,11 +1,14 @@ package io.dataease.api.visualization.vo; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; @Data public class VisualizationOutParamsJumpVO { - private String id; + @JsonSerialize(using = ToStringSerializer.class) + private Long id; private String type; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsDsInfoVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsDsInfoVO.java index 7b23e76944..dae00952b1 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsDsInfoVO.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsDsInfoVO.java @@ -1,5 +1,7 @@ package io.dataease.api.visualization.vo; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import java.util.List; @@ -10,7 +12,8 @@ public class VisualizationOuterParamsDsInfoVO { private String dsName; - private String dsId; + @JsonSerialize(using = ToStringSerializer.class) + private Long dsId; private List targetFieldInfo; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsFilterInfoVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsFilterInfoVO.java index 03aaa92275..a522f51364 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsFilterInfoVO.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsFilterInfoVO.java @@ -1,5 +1,7 @@ package io.dataease.api.visualization.vo; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import java.util.List; @@ -8,8 +10,10 @@ import java.util.Map; @Data public class VisualizationOuterParamsFilterInfoVO { - private String filterComponentId; + @JsonSerialize(using = ToStringSerializer.class) + private Long filterComponentId; - private String filterId; + @JsonSerialize(using = ToStringSerializer.class) + private Long filterId; } diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsInfoVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsInfoVO.java index a20a440eeb..6ab3ec5bbe 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsInfoVO.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsInfoVO.java @@ -1,5 +1,7 @@ package io.dataease.api.visualization.vo; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import java.io.Serializable; @@ -20,12 +22,14 @@ public class VisualizationOuterParamsInfoVO implements Serializable { /** * 主键 */ - private String paramsInfoId; + @JsonSerialize(using = ToStringSerializer.class) + private Long paramsInfoId; /** * visualization_outer_params 表的 ID */ - private String paramsId; + @JsonSerialize(using = ToStringSerializer.class) + private Long paramsId; /** * 参数名 diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsTargetViewInfoVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsTargetViewInfoVO.java index 314365a542..4e566ff349 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsTargetViewInfoVO.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsTargetViewInfoVO.java @@ -1,5 +1,7 @@ package io.dataease.api.visualization.vo; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import java.io.Serializable; @@ -20,27 +22,32 @@ public class VisualizationOuterParamsTargetViewInfoVO implements Serializable { /** * 主键 */ - private String targetId; + @JsonSerialize(using = ToStringSerializer.class) + private Long targetId; /** * visualization_outer_params_info 表的 ID */ - private String paramsInfoId; + @JsonSerialize(using = ToStringSerializer.class) + private Long paramsInfoId; /** * 联动视图ID */ - private String targetViewId; + @JsonSerialize(using = ToStringSerializer.class) + private Long targetViewId; /** * 联动数据集id/联动过滤组件id */ - private String targetDsId; + @JsonSerialize(using = ToStringSerializer.class) + private Long targetDsId; /** * 联动字段ID */ - private String targetFieldId; + @JsonSerialize(using = ToStringSerializer.class) + private Long targetFieldId; /** * 复制来源 diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsVO.java index afa228960e..459f306c5a 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsVO.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsVO.java @@ -1,6 +1,9 @@ package io.dataease.api.visualization.vo; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; + import java.io.Serializable; /** @@ -18,12 +21,14 @@ public class VisualizationOuterParamsVO implements Serializable { /** * 主键 */ - private String paramsId; + @JsonSerialize(using = ToStringSerializer.class) + private Long paramsId; /** * 可视化资源ID */ - private String visualizationId; + @JsonSerialize(using = ToStringSerializer.class) + private Long visualizationId; /** * 是否启用外部参数标识（1-是，0-否） @@ -56,19 +61,19 @@ public class VisualizationOuterParamsVO implements Serializable { private String defaultValue; - public String getParamsId() { + public Long getParamsId() { return paramsId; } - public void setParamsId(String paramsId) { + public void setParamsId(Long paramsId) { this.paramsId = paramsId; } - public String getVisualizationId() { + public Long getVisualizationId() { return visualizationId; } - public void setVisualizationId(String visualizationId) { + public void setVisualizationId(Long visualizationId) { this.visualizationId = visualizationId; }