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 queryReportFilter(@Param("dvId") Long dvId,@Param("taskId") Long taskId); + void deleteDataVBatch(@Param("ids") Set ids); + void deleteViewsBatch(@Param("ids") Set 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} + + + DELETE + FROM + data_visualization_info dvi + WHERE + dvi.id IN + + #{id} + + + + DELETE + FROM + core_chart_view ccv + WHERE + ccv.scene_id IN + + #{id} + +