优化地图-添加地图页面以及设备树

648540858

2022-04-08 ba8633e99a27b90c55b47e8f7d6225f1f0efc6bb

 src/main/java/com/genersoft/iot/vmp/gb28181/event/online/OnlineEventListener.java

@@ -1,14 +1,13 @@
package com.genersoft.iot.vmp.gb28181.event.online;



import com.genersoft.iot.vmp.conf.SipConfig;

import com.genersoft.iot.vmp.conf.UserSetup;

import com.genersoft.iot.vmp.conf.UserSetting;

import com.genersoft.iot.vmp.gb28181.bean.Device;

import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;

import com.genersoft.iot.vmp.gb28181.event.EventPublisher;

import com.genersoft.iot.vmp.gb28181.event.subscribe.catalog.CatalogEvent;

import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;

import com.genersoft.iot.vmp.service.IDeviceService;

import com.genersoft.iot.vmp.storager.dao.dto.User;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import org.springframework.beans.factory.annotation.Autowired;

@@ -16,7 +15,7 @@
import org.springframework.stereotype.Component;



import com.genersoft.iot.vmp.common.VideoManagerConstants;

import com.genersoft.iot.vmp.storager.IVideoManagerStorager;

import com.genersoft.iot.vmp.storager.IVideoManagerStorage;

import com.genersoft.iot.vmp.utils.redis.RedisUtil;



import java.text.SimpleDateFormat;

@@ -35,7 +34,7 @@
   private final static Logger logger = LoggerFactory.getLogger(OnlineEventListener.class);



   @Autowired

   private IVideoManagerStorager storager;

   private IVideoManagerStorage storager;



   @Autowired

   private IDeviceService deviceService;

@@ -47,7 +46,7 @@
    private SipConfig sipConfig;



   @Autowired

    private UserSetup userSetup;

    private UserSetting userSetting;



   @Autowired

    private EventPublisher eventPublisher;

@@ -59,17 +58,13 @@


   @Override

   public void onApplicationEvent(OnlineEvent event) {

		
      if (logger.isDebugEnabled()) {

         logger.debug("设备上线事件触发，deviceId：" + event.getDevice().getDeviceId() + ",from:" + event.getFrom());

      }



      logger.info("设备上线事件触发，deviceId：" + event.getDevice().getDeviceId() + ",from:" + event.getFrom());

      Device device = event.getDevice();

      if (device == null) return;

      String key = VideoManagerConstants.KEEPLIVEKEY_PREFIX + userSetup.getServerId() + "_" + event.getDevice().getDeviceId();

      String key = VideoManagerConstants.KEEPLIVEKEY_PREFIX + userSetting.getServerId() + "_" + event.getDevice().getDeviceId();

      Device deviceInStore = storager.queryVideoDevice(device.getDeviceId());

      device.setOnline(1);

      // 处理上线监听

      storager.updateDevice(device);

      switch (event.getFrom()) {

      // 注册时触发的在线事件，先在redis中增加超时超时监听

      case VideoManagerConstants.EVENT_ONLINE_REGISTER:

@@ -98,12 +93,14 @@


         break;

      }



      // 处理上线监听

      storager.updateDevice(device);

      List<DeviceChannel> deviceChannelList = storager.queryOnlineChannelsByDeviceId(device.getDeviceId());

      eventPublisher.catalogEventPublish(null, deviceChannelList, CatalogEvent.ON);

      // 上线添加订阅

      if (device.getSubscribeCycleForCatalog() > 0) {

         deviceService.addCatalogSubscribe(device);

         deviceService.addMobilePositionSubscribe(device);

      }

   }

}