From 6b77646ca494320e932f362858a1e4f194c54525 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Sun, 6 Apr 2025 19:09:03 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF=E3=80=81?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E7=8A=B6=E6=80=81=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/ext/mapper/ExtDataVisualizationMapper.java | 3 +++ .../visualization/server/DataVisualizationServer.java | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/ExtDataVisualizationMapper.java b/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/ExtDataVisualizationMapper.java index 2c42e6ce24..fec2813c9a 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/ExtDataVisualizationMapper.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/ExtDataVisualizationMapper.java @@ -98,4 +98,7 @@ public interface ExtDataVisualizationMapper { void restoreOuterParamsInfo(@Param("dvId") Long dvId); void restoreOuterParams(@Param("dvId") Long dvId); + + @Select("select status from data_visualization_info where id = #{dvId}") + Integer findDvInfoStats(@Param("dvId") Long dvId); } 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 fec6e8f91e..e08e338120 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 @@ -518,8 +518,10 @@ public class DataVisualizationServer implements DataVisualizationApi { coreVisualizationManage.move(request); } } - // 新建保存状态不对问题 - visualizationInfo.setStatus(request.getStatus() != null ? request.getStatus() : CommonConstants.DV_STATUS.SAVED_UNPUBLISHED); + // 状态修改统一为后端操作：历史状态检查 如果 状态为 0（未发布） 或者 2（已发布未保存）则状态不变 + // 如果当前状态为 1 则状态修改为 2（已发布未保存） + Integer curStatus = extDataVisualizationMapper.findDvInfoStats(dvId); + visualizationInfo.setStatus(curStatus == 1?CommonConstants.DV_STATUS.SAVED_UNPUBLISHED:curStatus); coreVisualizationManage.innerEdit(visualizationInfo); //保存图表信息 chartDataManage.saveChartViewFromVisualization(request.getComponentData(), dvId, request.getCanvasViewInfo());