Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修复点播调用判断

dev/数据库统合
648540858 2024-12-12 12:44:11 +08:00
parent 0a06ae9475
commit 4056955c59
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/genersoft/iot/vmp/conf/redis/RedisRpcConfig.java
View File

@ -96,10 +96,10 @@ public class RedisRpcConfig implements MessageListener {
} else if (redisRpcMessage.getResponse() != null){ } else if (redisRpcMessage.getResponse() != null){
handlerResponse(redisRpcMessage.getResponse()); handlerResponse(redisRpcMessage.getResponse());
} else { } else {
log.error("[redis rpc 解析失败] {}", JSON.toJSONString(redisRpcMessage)); log.error("[redis-rpc]解析失败 {}", JSON.toJSONString(redisRpcMessage));
} }
} catch (Exception e) { } catch (Exception e) {
log.error("[redis rpc 解析异常] {}",new String(msg.getBody()), e); log.error("[redis-rpc]解析异常 {}",new String(msg.getBody()), e);
} }
} }
}); });
@ -146,7 +146,7 @@ public class RedisRpcConfig implements MessageListener {
} }
} }
}catch (InvocationTargetException | IllegalAccessException e) { }catch (InvocationTargetException | IllegalAccessException e) {
log.error("[redis rpc ] 处理请求失败 ", e); log.error("[redis-rpc ] 处理请求失败 ", e);
} }
} }

2
src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlayServiceImpl.java
View File

@ -293,7 +293,7 @@ public class PlayServiceImpl implements IPlayService {
public void play(Device device, DeviceChannel channel, ErrorCallback<StreamInfo> callback) { public void play(Device device, DeviceChannel channel, ErrorCallback<StreamInfo> callback) {
// 判断设备是否属于当前平台, 如果不属于则发起自动调用 // 判断设备是否属于当前平台, 如果不属于则发起自动调用
if (userSetting.getServerId().equals(device.getServerId())) { if (!userSetting.getServerId().equals(device.getServerId())) {
redisRpcPlayService.play(device.getServerId(), channel.getId(), callback); redisRpcPlayService.play(device.getServerId(), channel.getId(), callback);
}else { }else {
MediaServer mediaServerItem = getNewMediaServerItem(device); MediaServer mediaServerItem = getNewMediaServerItem(device);