center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

refactor(数据大屏、仪表板): 仪表板数据大屏删除，相关资源改为物理删除

Browse Source
This commit is contained in:
wangjiahao 2024-10-12 11:50:24 +08:00
parent 0a11266374
commit 3ee2098f16
5 changed files with 47 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/ExtDataVisualizationMapper.java
View File

@ -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);
}

6
core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationManage.java
View File

@ -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);
}

9
core/core-backend/src/main/resources/db/desktop/V2.10.2__ddl.sql Normal file
View File

@ -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;

10
core/core-backend/src/main/resources/db/migration/V2.10.2__ddl.sql
View File

@ -1 +1,9 @@
INSERT INTO area (id, level, name, pid) VALUES ('156440315', 'district', '大鹏新区', '156440300');
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;

21
core/core-backend/src/main/resources/mybatis/ExtDataVisualizationMapper.xml
View File

@ -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>