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 | 99 +++++++++++++++++++++++++++++++++++++------------
1 files changed, 75 insertions(+), 24 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..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
@@ -31,18 +31,24 @@
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;
+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 org.springframework.format.annotation.DateTimeFormat;
import springfox.documentation.annotations.ApiIgnore;
import java.util.Map;
import java.util.List;
+import java.time.LocalDateTime;
import javax.servlet.http.HttpServletResponse;
/**
@@ -64,20 +70,31 @@
*/
@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或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,
+ @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);
}
/**
@@ -86,39 +103,72 @@
@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));
+// }
/**
* 区域划分表 新增或修改
+ * 说明：入参包含主表对象与扩展面列表；保存主表成功后批量写入扩展面数据
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
- @ApiOperation(value = "新增或修改", notes = "传入fwAreaDivide")
- public R submit(@Valid @RequestBody FwAreaDivideEntity fwAreaDivide) {
- return R.status(fwAreaDivideService.saveOrUpdate(fwAreaDivide));
+ @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()));
}
/**
@@ -135,6 +185,7 @@
/**
* 导出数据
*/
+ @ApiIgnore
@GetMapping("/export-fwAreaDivide")
@ApiOperationSupport(order = 9)
@ApiOperation(value = "导出数据", notes = "传入fwAreaDivide")
--
Gitblit v1.9.3