diff --git a/src/main/java/com/genersoft/iot/vmp/conf/redis/RedisRpcConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/redis/RedisRpcConfig.java index a70563fb..1ccaf011 100644 --- a/src/main/java/com/genersoft/iot/vmp/conf/redis/RedisRpcConfig.java +++ b/src/main/java/com/genersoft/iot/vmp/conf/redis/RedisRpcConfig.java @@ -96,10 +96,10 @@ public class RedisRpcConfig implements MessageListener { } else if (redisRpcMessage.getResponse() != null){ handlerResponse(redisRpcMessage.getResponse()); } else { - log.error("[redis rpc 解析失败] {}", JSON.toJSONString(redisRpcMessage)); + log.error("[redis-rpc]解析失败 {}", JSON.toJSONString(redisRpcMessage)); } } 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) { - log.error("[redis rpc ] 处理请求失败 ", e); + log.error("[redis-rpc ] 处理请求失败 ", e); } } diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlayServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlayServiceImpl.java index e631a6cd..f6392ba2 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlayServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlayServiceImpl.java @@ -293,7 +293,7 @@ public class PlayServiceImpl implements IPlayService { public void play(Device device, DeviceChannel channel, ErrorCallback callback) { // 判断设备是否属于当前平台, 如果不属于则发起自动调用 - if (userSetting.getServerId().equals(device.getServerId())) { + if (!userSetting.getServerId().equals(device.getServerId())) { redisRpcPlayService.play(device.getServerId(), channel.getId(), callback); }else { MediaServer mediaServerItem = getNewMediaServerItem(device);