From 3ee2098f16e85649d08f9ebd1a5e1bfec885e6c6 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Sat, 12 Oct 2024 11:50:24 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F?=
 =?UTF-8?q?=E3=80=81=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E4=BB=AA=E8=A1=A8?=
 =?UTF-8?q?=E6=9D=BF=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=EF=BC=8C=E7=9B=B8=E5=85=B3=E8=B5=84=E6=BA=90=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E7=89=A9=E7=90=86=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ExtDataVisualizationMapper.java    |  3 +++
 .../manage/CoreVisualizationManage.java       |  6 +++++-
 .../resources/db/desktop/V2.10.2__ddl.sql     |  9 ++++++++
 .../resources/db/migration/V2.10.2__ddl.sql   | 10 ++++++++-
 .../mybatis/ExtDataVisualizationMapper.xml    | 21 +++++++++++++++++++
 5 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 core/core-backend/src/main/resources/db/desktop/V2.10.2__ddl.sql

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 f2b9a54ede..57f9f9f307 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
@@ -16,6 +16,7 @@ import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 @Mapper
 public interface ExtDataVisualizationMapper {
@@ -51,5 +52,7 @@ public interface ExtDataVisualizationMapper {
 
     List<VisualizationReportFilterVO> queryReportFilter(@Param("dvId") Long dvId,@Param("taskId") Long taskId);
 
+    void deleteDataVBatch(@Param("ids") Set<Long> ids);
 
+    void deleteViewsBatch(@Param("ids") Set<Long> ids);
 }
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 b53fe3f05a..ff95c68ec8 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
@@ -89,7 +89,11 @@ public class CoreVisualizationManage {
                 });
             }
         }
-        extMapper.batchDel(delIds, System.currentTimeMillis(), AuthUtils.getUser().getUserId());
+        // 删除可视化资源
+        extDataVisualizationMapper.deleteDataVBatch(delIds);
+        // 删除图表信息
+        extDataVisualizationMapper.deleteViewsBatch(delIds);
+
         coreOptRecentManage.saveOpt(id, OptConstants.OPT_RESOURCE_TYPE.VISUALIZATION, OptConstants.OPT_TYPE.DELETE);
     }
 
diff --git a/core/core-backend/src/main/resources/db/desktop/V2.10.2__ddl.sql b/core/core-backend/src/main/resources/db/desktop/V2.10.2__ddl.sql
new file mode 100644
index 0000000000..50e3280149
--- /dev/null
+++ b/core/core-backend/src/main/resources/db/desktop/V2.10.2__ddl.sql
@@ -0,0 +1,9 @@
+INSERT INTO area (id, level, name, pid) VALUES ('156440315', 'district', '大鹏新区', '156440300');
+
+DELETE ccv
+FROM
+	core_chart_view ccv
+	INNER JOIN data_visualization_info dvi ON ccv.scene_id = dvi.id
+WHERE
+	dvi.delete_flag =1;
+delete from data_visualization_info dvi where dvi.delete_flag =1;
\ No newline at end of file
diff --git a/core/core-backend/src/main/resources/db/migration/V2.10.2__ddl.sql b/core/core-backend/src/main/resources/db/migration/V2.10.2__ddl.sql
index 746a588daf..50e3280149 100644
--- a/core/core-backend/src/main/resources/db/migration/V2.10.2__ddl.sql
+++ b/core/core-backend/src/main/resources/db/migration/V2.10.2__ddl.sql
@@ -1 +1,9 @@
-INSERT INTO area (id, level, name, pid) VALUES ('156440315', 'district', '大鹏新区', '156440300');
\ No newline at end of file
+INSERT INTO area (id, level, name, pid) VALUES ('156440315', 'district', '大鹏新区', '156440300');
+
+DELETE ccv
+FROM
+	core_chart_view ccv
+	INNER JOIN data_visualization_info dvi ON ccv.scene_id = dvi.id
+WHERE
+	dvi.delete_flag =1;
+delete from data_visualization_info dvi where dvi.delete_flag =1;
\ No newline at end of file
diff --git a/core/core-backend/src/main/resources/mybatis/ExtDataVisualizationMapper.xml b/core/core-backend/src/main/resources/mybatis/ExtDataVisualizationMapper.xml
index 2396e2887c..7a0aa493e2 100644
--- a/core/core-backend/src/main/resources/mybatis/ExtDataVisualizationMapper.xml
+++ b/core/core-backend/src/main/resources/mybatis/ExtDataVisualizationMapper.xml
@@ -419,4 +419,25 @@
             visualization_report_filter
         where visualization_report_filter.resource_id = #{dvId} and visualization_report_filter.task_id = #{taskId}
     </select>
+
+    <delete id="deleteDataVBatch">
+        DELETE
+        FROM
+            data_visualization_info dvi
+        WHERE
+            dvi.id IN
+            <foreach collection="ids" item="id" index="index" open="(" close=")" separator=",">
+              #{id}
+            </foreach>
+    </delete>
+    <delete id="deleteViewsBatch">
+        DELETE
+        FROM
+            core_chart_view ccv
+        WHERE
+            ccv.scene_id IN
+            <foreach collection="ids" item="id" index="index" open="(" close=")" separator=",">
+              #{id}
+            </foreach>
+    </delete>
 </mapper>