|
@@ -63,11 +63,13 @@ public class NettyServerHandler implements ChannelInboundHandler {
|
|
|
redisService.setCacheObject(relayCode + ":" + bit, status, 3 * 60L, TimeUnit.SECONDS);
|
|
redisService.setCacheObject(relayCode + ":" + bit, status, 3 * 60L, TimeUnit.SECONDS);
|
|
|
}
|
|
}
|
|
|
}else if(dataStr.endsWith(SocketTypes.NRKJ_PREFIX) || dataStr.contains(SocketTypes.NRKJ_IDENTIFY)){
|
|
}else if(dataStr.endsWith(SocketTypes.NRKJ_PREFIX) || dataStr.contains(SocketTypes.NRKJ_IDENTIFY)){
|
|
|
|
|
+ dataStr=dataStr.replace(RelayConstants.SPACE_WRAP,"");
|
|
|
String codeStr=dataStr.substring(0,17);
|
|
String codeStr=dataStr.substring(0,17);
|
|
|
String relayCode=codeStr.replace(":","");
|
|
String relayCode=codeStr.replace(":","");
|
|
|
- //回复ack
|
|
|
|
|
|
|
+ log.info("relayCode:"+relayCode+"channelHandlerContext:"+channelHandlerContext);
|
|
|
|
|
+ //回复ack
|
|
|
ChannelMap.getChannelMap().put(relayCode, channelHandlerContext);
|
|
ChannelMap.getChannelMap().put(relayCode, channelHandlerContext);
|
|
|
- NettyPushMsgService.push(relayCode,RelayConstants.AT_ACK.getBytes());
|
|
|
|
|
|
|
+ NettyPushMsgService.push(relayCode, RelayConstants.AT_ACK.getBytes());
|
|
|
//注册状态更新
|
|
//注册状态更新
|
|
|
RelayUtils.relayRefreshStatus(dataStr,relayCode,codeStr);
|
|
RelayUtils.relayRefreshStatus(dataStr,relayCode,codeStr);
|
|
|
//继电器开关
|
|
//继电器开关
|