diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java index b00f4df30b..98d355e1ce 100644 --- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java +++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java @@ -49,6 +49,12 @@ public class DataSetTableTaskController { dataSetTableTaskService.delete(id); } + @ApiOperation("批量删除") + @PostMapping("batchDelete/{id}") + public void batchDelete(@RequestBody List ids) { + dataSetTableTaskService.batchDelete(ids); + } + @DePermission(type = DePermissionType.DATASET, value = "tableId", level = ResourceAuthLevel.DATASET_LEVEL_MANAGE) @ApiOperation("查询") @PostMapping("list") diff --git a/backend/src/main/java/io/dataease/plugins/config/PluginRunner.java b/backend/src/main/java/io/dataease/plugins/config/PluginRunner.java index 529889b1e4..db6abc5044 100644 --- a/backend/src/main/java/io/dataease/plugins/config/PluginRunner.java +++ b/backend/src/main/java/io/dataease/plugins/config/PluginRunner.java @@ -62,9 +62,7 @@ public class PluginRunner implements ApplicationRunner { if (CollectionUtils.isEmpty(groupMap.get(false))) return; plugins.stream().forEach(plugin -> { - if (isDiscard(plugin)) { - } String store = plugin.getStore(); String version = plugin.getVersion(); String moduleName = plugin.getModuleName(); diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java index 0543d134af..fdb1d430da 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java @@ -149,6 +149,19 @@ public class DataSetTableTaskService { dataSetTableTaskLogService.deleteByTaskId(id); } + @Transactional + public void batchDelete(List ids) { + if (CollectionUtils.isNotEmpty(ids)){ + for (int i = 0; i < ids.size(); i++) { + String id = ids.get(i); + DatasetTableTask datasetTableTask = datasetTableTaskMapper.selectByPrimaryKey(id); + datasetTableTaskMapper.deleteByPrimaryKey(id); + scheduleService.deleteSchedule(datasetTableTask); + dataSetTableTaskLogService.deleteByTaskId(id); + } + } + } + public void delete(DatasetTableTask task) { datasetTableTaskMapper.deleteByPrimaryKey(task.getId()); scheduleService.deleteSchedule(task);