From 2e98f7678b2dab62f15ff1d0807281f7c9a3d075 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 09 Feb 2026 17:06:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/controller/CockpitController.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 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..90b06e6 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,17 @@
}
/**
+ * 场景管理与区域数量统计
+ */
+ @GetMapping("/sceneManageStatistics")
+ @ApiOperationSupport(order = 6)
+ @ApiOperation(value = "场景管理统计", notes = "返回场景管理数量与区域数量")
+ public R<SceneManageStatisticsVO> getSceneManageStatistics() {
+ SceneManageStatisticsVO statistics = cockpitService.statisticsSceneManageAndArea();
+ return R.data(statistics);
+ }
+
+ /**
* 信号干扰，诱导驱离
*/
@PostMapping("/interferenceAndExpulsion")
--
Gitblit v1.9.3