维护目录订阅消息与接口

648540858

2021-11-12 eca1e05aeed3c51cce36bbce80c71bc3cbcea87d

 src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java

@@ -1,11 +1,21 @@
package com.genersoft.iot.vmp.vmanager.gb28181.device;

import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
import com.genersoft.iot.vmp.gb28181.event.DeviceOffLineDetector;
import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.service.IDeviceService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -15,15 +25,6 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.async.DeferredResult;

import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.event.DeviceOffLineDetector;
import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;

import javax.sip.message.Response;
import java.io.UnsupportedEncodingException;
import java.util.UUID;

@Api(tags = "国标设备查询", value = "国标设备查询")
@@ -50,6 +51,9 @@
   @Autowired
   private DeviceOffLineDetector offLineDetector;

   @Autowired
   private IDeviceService deviceService;

   /**
    * 使用ID查询国标设备
    * @param deviceId 国标ID
@@ -62,9 +66,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 +88,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 +121,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 +165,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 +238,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<>();
@@ -302,6 +305,18 @@
         if (!StringUtils.isEmpty(device.getName())) deviceInStore.setName(device.getName());
         if (!StringUtils.isEmpty(device.getCharset())) deviceInStore.setCharset(device.getCharset());
         if (!StringUtils.isEmpty(device.getMediaServerId())) deviceInStore.setMediaServerId(device.getMediaServerId());

         if (deviceInStore.getSubscribeCycleForCatalog() <=0 && device.getSubscribeCycleForCatalog() > 0) {
            deviceInStore.setSubscribeCycleForCatalog(device.getSubscribeCycleForCatalog());
            // 开启订阅
            deviceService.addCatalogSubscribe(deviceInStore);
         }
         if (deviceInStore.getSubscribeCycleForCatalog() > 0 && device.getSubscribeCycleForCatalog() <= 0) {
            deviceInStore.setSubscribeCycleForCatalog(device.getSubscribeCycleForCatalog());
            // 取消订阅
            deviceService.removeCatalogSubscribe(deviceInStore);
         }

         storager.updateDevice(deviceInStore);
         cmder.deviceInfoQuery(deviceInStore);
      }
@@ -329,11 +344,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 +400,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);