吉安感知网项目-后端
linwei
2 days ago 51a551a7f8eae7654f973d45cd2fa2952774673d
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);
   }
@@ -132,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);
   }