From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Sep 2024 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog
---
src/main/java/org/springblade/modules/backblast/controller/BackblastPubRecordController.java | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/backblast/controller/BackblastPubRecordController.java b/src/main/java/org/springblade/modules/backblast/controller/BackblastPubRecordController.java
index 8de6384..9056f8e 100644
--- a/src/main/java/org/springblade/modules/backblast/controller/BackblastPubRecordController.java
+++ b/src/main/java/org/springblade/modules/backblast/controller/BackblastPubRecordController.java
@@ -21,13 +21,22 @@
import io.swagger.annotations.ApiParam;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
+
+import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.log.annotation.ApiLog;
+import org.springblade.core.log.logger.BladeLogger;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.jackson.JsonUtil;
+import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.backblast.excel.BackblastPubRecordExcel;
+import org.springblade.modules.house.excel.HouseRentalExcel;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.backblast.entity.BackblastPubRecordEntity;
@@ -35,6 +44,8 @@
import org.springblade.modules.backblast.wrapper.BackblastPubRecordWrapper;
import org.springblade.modules.backblast.service.IBackblastPubRecordService;
import org.springblade.core.boot.ctrl.BladeController;
+
+import java.util.List;
/**
* 反炸宣传记录表 控制器
@@ -49,6 +60,7 @@
public class BackblastPubRecordController{
private final IBackblastPubRecordService backblastPubRecordService;
+ private final BladeLogger bladeLogger;
/**
* 反炸宣传记录表 详情
@@ -76,8 +88,10 @@
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
+ @ApiLog("反炸宣传记录表 自定义分页")
@ApiOperation(value = "分页", notes = "传入backblastPubRecord")
public R<IPage<BackblastPubRecordVO>> page(BackblastPubRecordVO backblastPubRecord, Query query) {
+ bladeLogger.info("反炸宣传记录表 自定义分页", JsonUtil.toJson(backblastPubRecord));
IPage<BackblastPubRecordVO> pages = backblastPubRecordService.selectBackblastPubRecordPage(Condition.getPage(query), backblastPubRecord);
return R.data(pages);
}
@@ -107,8 +121,10 @@
*/
@PostMapping("/addOrUpdate")
@ApiOperationSupport(order = 8)
+ @ApiLog("反炸宣传记录表 自定义新增/修改")
@ApiOperation(value = "自定义新增/修改", notes = "传入backblastPubRecord")
- public R addOrUpdate(@Valid @RequestBody BackblastPubRecordEntity backblastPubRecord) {
+ public R addOrUpdate(@Valid @RequestBody BackblastPubRecordVO backblastPubRecord) {
+ bladeLogger.info("反炸宣传记录表 自定义新增/修改", JsonUtil.toJson(backblastPubRecord));
return R.status(backblastPubRecordService.addOrUpdateBackblastPubRecordEntity(backblastPubRecord));
}
@@ -127,10 +143,35 @@
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
+ @ApiLog("反炸宣传记录表 删除")
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(backblastPubRecordService.removeByIds(Func.toLongList(ids)));
+ bladeLogger.info("反炸宣传记录表 删除", JsonUtil.toJson(ids));
+ return R.status(backblastPubRecordService.removeBackblastPubByIds(Func.toLongList(ids)));
+ }
+
+ /**
+ * 反炸宣传记录表 自定义详情
+ * @param backblastPubRecord
+ * @return
+ */
+ @GetMapping("/getDetail")
+ @ApiOperationSupport(order = 9)
+ @ApiLog("反炸宣传记录表 自定义详情")
+ @ApiOperation(value = "详情", notes = "传入backblastPubRecord")
+ public R getDetail(BackblastPubRecordVO backblastPubRecord) {
+ bladeLogger.info("反炸宣传记录表 自定义详情", JsonUtil.toJson(backblastPubRecord));
+ BackblastPubRecordVO detail = backblastPubRecordService.getDetail(backblastPubRecord);
+ return R.data(detail);
}
+ @GetMapping("/export")
+ @ApiOperationSupport(order = 10)
+ @ApiOperation(value = "导出", notes = "")
+ public void export(BackblastPubRecordVO backblastPubRecord, HttpServletResponse response) {
+ List<BackblastPubRecordExcel> list = backblastPubRecordService.export(backblastPubRecord);
+ ExcelUtil.export(response, "入户宣传" + DateUtil.time(), "入户宣传数据表", list, BackblastPubRecordExcel.class);
+
+ }
}
--
Gitblit v1.9.3