继电器二路四路代码指令格式兼容 2023-11-10

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

@@ -75,6 +75,7 @@ public class NettyServerHandler implements ChannelInboundHandler {
                 redisService.setCacheObject(relayCode + ":" + bit, status, 3 * 60L, TimeUnit.SECONDS);
             }
         }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 relayCode=codeStr.replace(":","");
              //回复ack

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabExitLineVertexServiceImpl.java

@@ -319,7 +319,7 @@ public class LabExitLineVertexServiceImpl implements ILabExitLineVertexService {
                                 }
                             }
                         }
-                    } catch (InterruptedException e) {
+                    } catch (InterruptedException | ExecutionException e) {
                         Thread.currentThread().interrupt();
                         //e.printStackTrace();
                     }