Merge remote-tracking branch 'origin/master'

linwei

2026-02-11 dbc7e62be76ff48b26461ffaef9c3fc87be018cb

 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);
   }