From 03c7733faecddc76284df29a78f415f26cf40134 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Wed, 22 May 2024 15:47:05 +0800
Subject: [PATCH] =?UTF-8?q?tcp=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../netty/tcp/handler/TcpNettyHandler.java    | 31 +++++++++----------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/zhgd/netty/tcp/handler/TcpNettyHandler.java b/src/main/java/com/zhgd/netty/tcp/handler/TcpNettyHandler.java
index 940944c0b..fff432cb5 100644
--- a/src/main/java/com/zhgd/netty/tcp/handler/TcpNettyHandler.java
+++ b/src/main/java/com/zhgd/netty/tcp/handler/TcpNettyHandler.java
@@ -31,35 +31,32 @@ public class TcpNettyHandler extends SimpleChannelInboundHandler<Object> {
     @Override
     public void channelRead0(ChannelHandlerContext ctx, Object msg) {
         byte[] bytes = readBytes(msg);
-
         //字符串判断
         String str = getString(bytes);
         str = str.trim();
-        log.info("channelRead0 str >>> \r\n {} ", str);
+        log.info("tcp接收数据 >>> {} ", str);
         if (StringUtils.startsWith(str, HighFormworkSupport.TCP_DATA_PREFIX) && StringUtils.endsWith(str, HighFormworkSupport.TCP_DATA_END)) {
+            log.info("高支模接收数据 >>> {} ", str);
             //接收高支模数据保存到mysql中
             try {
                 highFormworkSupportService.saveTcpData(str);
             } catch (Exception e) {
-                log.error("error：接收高支模数据保存到mysql中exception： >>> \r\n ", e);
+                log.error("error：接收高支模数据保存到mysql中exception： >>> ", e);
             } finally {
                 highFormworkSupportResponseOk(ctx);
             }
-            return;
-        }
-        //有毒气体
-        if (StringUtils.startsWith(str, "##")) {
+        } else if (StringUtils.startsWith(str, "##")) {
+            log.info("有毒气体接收数据 >>> {} ", str);
+            //有毒气体
             poisonousGasDevCurrentDataService.addDataFromTcpFor212Protocol(str);
-            return;
-        }
-
-        //16进制判断
-        String hexString = readToHexString(bytes);
-        log.info("channelRead0 hexString >>> \r\n {} ", hexString);
-        if (StringUtils.startsWith(hexString, "7E")) {
-            //有害气体
-            poisonousGasDevCurrentDataService.addDataFromTcp(hexString.trim());
-            return;
+        } else {
+            //16进制判断
+            String hexString = readToHexString(bytes);
+            log.info("tcp接收数据（16进制转字符串） >>> {} ", hexString);
+            if (StringUtils.startsWith(hexString, "7E")) {
+                //有害气体
+                poisonousGasDevCurrentDataService.addDataFromTcp(hexString.trim());
+            }
         }
     }