648540858
2021-11-02 b1e5a869167112869b9fd85c0830686edb306bf5
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java
@@ -62,9 +62,9 @@
   @GetMapping("/devices/{deviceId}")
   public ResponseEntity<Device> devices(@PathVariable String deviceId){
      
      if (logger.isDebugEnabled()) {
         logger.debug("查询视频设备API调用,deviceId:" + deviceId);
      }
//      if (logger.isDebugEnabled()) {
//         logger.debug("查询视频设备API调用,deviceId:" + deviceId);
//      }
      
      Device device = storager.queryVideoDevice(deviceId);
      return new ResponseEntity<>(device,HttpStatus.OK);
@@ -84,9 +84,9 @@
   @GetMapping("/devices")
   public PageInfo<Device> devices(int page, int count){
      
      if (logger.isDebugEnabled()) {
         logger.debug("查询所有视频设备API调用");
      }
//      if (logger.isDebugEnabled()) {
//         logger.debug("查询所有视频设备API调用");
//      }
      
      return storager.queryVideoDeviceList(page, count);
   }
@@ -117,9 +117,9 @@
                                    @RequestParam(required = false) String query,
                                    @RequestParam(required = false) Boolean online,
                                    @RequestParam(required = false) Boolean channelType) {
      if (logger.isDebugEnabled()) {
         logger.debug("查询视频设备通道API调用");
      }
//      if (logger.isDebugEnabled()) {
//         logger.debug("查询视频设备通道API调用");
//      }
      if (StringUtils.isEmpty(query)) {
         query = null;
      }
@@ -161,11 +161,10 @@
         return result;
      }
        cmder.catalogQuery(device, event -> {
         Response response = event.getResponse();
         RequestMessage msg = new RequestMessage();
         msg.setKey(key);
         msg.setId(uuid);
         msg.setData(String.format("同步通道失败,错误码: %s, %s", response.getStatusCode(), response.getReasonPhrase()));
         msg.setData(String.format("同步通道失败,错误码: %s, %s", event.statusCode, event.msg));
         resultHolder.invokeAllResult(msg);
      });
@@ -235,9 +234,9 @@
                                      @RequestParam(required = false) String online,
                                      @RequestParam(required = false) Boolean channelType){
      if (logger.isDebugEnabled()) {
         logger.debug("查询所有视频通道API调用");
      }
//      if (logger.isDebugEnabled()) {
//         logger.debug("查询所有视频通道API调用");
//      }
      DeviceChannel deviceChannel = storager.queryChannel(deviceId,channelId);
      if (deviceChannel == null) {
         PageInfo<DeviceChannel> deviceChannelPageResult = new PageInfo<>();
@@ -329,11 +328,10 @@
      String uuid = UUID.randomUUID().toString();
      String key = DeferredResultHolder.CALLBACK_CMD_DEVICESTATUS + deviceId;
      cmder.deviceStatusQuery(device, event -> {
         Response response = event.getResponse();
         RequestMessage msg = new RequestMessage();
         msg.setId(uuid);
         msg.setKey(key);
         msg.setData(String.format("获取设备状态失败,错误码: %s, %s", response.getStatusCode(), response.getReasonPhrase()));
         msg.setData(String.format("获取设备状态失败,错误码: %s, %s", event.statusCode, event.msg));
         resultHolder.invokeResult(msg);
      });
        DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>(2*1000L);
@@ -386,11 +384,10 @@
      String key = DeferredResultHolder.CALLBACK_CMD_ALARM + deviceId;
      String uuid = UUID.randomUUID().toString();
      cmder.alarmInfoQuery(device, startPriority, endPriority, alarmMethod, alarmType, startTime, endTime, event -> {
         Response response = event.getResponse();
         RequestMessage msg = new RequestMessage();
         msg.setId(uuid);
         msg.setKey(key);
         msg.setData(String.format("设备报警查询失败,错误码: %s, %s", response.getStatusCode(), response.getReasonPhrase()));
         msg.setData(String.format("设备报警查询失败,错误码: %s, %s",event.statusCode, event.msg));
         resultHolder.invokeResult(msg);
      });
        DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String >> (3 * 1000L);