From 953dd58984ed62fe71373cfcb48c0fb18cb5df05 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Thu, 29 Jan 2026 13:58:33 +0800
Subject: [PATCH] 区域划分优化
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwAreaDivideController.java | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 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 3dfcfd8..5c42f18 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,13 +27,13 @@
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.springblade.core.tool.utils.StringUtil;
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.dto.FwAreaDivideSubmitDTO;
import org.sxkj.fw.area.dto.FwAreaDivideStatisticsDTO;
import org.sxkj.fw.area.entity.FwAreaDivideEntity;
import org.sxkj.fw.area.vo.FwAreaDivideVO;
@@ -48,7 +48,6 @@
import springfox.documentation.annotations.ApiIgnore;
import java.util.Map;
import java.util.List;
-import java.util.Objects;
import javax.servlet.http.HttpServletResponse;
/**
@@ -86,11 +85,11 @@
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
- @ApiOperation(value = "列表", notes = "传入filterSelected或id")
+ @ApiOperation(value = "列表-不带分页", notes = "传入filterSelected或sceneId")
public R<List<FwAreaDivideVO>> list(
@ApiParam(value = "是否过滤已被选择的数据（1过滤 0不过滤）") @RequestParam(required = false) Integer filterSelected,
- @ApiParam(value = "场景id") @RequestParam(required = false) Long id) {
- List<FwAreaDivideVO> list = fwAreaDivideService.selectFwAreaDivideList(filterSelected, id);
+ @ApiParam(value = "场景id") @RequestParam(required = false) Long sceneId) {
+ List<FwAreaDivideVO> list = fwAreaDivideService.selectFwAreaDivideList(filterSelected, sceneId);
return R.data(list);
}
@@ -155,16 +154,20 @@
/**
* 区域划分表 新增或修改
+ * 说明：入参包含主表对象与扩展面列表；保存主表成功后批量写入扩展面数据
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
- @ApiOperation(value = "新增或修改", notes = "传入fwAreaDivide")
- public R submit(@Valid @RequestBody FwAreaDivideDTO fwAreaDivide) {
- FwAreaDivideEntity fwAreaDivideEntity = Objects.requireNonNull(BeanUtil.copy(fwAreaDivide, FwAreaDivideEntity.class));
- if (isGeomInvalid(fwAreaDivideEntity.getGeom())) {
- return R.fail("几何数据格式不正确");
+ @ApiOperation(value = "新增或修改", notes = "传入主表对象与扩展面列表")
+ public R submit(@Valid @RequestBody FwAreaDivideSubmitDTO fwAreaDivideSubmit) {
+ if (fwAreaDivideSubmit == null || fwAreaDivideSubmit.getAreaDivide() == null) {
+ return R.fail("区域信息不能为空");
}
- return R.status(fwAreaDivideService.saveOrUpdate(fwAreaDivideEntity));
+ FwAreaDivideEntity fwAreaDivideEntity = fwAreaDivideSubmit.getAreaDivide();
+// if (isGeomInvalid(fwAreaDivideEntity.getGeom())) {
+// return R.fail("几何数据格式不正确");
+// }
+ return R.status(fwAreaDivideService.saveOrUpdateWithExt(fwAreaDivideEntity, fwAreaDivideSubmit.getAreaDivideExtList()));
}
/**
--
Gitblit v1.9.3