Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial

648540858

2022-05-06 22d8d22238d00f9d49c1786dda999d1f3e77c6c1

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

@@ -62,7 +62,9 @@


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

      Device device = event.getDevice();

      if (device == null) return;

      if (device == null) {

         return;

      }

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

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

      device.setOnline(1);