From dbc7e62be76ff48b26461ffaef9c3fc87be018cb Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 11 Feb 2026 11:05:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/controller/CockpitController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 90b06e6..5440e6e 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
@@ -105,8 +105,10 @@
@GetMapping("/sceneManageStatistics")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "场景管理统计", notes = "返回场景管理数量与区域数量")
- public R<SceneManageStatisticsVO> getSceneManageStatistics() {
- SceneManageStatisticsVO statistics = cockpitService.statisticsSceneManageAndArea();
+ 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);
}
--
Gitblit v1.9.3