diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/bigbrother/BigBrotherController.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/bigbrother/BigBrotherController.java index 8704c78..5d19e47 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/bigbrother/BigBrotherController.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/bigbrother/BigBrotherController.java @@ -5,6 +5,7 @@ import cn.iocoder.yudao.module.tkdata.controller.admin.bigbrother.vo.BigBrotherR import cn.iocoder.yudao.module.tkdata.controller.admin.bigbrother.vo.BigBrotherSaveReqVO; import cn.iocoder.yudao.module.tkdata.dal.dataobject.bigbrother.BigBrotherDO; import cn.iocoder.yudao.module.tkdata.service.bigbrother.BigBrotherService; +import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -36,6 +37,7 @@ import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*; @RestController @RequestMapping("/server/big-brother") @Validated +@Slf4j public class BigBrotherController { @Resource @@ -100,6 +102,10 @@ public class BigBrotherController { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); List list = bigBrotherService.getBigBrotherPage(pageReqVO).getList(); // 导出 Excel + if (pageReqVO.getDeleteFlag()){ + bigBrotherService.deleteExportData(list); + log.info("删除导出数据{}",list.size() ); + } ExcelUtils.write(response, "大哥数据.xls", "数据", BigBrotherRespVO.class, BeanUtils.toBean(list, BigBrotherRespVO.class)); } diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/bigbrother/vo/BigBrotherPageReqVO.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/bigbrother/vo/BigBrotherPageReqVO.java index 5ace138..9862251 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/bigbrother/vo/BigBrotherPageReqVO.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/bigbrother/vo/BigBrotherPageReqVO.java @@ -148,4 +148,8 @@ public class BigBrotherPageReqVO extends PageParam { @Schema(description = "粉丝团等级最小值", example = "0") private Integer fansLevelMin; + + @Schema(description = "是否删除原数据") + private Boolean deleteFlag; + } \ No newline at end of file diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/bigbrother/BigBrotherService.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/bigbrother/BigBrotherService.java index 1d2c900..05d6249 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/bigbrother/BigBrotherService.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/bigbrother/BigBrotherService.java @@ -60,4 +60,5 @@ public interface BigBrotherService { */ PageResult getBigBrotherPage(BigBrotherPageReqVO pageReqVO); + void deleteExportData(List list); } \ No newline at end of file diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/bigbrother/BigBrotherServiceImpl.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/bigbrother/BigBrotherServiceImpl.java index 9850462..ebb965d 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/bigbrother/BigBrotherServiceImpl.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/bigbrother/BigBrotherServiceImpl.java @@ -99,4 +99,9 @@ public class BigBrotherServiceImpl implements BigBrotherService { return new PageResult<>(bigBrotherDOIPage.getRecords(),bigBrotherDOIPage.getTotal()); } + @Override + public void deleteExportData(List list) { + bigBrotherMapper.deleteByIds(list); + } + } \ No newline at end of file diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml index b1e2b79..902d00f 100644 --- a/yudao-server/src/main/resources/application-local.yaml +++ b/yudao-server/src/main/resources/application-local.yaml @@ -82,7 +82,7 @@ spring: redis: host: 127.0.0.1 # 地址 port: 6379 # 端口 - database: 0 # 数据库索引 + database: 1 # 数据库索引 # password: dev # 密码,建议生产环境开启 --- #################### 定时任务相关配置 ####################