songww
2020-05-16 ba6d84cdc82bd2b5aa938b3b4abd122cc8e77b1b
src/main/java/com/genersoft/iot/vmp/vmanager/record/RecordController.java
@@ -31,17 +31,18 @@
   @Autowired
   private DeferredResultHolder resultHolder;
   
   @GetMapping("/recordinfo/{deviceId}")
   public DeferredResult<ResponseEntity<RecordInfo>> recordinfo(@PathVariable String deviceId, String startTime,  String endTime){
   @GetMapping("/record/{deviceId}/{channelId}")
   public DeferredResult<ResponseEntity<RecordInfo>> recordinfo(@PathVariable String deviceId,@PathVariable String channelId, String startTime,  String endTime){
      
      if (logger.isDebugEnabled()) {
         logger.debug(String.format("录像信息 API调用,deviceId:%s ,startTime:%s, startTime:%s",deviceId, startTime, endTime));
         logger.debug(String.format("录像信息查询 API调用,deviceId:%s ,startTime:%s, startTime:%s",deviceId, startTime, endTime));
      }
      
      Device device = storager.queryVideoDevice(deviceId);
      cmder.recordInfoQuery(device, startTime, endTime);
      cmder.recordInfoQuery(device, channelId, startTime, endTime);
      DeferredResult<ResponseEntity<RecordInfo>> result = new DeferredResult<ResponseEntity<RecordInfo>>();
      resultHolder.put(DeferredResultHolder.CALLBACK_CMD_CATALOG+deviceId, result);
      // 录像查询以channelId作为deviceId查询
      resultHolder.put(DeferredResultHolder.CALLBACK_CMD_RECORDINFO+channelId, result);
        return result;
   }
}