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/BackblastWarnHanRecController.java |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/backblast/controller/BackblastWarnHanRecController.java b/src/main/java/org/springblade/modules/backblast/controller/BackblastWarnHanRecController.java
index f35fdb3..effd7c1 100644
--- a/src/main/java/org/springblade/modules/backblast/controller/BackblastWarnHanRecController.java
+++ b/src/main/java/org/springblade/modules/backblast/controller/BackblastWarnHanRecController.java
@@ -23,10 +23,13 @@
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
+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.Func;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -49,6 +52,7 @@
 public class BackblastWarnHanRecController{
 
 	private final IBackblastWarnHanRecService backblastWarnHanRecService;
+	private final BladeLogger bladeLogger;
 
 	/**
 	 * 反炸预警处置记录表 详情
@@ -76,8 +80,10 @@
 	 */
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
+	@ApiLog("反炸预警处置记录表 自定义分页")
 	@ApiOperation(value = "分页", notes = "传入backblastWarnHanRec")
 	public R<IPage<BackblastWarnHanRecVO>> page(BackblastWarnHanRecVO backblastWarnHanRec, Query query) {
+		bladeLogger.info("反炸预警处置记录表 自定义分页", JsonUtil.toJson(backblastWarnHanRec));
 		IPage<BackblastWarnHanRecVO> pages = backblastWarnHanRecService.selectBackblastWarnHanRecPage(Condition.getPage(query), backblastWarnHanRec);
 		return R.data(pages);
 	}
@@ -117,8 +123,10 @@
 	 */
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
+	@ApiLog("反炸预警处置记录表 删除")
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		bladeLogger.info("反炸预警处置记录表 删除", JsonUtil.toJson(ids));
 		return R.status(backblastWarnHanRecService.removeByIds(Func.toLongList(ids)));
 	}
 
@@ -127,10 +135,24 @@
 	 */
 	@PostMapping("/saveOrUpdate")
 	@ApiOperationSupport(order = 8)
+	@ApiLog("反炸预警处置记录表 自定义新增或修改")
 	@ApiOperation(value = "自定义新增或修改", notes = "传入backblastWarnHanRec")
 	public R saveOrUpdate(@Valid @RequestBody BackblastWarnHanRecEntity backblastWarnHanRec) {
+		bladeLogger.info("反炸预警处置记录表 自定义新增或修改", JsonUtil.toJson(backblastWarnHanRec));
 		return R.status(backblastWarnHanRecService.saveOrUpdateBackblastWarnHanRecEntity(backblastWarnHanRec));
 	}
 
 
+	/**
+	 * 反炸预警处置记录表 自定义详情
+	 */
+	@GetMapping("/getDetail")
+	@ApiOperationSupport(order = 9)
+	@ApiLog("反炸预警处置记录表 自定义详情")
+	@ApiOperation(value = "详情", notes = "传入backblastWarnHanRec")
+	public R getDetail(BackblastWarnHanRecVO backblastWarnHanRec) {
+		bladeLogger.info("反炸预警处置记录表 自定义详情", JsonUtil.toJson(backblastWarnHanRec));
+		BackblastWarnHanRecVO detail = backblastWarnHanRecService.getDetail(backblastWarnHanRec);
+		return R.data(detail);
+	}
 }

--
Gitblit v1.9.3