From 58ab95398518445ee6e8fb83a5a95ee534fd0541 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 08 Jan 2026 19:02:28 +0800
Subject: [PATCH] 记录优化

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwAreaDivideController.java |   49 +++++++++++++++++++++++++++----------------------
 1 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwAreaDivideController.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwAreaDivideController.java
index f75dc5d..c422d4a 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwAreaDivideController.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwAreaDivideController.java
@@ -27,10 +27,12 @@
 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.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.sxkj.fw.area.dto.FwAreaDivideDTO;
 import org.sxkj.fw.area.entity.FwAreaDivideEntity;
 import org.sxkj.fw.area.vo.FwAreaDivideVO;
 import org.sxkj.fw.area.excel.FwAreaDivideExcel;
@@ -40,9 +42,11 @@
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.tool.constant.BladeConstant;
+import org.sxkj.fw.record.entity.FwDroneAlarmRecordEntity;
 import springfox.documentation.annotations.ApiIgnore;
 import java.util.Map;
 import java.util.List;
+import java.util.Objects;
 import javax.servlet.http.HttpServletResponse;
 
 /**
@@ -72,13 +76,13 @@
 	/**
 	 * 区域划分表 分页
 	 */
-	@GetMapping("/list")
-	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "分页", notes = "传入fwAreaDivide")
-	public R<IPage<FwAreaDivideVO>> list(@ApiIgnore @RequestParam Map<String, Object> fwAreaDivide, Query query) {
-		IPage<FwAreaDivideEntity> pages = fwAreaDivideService.page(Condition.getPage(query), Condition.getQueryWrapper(fwAreaDivide, FwAreaDivideEntity.class));
-		return R.data(FwAreaDivideWrapper.build().pageVO(pages));
-	}
+	// @GetMapping("/list")
+	// @ApiOperationSupport(order = 2)
+	// @ApiOperation(value = "分页", notes = "传入fwAreaDivide")
+	// public R<IPage<FwAreaDivideVO>> list(@ApiIgnore @RequestParam Map<String, Object> fwAreaDivide, Query query) {
+	// 	IPage<FwAreaDivideEntity> pages = fwAreaDivideService.page(Condition.getPage(query), Condition.getQueryWrapper(fwAreaDivide, FwAreaDivideEntity.class));
+	// 	return R.data(FwAreaDivideWrapper.build().pageVO(pages));
+	// }
 
 	/**
 	 * 区域划分表 自定义分页
@@ -86,7 +90,7 @@
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "分页", notes = "传入fwAreaDivide")
-	public R<IPage<FwAreaDivideVO>> page(FwAreaDivideVO fwAreaDivide, Query query) {
+	public R<IPage<FwAreaDivideVO>> page(FwAreaDivideDTO fwAreaDivide, Query query) {
 		IPage<FwAreaDivideVO> pages = fwAreaDivideService.selectFwAreaDividePage(Condition.getPage(query), fwAreaDivide);
 		return R.data(pages);
 	}
@@ -94,22 +98,22 @@
 	/**
 	 * 区域划分表 新增
 	 */
-	@PostMapping("/save")
-	@ApiOperationSupport(order = 4)
-	@ApiOperation(value = "新增", notes = "传入fwAreaDivide")
-	public R save(@Valid @RequestBody FwAreaDivideEntity fwAreaDivide) {
-		return R.status(fwAreaDivideService.save(fwAreaDivide));
-	}
+	// @PostMapping("/save")
+	// @ApiOperationSupport(order = 4)
+	// @ApiOperation(value = "新增", notes = "传入fwAreaDivide")
+	// public R save(@Valid @RequestBody FwAreaDivideEntity fwAreaDivide) {
+	// 	return R.status(fwAreaDivideService.save(fwAreaDivide));
+	// }
 
 	/**
 	 * 区域划分表 修改
 	 */
-	@PostMapping("/update")
-	@ApiOperationSupport(order = 5)
-	@ApiOperation(value = "修改", notes = "传入fwAreaDivide")
-	public R update(@Valid @RequestBody FwAreaDivideEntity fwAreaDivide) {
-		return R.status(fwAreaDivideService.updateById(fwAreaDivide));
-	}
+	// @PostMapping("/update")
+	// @ApiOperationSupport(order = 5)
+	// @ApiOperation(value = "修改", notes = "传入fwAreaDivide")
+	// public R update(@Valid @RequestBody FwAreaDivideEntity fwAreaDivide) {
+	// 	return R.status(fwAreaDivideService.updateById(fwAreaDivide));
+	// }
 
 	/**
 	 * 区域划分表 新增或修改
@@ -117,8 +121,9 @@
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入fwAreaDivide")
-	public R submit(@Valid @RequestBody FwAreaDivideEntity fwAreaDivide) {
-		return R.status(fwAreaDivideService.saveOrUpdate(fwAreaDivide));
+	public R submit(@Valid @RequestBody FwAreaDivideDTO fwAreaDivide) {
+		FwAreaDivideEntity fwAreaDivideEntity = Objects.requireNonNull(BeanUtil.copy(fwAreaDivide, FwAreaDivideEntity.class));
+		return R.status(fwAreaDivideService.saveOrUpdate(fwAreaDivideEntity));
 	}
 
 	/**

--
Gitblit v1.9.3