From ef54994e4b077f20c207e3d5e745967c6d21d444 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Thu, 12 Feb 2026 10:15:40 +0800
Subject: [PATCH] 驾驶舱区域时间过滤
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/controller/CockpitController.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/controller/CockpitController.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/controller/CockpitController.java
index 9a84da1..a4d948c 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/controller/CockpitController.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/controller/CockpitController.java
@@ -14,6 +14,7 @@
import org.sxkj.fw.cockpit.service.ICockpitService;
import org.sxkj.fw.cockpit.vo.AlarmStatisticsVO;
import org.sxkj.fw.cockpit.vo.DeviceStatisticsVO;
+import org.sxkj.fw.cockpit.vo.SceneManageStatisticsVO;
import org.sxkj.fw.detection.param.FwEffectEvalParam;
import org.sxkj.fw.device.dto.FwDeviceDTO;
import org.sxkj.fw.device.vo.CockpitFwDeviceVO;
@@ -99,6 +100,19 @@
}
/**
+ * 场景管理与区域数量统计
+ */
+ @GetMapping("/sceneManageStatistics")
+ @ApiOperationSupport(order = 6)
+ @ApiOperation(value = "场景管理统计", notes = "返回场景管理数量与区域数量")
+ public R<SceneManageStatisticsVO> getSceneManageStatistics(
+ @ApiParam(value = "时间筛选（yyyy-MM-dd HH:mm:ss）") @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date time) {
+ Date filterTime = time == null ? new Date() : time;
+ SceneManageStatisticsVO statistics = cockpitService.statisticsSceneManageAndArea(filterTime);
+ return R.data(statistics);
+ }
+
+ /**
* 信号干扰，诱导驱离
*/
@PostMapping("/interferenceAndExpulsion")
@@ -120,7 +134,11 @@
@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 = cockpitService.selectFwAreaDivideList(filterSelected, sceneId, areaTypeKeys, isSetSceneManage, flyTime);
+ LocalDateTime filterFlyTime = flyTime;
+ if (isSetSceneManage != null && isSetSceneManage == 1 && flyTime == null) {
+ filterFlyTime = LocalDateTime.now();
+ }
+ List<FwAreaDivideVO> list = cockpitService.selectFwAreaDivideList(filterSelected, sceneId, areaTypeKeys, isSetSceneManage, filterFlyTime);
return R.data(list);
}
--
Gitblit v1.9.3