donggaosheng 1 рік тому
батько
коміт
07a1755f8c

+ 1 - 1
zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/netty/NettyPushMsgService.java

@@ -15,7 +15,7 @@ public class NettyPushMsgService {
         // 客户端ID
         ChannelHandlerContext channelHandlerContext = ChannelMap.getChannel(relayCode);
         if (null == channelHandlerContext) {
-            throw new IOException("netty推送设备失败" + relayCode);
+            throw new IOException("netty推送设备失败"+relayCode);
         }
         channelHandlerContext.writeAndFlush(Unpooled.copiedBuffer(bytes));
     }

+ 1 - 0
zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/netty/NettyServerHandler.java

@@ -82,6 +82,7 @@ public class NettyServerHandler implements ChannelInboundHandler {
             dataStr=dataStr.replace(RelayConstants.SPACE_WRAP,"");
             String codeStr=dataStr.substring(0,17);
             String relayCode=codeStr.replace(":","");
+            log.info("relayCode:"+relayCode+"channelHandlerContext:"+channelHandlerContext);
              //回复ack
             ChannelMap.getChannelMap().put(relayCode, channelHandlerContext);
             NettyPushMsgService.push(relayCode,RelayConstants.AT_ACK.getBytes());

+ 2 - 0
zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabSubjectManagerService.java

@@ -276,6 +276,8 @@ public class LabSubjectManagerService {
         } else if (labHardwareVO.getHardwareType() == 3) {
             try {
                 String relayCode = labHardwareVO.getRelayCode();
+                logger.info("HardwareTyperelayCode:"+relayCode);
+                relayCode=relayCode.trim();
                 String type = command.getType();
                 if(RelayConstants.AT_OPEN_STR.equals(type)){
                     type=RelayConstants.AT_OPEN.toString();

+ 2 - 0
zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/utils/RelayUtils.java

@@ -100,4 +100,6 @@ public class RelayUtils {
             }
         }
     }
+
+
 }