From e5cc27b36eba4d8483fd3fabf5052e8f63629002 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 29 Jan 2026 13:05:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwAreaDivideController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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..77a9db3 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
@@ -86,11 +86,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);
}
@@ -161,9 +161,9 @@
@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("几何数据格式不正确");
- }
+// if (isGeomInvalid(fwAreaDivideEntity.getGeom())) {
+// return R.fail("几何数据格式不正确");
+// }
return R.status(fwAreaDivideService.saveOrUpdate(fwAreaDivideEntity));
}
--
Gitblit v1.9.3