guzijian / wvp-GB28181-pro · Commits

Commit 662a70e20f78e186c8a945c8cf51c70266951bd7

Authored by 648540858
1 parent 0f0ece24

修复设备信息后同步redis

Inline Side-by-side
Showing 2 changed files with 4 additions and 1 deletions
src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
  View file @662a70e
@@ -566,6 +566,9 @@ public class DeviceServiceImpl implements IDeviceService { @@ -566,6 +566,9 @@ public class DeviceServiceImpl implements IDeviceService {
566 if (!ObjectUtils.isEmpty(device.getMediaServerId())) { 566 if (!ObjectUtils.isEmpty(device.getMediaServerId())) {
567 deviceInStore.setMediaServerId(device.getMediaServerId()); 567 deviceInStore.setMediaServerId(device.getMediaServerId());
568 } 568 }
  569 + deviceInStore.setSdpIp(device.getSdpIp());
  570 + deviceInStore.setCharset(device.getCharset());
  571 + deviceInStore.setTreeType(device.getTreeType());
569 572
570 // 目录订阅相关的信息 573 // 目录订阅相关的信息
571 if (device.getSubscribeCycleForCatalog() > 0) { 574 if (device.getSubscribeCycleForCatalog() > 0) {
@@ -601,6 +604,7 @@ public class DeviceServiceImpl implements IDeviceService { @@ -601,6 +604,7 @@ public class DeviceServiceImpl implements IDeviceService {
601 updateDeviceChannelGeoCoordSys(device); 604 updateDeviceChannelGeoCoordSys(device);
602 } 605 }
603 // 更新redis 606 // 更新redis
  607 + redisCatchStorage.updateDevice(device);
604 deviceMapper.updateCustom(device); 608 deviceMapper.updateCustom(device);
605 } 609 }
606 610
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
  View file @662a70e
@@ -260,7 +260,6 @@ public class PlayServiceImpl implements IPlayService { @@ -260,7 +260,6 @@ public class PlayServiceImpl implements IPlayService {
260 // 超时处理 260 // 超时处理
261 String timeOutTaskKey = UUID.randomUUID().toString(); 261 String timeOutTaskKey = UUID.randomUUID().toString();
262 SSRCInfo finalSsrcInfo = ssrcInfo; 262 SSRCInfo finalSsrcInfo = ssrcInfo;
263 - System.out.println("设置超时任务： " + timeOutTaskKey);  
264 dynamicTask.startDelay(timeOutTaskKey, () -> { 263 dynamicTask.startDelay(timeOutTaskKey, () -> {
265 264
266 logger.info("[点播超时] 收流超时 deviceId: {}, channelId: {}，端口：{}, SSRC: {}", device.getDeviceId(), channelId, finalSsrcInfo.getPort(), finalSsrcInfo.getSsrc()); 265 logger.info("[点播超时] 收流超时 deviceId: {}, channelId: {}，端口：{}, SSRC: {}", device.getDeviceId(), channelId, finalSsrcInfo.getPort(), finalSsrcInfo.getSsrc());