diff --git a/src/main/java/com/zjyr/beidouservice/adapter/impl/netty/ChannelInit.java b/src/main/java/com/zjyr/beidouservice/adapter/impl/netty/ChannelInit.java index 103538b..4ae9b13 100644 --- a/src/main/java/com/zjyr/beidouservice/adapter/impl/netty/ChannelInit.java +++ b/src/main/java/com/zjyr/beidouservice/adapter/impl/netty/ChannelInit.java @@ -28,9 +28,12 @@ public class ChannelInit extends ChannelInitializer { @Override protected void initChannel(SocketChannel channel) { - channel.pipeline().addLast("idle", new IdleStateHandler(0, 0, 60, TimeUnit.SECONDS)).addLast("decode", - new YuanRongProtocolDecode()) - .addLast("startFlag", new ProtocolStartEncode(2)).addLast("encode", new YuanRongProtocolEncode()) + channel.pipeline() + .addLast("idle", new IdleStateHandler(0, 0, 60, TimeUnit.SECONDS)) + .addLast("decode", + new YuanRongProtocolDecode()) + .addLast("startFlag", new ProtocolStartEncode(2)) + .addLast("encode", new YuanRongProtocolEncode()) .addLast("message", messageHandler); } } diff --git a/src/main/java/com/zjyr/beidouservice/adapter/impl/netty/MessageHandler.java b/src/main/java/com/zjyr/beidouservice/adapter/impl/netty/MessageHandler.java index 7c3fced..2f30e8d 100644 --- a/src/main/java/com/zjyr/beidouservice/adapter/impl/netty/MessageHandler.java +++ b/src/main/java/com/zjyr/beidouservice/adapter/impl/netty/MessageHandler.java @@ -46,9 +46,11 @@ public class MessageHandler extends SimpleChannelInboundHandler msgCont = MessageContent.builder().msgBody( - new HeartProtocol()).build(); - BaseBinaryProtocol h = BaseBinaryProtocol.builder().msgContent(msgCont) + MessageContent msgCont = MessageContent.builder() + .msgBody(new HeartProtocol()) + .build(); + BaseBinaryProtocol h = BaseBinaryProtocol.builder() + .msgContent(msgCont) .build(); ctx.writeAndFlush(h); @@ -73,9 +75,12 @@ public class MessageHandler extends SimpleChannelInboundHandler list = controlDeviceMapper.selectAll(); log.info("{}:: Connected <-- {}:{}", ctx.channel().id(), sa.getAddress().getHostAddress(), sa.getPort()); - controlDeviceMapper.addControlDevice(ControlDevice.builder().deviceType(ControlDeviceTypeName.DEVICE_SOCKET_TCP) - .deviceAddr(sa.getAddress().getHostAddress()).build()); - MessageContent msgCont = MessageContent.builder().msgBody(new HeartProtocol()) + controlDeviceMapper.addControlDevice(ControlDevice.builder() + .deviceType(ControlDeviceTypeName.DEVICE_SOCKET_TCP) + .deviceAddr(sa.getAddress().getHostAddress()) + .build()); + MessageContent msgCont = MessageContent.builder() + .msgBody(new HeartProtocol()) .build(); BaseBinaryProtocol h = BaseBinaryProtocol.builder().msgContent(msgCont).build(); diff --git a/src/main/java/com/zjyr/beidouservice/adapter/impl/netty/encode/YuanRongProtocolEncode.java b/src/main/java/com/zjyr/beidouservice/adapter/impl/netty/encode/YuanRongProtocolEncode.java index 790d0cd..2e3589b 100644 --- a/src/main/java/com/zjyr/beidouservice/adapter/impl/netty/encode/YuanRongProtocolEncode.java +++ b/src/main/java/com/zjyr/beidouservice/adapter/impl/netty/encode/YuanRongProtocolEncode.java @@ -23,7 +23,8 @@ import org.springframework.stereotype.Component; @Slf4j public class YuanRongProtocolEncode extends MessageToByteEncoder> { @Override - protected void encode(ChannelHandlerContext channelHandlerContext, BaseBinaryProtocol baseBinaryProtocol, + protected void encode(ChannelHandlerContext channelHandlerContext, + BaseBinaryProtocol baseBinaryProtocol, ByteBuf byteBuf) { if (baseBinaryProtocol == null || baseBinaryProtocol.getMsgContent() == null || diff --git a/src/main/java/com/zjyr/beidouservice/adapter/impl/netty/impl/TcpServer.java b/src/main/java/com/zjyr/beidouservice/adapter/impl/netty/impl/TcpServer.java index 6d22dc3..4fa470f 100644 --- a/src/main/java/com/zjyr/beidouservice/adapter/impl/netty/impl/TcpServer.java +++ b/src/main/java/com/zjyr/beidouservice/adapter/impl/netty/impl/TcpServer.java @@ -51,10 +51,15 @@ public class TcpServer implements ISocketServer { */ private void tcpServer(int port) { try { - new ServerBootstrap().group(boosGroup, workerGroup).channel(NioServerSocketChannel.class).localAddress( - new InetSocketAddress(port)).childHandler(channelInit).option(ChannelOption.SO_BACKLOG, 128) - .childOption(ChannelOption.TCP_NODELAY, false).childOption(ChannelOption.SO_KEEPALIVE, - true).bind().sync(); + new ServerBootstrap().group(boosGroup, workerGroup) + .channel(NioServerSocketChannel.class) + .localAddress(new InetSocketAddress(port)) + .childHandler(channelInit) + .option(ChannelOption.SO_BACKLOG, 128) + .childOption(ChannelOption.TCP_NODELAY, false) + .childOption(ChannelOption.SO_KEEPALIVE, true) + .bind() + .sync(); log.info("Netty TCP Server Beginning Listen: {}", port); } catch (Exception e) { log.error(e.getMessage()); diff --git a/src/main/java/com/zjyr/beidouservice/common/CommonEnumHandler.java b/src/main/java/com/zjyr/beidouservice/common/CommonEnumHandler.java index 162276b..9e2d561 100644 --- a/src/main/java/com/zjyr/beidouservice/common/CommonEnumHandler.java +++ b/src/main/java/com/zjyr/beidouservice/common/CommonEnumHandler.java @@ -69,7 +69,9 @@ public final class CommonEnumHandler extends BaseType * @throws SQLException the sql exception */ @Override - public void setNonNullParameter(PreparedStatement preparedStatement, int i, E e, + public void setNonNullParameter(PreparedStatement preparedStatement, + int i, + E e, JdbcType jdbcType) throws SQLException { preparedStatement.setInt(i, e.getValue()); }