From 1bfbc52da47b22f00a1c1f5f670c30f70d999873 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 02 Feb 2026 18:18:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwAreaDivideController.java | 38 +++++++++++++++++---------------------
1 files changed, 17 insertions(+), 21 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 77a9db3..43ce15e 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,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.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;
@@ -45,10 +44,11 @@
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import org.sxkj.fw.record.entity.FwDroneAlarmRecordEntity;
+import org.springframework.format.annotation.DateTimeFormat;
import springfox.documentation.annotations.ApiIgnore;
import java.util.Map;
import java.util.List;
-import java.util.Objects;
+import java.time.LocalDateTime;
import javax.servlet.http.HttpServletResponse;
/**
@@ -86,11 +86,14 @@
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
- @ApiOperation(value = "列表-不带分页", notes = "传入filterSelected或sceneId")
+ @ApiOperation(value = "列表-不带分页", notes = "传入filterSelected或sceneId或areaTypeKeys或isSetSceneManage或flyTime")
public R<List<FwAreaDivideVO>> list(
@ApiParam(value = "是否过滤已被选择的数据（1过滤 0不过滤）") @RequestParam(required = false) Integer filterSelected,
- @ApiParam(value = "场景id") @RequestParam(required = false) Long sceneId) {
- List<FwAreaDivideVO> list = fwAreaDivideService.selectFwAreaDivideList(filterSelected, sceneId);
+ @ApiParam(value = "场景id") @RequestParam(required = false) Long sceneId,
+ @ApiParam(value = "区域类型key集合（逗号分隔）") @RequestParam(required = false) String areaTypeKeys,
+ @ApiParam(value = "是否按场景管理过滤（1是 0或空否）") @RequestParam(required = false) Integer isSetSceneManage,
+ @ApiParam(value = "时间筛选（yyyy-MM-dd HH:mm:ss）") @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime flyTime) {
+ List<FwAreaDivideVO> list = fwAreaDivideService.selectFwAreaDivideList(filterSelected, sceneId, areaTypeKeys, isSetSceneManage, flyTime);
return R.data(list);
}
@@ -155,16 +158,17 @@
/**
* 区域划分表 新增或修改
+ * 说明：入参包含主表对象与扩展面列表；保存主表成功后批量写入扩展面数据
*/
@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("几何数据格式不正确");
-// }
- return R.status(fwAreaDivideService.saveOrUpdate(fwAreaDivideEntity));
+ @ApiOperation(value = "新增或修改", notes = "传入主表对象与扩展面列表")
+ public R submit(@Valid @RequestBody FwAreaDivideSubmitDTO fwAreaDivideSubmit) {
+ if (fwAreaDivideSubmit == null || fwAreaDivideSubmit.getAreaDivide() == null) {
+ return R.fail("区域信息不能为空");
+ }
+ FwAreaDivideEntity fwAreaDivideEntity = fwAreaDivideSubmit.getAreaDivide();
+ return R.status(fwAreaDivideService.saveOrUpdateWithExt(fwAreaDivideEntity, fwAreaDivideSubmit.getAreaDivideExtList()));
}
/**
@@ -193,14 +197,6 @@
queryWrapper.lambda().eq(FwAreaDivideEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
List<FwAreaDivideExcel> list = fwAreaDivideService.exportFwAreaDivide(queryWrapper);
ExcelUtil.export(response, "区域划分表数据" + DateUtil.time(), "区域划分表数据表", list, FwAreaDivideExcel.class);
- }
-
- private boolean isGeomInvalid(String geom) {
- if (StringUtil.isBlank(geom)) {
- return false;
- }
- String upper = geom.trim().toUpperCase();
- return !upper.contains("POLYGON");
}
}
--
Gitblit v1.9.3