From 17f30e23b775b1b7d2e40c38511b195f335826ec Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 27 Mar 2024 23:52:27 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=A4=8D=E5=88=B6=E6=93=8D=E4=BD=9C=E5=90=8E=E5=BF=AB?=
 =?UTF-8?q?=E9=80=9F=E4=BF=9D=E5=AD=98=E5=8F=AF=E8=83=BD=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=E6=9C=AA=E5=A4=8D=E5=88=B6=E7=9A=84=E8=A7=86=E5=9B=BE=E8=A2=AB?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/controller/chart/ChartViewController.java | 7 +++++++
 .../src/main/java/io/dataease/ext/ExtChartViewMapper.xml  | 2 +-
 .../java/io/dataease/service/panel/PanelViewService.java  | 8 ++++++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/core/backend/src/main/java/io/dataease/controller/chart/ChartViewController.java b/core/backend/src/main/java/io/dataease/controller/chart/ChartViewController.java
index db752b8655..aaf9e57638 100644
--- a/core/backend/src/main/java/io/dataease/controller/chart/ChartViewController.java
+++ b/core/backend/src/main/java/io/dataease/controller/chart/ChartViewController.java
@@ -109,6 +109,13 @@ public class ChartViewController {
         return chartViewService.chartCopy(id, panelId);
     }
 
+    @DePermission(type = DePermissionType.PANEL, level = ResourceAuthLevel.PANEL_LEVEL_MANAGE, paramIndex = 1)
+    @ApiOperation("复制")
+    @PostMapping("chartCopyWithId/{id}/{panelId}/{newId}")
+    public String chartCopyWithId(@PathVariable String id, @PathVariable String panelId, @PathVariable String newId) {
+        return chartViewService.chartCopy(id, newId,panelId);
+    }
+
     @DePermission(type = DePermissionType.PANEL, level = ResourceAuthLevel.PANEL_LEVEL_MANAGE, paramIndex = 1)
     @ApiOperation("批量复制")
     @PostMapping("chartBatchCopy/{panelId}")
diff --git a/core/backend/src/main/java/io/dataease/ext/ExtChartViewMapper.xml b/core/backend/src/main/java/io/dataease/ext/ExtChartViewMapper.xml
index 79c8627399..96fa2330e2 100644
--- a/core/backend/src/main/java/io/dataease/ext/ExtChartViewMapper.xml
+++ b/core/backend/src/main/java/io/dataease/ext/ExtChartViewMapper.xml
@@ -613,7 +613,7 @@
 
     <delete id="deleteNoUseView">
         delete from chart_view
-        where scene_id = #{panelId}
+        where scene_id = #{panelId} and create_time &lt; ( unix_timestamp()- 30 ) * 1000
         <if test="viewIds != null and viewIds.size() > 0">
             and id not in
             <foreach collection="viewIds" item="viewId" open='(' separator=',' close=')'>
diff --git a/core/backend/src/main/java/io/dataease/service/panel/PanelViewService.java b/core/backend/src/main/java/io/dataease/service/panel/PanelViewService.java
index 8581d5930b..9095b98f96 100644
--- a/core/backend/src/main/java/io/dataease/service/panel/PanelViewService.java
+++ b/core/backend/src/main/java/io/dataease/service/panel/PanelViewService.java
@@ -131,8 +131,12 @@ public class PanelViewService {
                 //将视图从cache表中更新到正式表中
                 viewIds = panelViewInsertDTOList.stream().map(panelView -> panelView.getChartViewId()).collect(Collectors.toList());
             }
-            extChartViewMapper.deleteCacheWithPanel(viewIds, panelId);
-            extChartViewMapper.deleteNoUseView(viewIds, panelId);
+            // viewIds 不存在时 不执行删除缓存防止误删情况
+            if(CollectionUtils.isNotEmpty(viewIds)){
+                extChartViewMapper.deleteCacheWithPanel(viewIds, panelId);
+                extChartViewMapper.deleteNoUseView(viewIds, panelId);
+            }
+
         }
         panelGroup.setMobileLayout(mobileLayout);
         return viewIds;