From ba0fbe5e47b484d3c2cc89b8d28f78c7ecf9b44c Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Tue, 13 Jan 2026 11:16:18 +0800
Subject: [PATCH] 场景，区域的列表新增父子级id查询
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwAreaDivideController.java | 101 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 78 insertions(+), 23 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..3dfcfd8 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,22 +27,28 @@
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.FwAreaDivideStatisticsDTO;
import org.sxkj.fw.area.entity.FwAreaDivideEntity;
import org.sxkj.fw.area.vo.FwAreaDivideVO;
+import org.sxkj.fw.area.vo.FwAreaDivideStatisticsVO;
import org.sxkj.fw.area.excel.FwAreaDivideExcel;
-import org.sxkj.fw.area.wrapper.FwAreaDivideWrapper;
import org.sxkj.fw.area.service.IFwAreaDivideService;
import org.springblade.core.boot.ctrl.BladeController;
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;
/**
@@ -64,20 +70,28 @@
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
- @ApiOperation(value = "详情", notes = "传入fwAreaDivide")
- public R<FwAreaDivideVO> detail(FwAreaDivideEntity fwAreaDivide) {
- FwAreaDivideEntity detail = fwAreaDivideService.getOne(Condition.getQueryWrapper(fwAreaDivide));
- return R.data(FwAreaDivideWrapper.build().entityVO(detail));
+ @ApiOperation(value = "详情", notes = "传入id")
+ public R<FwAreaDivideVO> detail(@ApiParam(value = "主键id", required = true) @RequestParam Long id) {
+ if (id == null) {
+ return R.fail("主键不能为空");
+ }
+ FwAreaDivideVO detail = fwAreaDivideService.selectFwAreaDivideDetail(id);
+ if (detail == null) {
+ return R.fail("数据不存在");
+ }
+ return R.data(detail);
}
/**
- * 区域划分表 分页
+ * 区域划分表 列表
*/
@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));
+ @ApiOperation(value = "列表", notes = "传入filterSelected或id")
+ 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);
+ return R.data(list);
}
/**
@@ -86,30 +100,58 @@
@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);
}
/**
- * 区域划分表 新增
+ * 区域划分统计 分页
*/
- @PostMapping("/save")
+ @GetMapping("/divideStatisticsPage")
@ApiOperationSupport(order = 4)
- @ApiOperation(value = "新增", notes = "传入fwAreaDivide")
- public R save(@Valid @RequestBody FwAreaDivideEntity fwAreaDivide) {
- return R.status(fwAreaDivideService.save(fwAreaDivide));
+ @ApiOperation(value = "统计分页", notes = "传入统计条件")
+ public R<IPage<FwAreaDivideStatisticsVO>> divideStatisticsPage(FwAreaDivideStatisticsDTO fwAreaDivideStatistics, Query query) {
+ IPage<FwAreaDivideStatisticsVO> pages = fwAreaDivideService.selectFwAreaDivideStatisticsPage(Condition.getPage(query), fwAreaDivideStatistics);
+ return R.data(pages);
}
/**
- * 区域划分表 修改
+ * 区域划分统计 详情
*/
- @PostMapping("/update")
+ @GetMapping("/statisticsDetail")
@ApiOperationSupport(order = 5)
- @ApiOperation(value = "修改", notes = "传入fwAreaDivide")
- public R update(@Valid @RequestBody FwAreaDivideEntity fwAreaDivide) {
- return R.status(fwAreaDivideService.updateById(fwAreaDivide));
+ @ApiOperation(value = "统计详情", notes = "传入id")
+ public R<FwAreaDivideStatisticsVO> statisticsDetail(FwAreaDivideStatisticsDTO fwAreaDivideStatistics) {
+ if (fwAreaDivideStatistics == null || fwAreaDivideStatistics.getId() == null) {
+ return R.fail("主键不能为空");
+ }
+ FwAreaDivideStatisticsVO detail = fwAreaDivideService.selectFwAreaDivideStatisticsDetail(fwAreaDivideStatistics);
+ if (detail == null) {
+ return R.fail("数据不存在");
+ }
+ return R.data(detail);
}
+
+ /**
+ * 区域划分表 新增
+ */
+ // @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));
+// }
/**
* 区域划分表 新增或修改
@@ -117,8 +159,12 @@
@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));
+ if (isGeomInvalid(fwAreaDivideEntity.getGeom())) {
+ return R.fail("几何数据格式不正确");
+ }
+ return R.status(fwAreaDivideService.saveOrUpdate(fwAreaDivideEntity));
}
/**
@@ -135,6 +181,7 @@
/**
* 导出数据
*/
+ @ApiIgnore
@GetMapping("/export-fwAreaDivide")
@ApiOperationSupport(order = 9)
@ApiOperation(value = "导出数据", notes = "传入fwAreaDivide")
@@ -148,4 +195,12 @@
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