From 02f4d5bba057efd86850afb785b17e97f18dca1a Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 1 Nov 2021 11:10:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BB=AA=E8=A1=A8=E6=9D=BF=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E9=85=8D=E7=BD=AE=E6=97=B6=EF=BC=8C=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BFID=E8=BF=98=E5=9C=A8=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E9=80=89=E9=A1=B9=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtPanelGroupMapper.java  |  3 ++
 .../base/mapper/ext/ExtPanelGroupMapper.xml   | 11 +++++++
 .../mapper/ext/ExtPanelLinkJumpMapper.java    |  5 +++
 .../mapper/ext/ExtPanelLinkJumpMapper.xml     | 32 +++++++++++++++++++
 .../service/panel/PanelGroupService.java      | 18 ++++++++++-
 5 files changed, 68 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.java
index 6481626578..6557ffc5f2 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.java
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.java
@@ -20,4 +20,7 @@ public interface ExtPanelGroupMapper {
     PanelGroupDTO panelGroup(String id);
 
 
+    void copyPanelView(@Param("pid") String panelId);
+
+
 }
diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.xml
index 6c6adb9155..5e2049d067 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.xml
@@ -167,4 +167,15 @@
         delete from panel_group where FIND_IN_SET(panel_group.id,GET_PANEL_GROUP_WITH_CHILDREN(#{pid})) or FIND_IN_SET(panel_group.source,GET_PANEL_GROUP_WITH_CHILDREN(#{pid}))
     </delete>
 
+    <insert id="copyPanelView">
+    INSERT INTO panel_view ( id, panel_id, chart_view_id ) SELECT
+    uuid(),
+    #{panelId},
+    chart_view_id
+    FROM
+        panel_view
+    WHERE
+        panel_id = #{panelId}
+    </insert>
+
 </mapper>
diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelLinkJumpMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelLinkJumpMapper.java
index 3b69c30a96..5c3f5a05c6 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelLinkJumpMapper.java
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelLinkJumpMapper.java
@@ -17,6 +17,11 @@ public interface ExtPanelLinkJumpMapper {
 
     void deleteJump(@Param("panelId") String panelId,@Param("viewId") String viewId);
 
+    void deleteJumpTargetViewInfoWithPanel(@Param("panelId") String panelId);
+
+    void deleteJumpInfoWithPanel(@Param("panelId") String panelId);
+
+    void deleteJumpWithPanel(@Param("panelId") String panelId);
 
     List<PanelLinkJumpDTO> getTargetPanelJumpInfo(@Param("request")PanelLinkJumpBaseRequest request);
 }
diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelLinkJumpMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelLinkJumpMapper.xml
index 9192a6adb7..7b0a7ba4ef 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelLinkJumpMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelLinkJumpMapper.xml
@@ -114,6 +114,38 @@
             AND lj.source_view_id = #{viewId}
 	</delete>
 
+
+
+    <delete id="deleteJumpTargetViewInfoWithPanel" >
+       DELETE ljtv
+        FROM
+            panel_link_jump_target_view_info ljtv,
+            panel_link_jump_info lji,
+            panel_link_jump lj
+        WHERE
+            ljtv.link_jump_info_id = lji.id
+            AND lji.link_jump_id = lj.id
+            AND (lj.source_panel_id = #{panelId} or lji.target_panel_id = #{panelId})
+	</delete>
+
+    <delete id="deleteJumpInfoWithPanel" >
+        DELETE lji
+        FROM
+            panel_link_jump_info lji,
+            panel_link_jump lj
+        WHERE
+            lji.link_jump_id = lj.id
+            AND (lj.source_panel_id = #{panelId} or  lji.target_panel_id = #{panelId})
+	</delete>
+
+    <delete id="deleteJumpWithPanel" >
+        DELETE lj
+        FROM
+            panel_link_jump lj
+        WHERE
+            lj.source_panel_id = #{panelId}
+	</delete>
+
     <select id="getTargetPanelJumpInfo" resultMap="AllJumpMap">
       SELECT DISTINCT
             concat( lj.source_view_id, '#', lji.source_field_id ) AS 'sourceInfo',
diff --git a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
index c7cfb904ba..6b34768e1b 100644
--- a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
+++ b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
@@ -4,6 +4,7 @@ import io.dataease.base.domain.*;
 import io.dataease.base.mapper.ChartViewMapper;
 import io.dataease.base.mapper.PanelGroupMapper;
 import io.dataease.base.mapper.ext.ExtPanelGroupMapper;
+import io.dataease.base.mapper.ext.ExtPanelLinkJumpMapper;
 import io.dataease.commons.constants.PanelConstants;
 import io.dataease.commons.utils.AuthUtils;
 import io.dataease.commons.utils.TreeUtils;
@@ -55,6 +56,8 @@ public class PanelGroupService {
     private SysAuthService sysAuthService;
     @Resource
     private PanelViewService panelViewService;
+    @Resource
+    private ExtPanelLinkJumpMapper extPanelLinkJumpMapper;
 
 
     public List<PanelGroupDTO> tree(PanelGroupRequest panelGroupRequest) {
@@ -116,7 +119,14 @@ public class PanelGroupService {
             newPanel.setId(panelId);
             newPanel.setCreateBy(AuthUtils.getUser().getUsername());
             panelGroupMapper.insertSelective(newPanel);
-        }  else if ("move".equals(request.getOptType())) {
+
+            try{
+                panelViewService.syncPanelViews(newPanel);
+            }catch (Exception e){
+                e.printStackTrace();
+                LOGGER.error("更新panelView出错panelId：{}" ,request.getId());
+            }        }
+        else if ("move".equals(request.getOptType())) {
             PanelGroupWithBLOBs panelInfo = panelGroupMapper.selectByPrimaryKey(request.getId());
             if(panelInfo.getPid().equalsIgnoreCase(request.getPid())){
                 DataEaseException.throwException(Translator.get("i18n_select_diff_folder"));
@@ -139,6 +149,7 @@ public class PanelGroupService {
             panelGroupMapper.updateByPrimaryKeySelective(request);
         }
 
+
         //带有权限的返回
         PanelGroupRequest authRequest = new PanelGroupRequest();
         authRequest.setId(panelId);
@@ -175,6 +186,11 @@ public class PanelGroupService {
         storeService.removeByPanelId(id);
         shareService.delete(id, null);
         panelLinkService.deleteByResourceId(id);
+
+        //清理跳转信息
+        extPanelLinkJumpMapper.deleteJumpTargetViewInfoWithPanel(id);
+        extPanelLinkJumpMapper.deleteJumpInfoWithPanel(id);
+        extPanelLinkJumpMapper.deleteJumpWithPanel(id);
     }