diff --git a/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java b/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java index 812bada1..f99fee56 100644 --- a/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java +++ b/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java @@ -991,6 +991,8 @@ public class SocketDevResponseService { //在这一步判断是否已经触发暂停按钮 if (FormalTestManager.stopFlag && CollUtil.isNotEmpty(SocketManager.getSourceList())) { FormalTestManager.stopTime = 0; + FormalTestManager.hasStopFlag = true; + successComm.clear(); realDataXiList.clear(); sendWebSocket(param.getUserPageId(), "preStopTest", "stop", null); @@ -1228,6 +1230,8 @@ public class SocketDevResponseService { successDevComm.clear(); failDevComm.clear(); FormalTestManager.stopFlag = false; + FormalTestManager.hasStopFlag = false; + FormalTestManager.stopTime = 0; //初始化相序集合 this.devInfo.clear(); diff --git a/detection/src/main/java/com/njcn/gather/detection/util/socket/FormalTestManager.java b/detection/src/main/java/com/njcn/gather/detection/util/socket/FormalTestManager.java index 9fdf2f7f..1634dd25 100644 --- a/detection/src/main/java/com/njcn/gather/detection/util/socket/FormalTestManager.java +++ b/detection/src/main/java/com/njcn/gather/detection/util/socket/FormalTestManager.java @@ -40,8 +40,21 @@ public class FormalTestManager { public static Map devIdMapComm = new HashMap<>(); + /** + * 停止触发标识 + */ public static Boolean stopFlag = false; + + /** + * 已经暂停后的标识 + */ + public static Boolean hasStopFlag = false; + + + /** + * 暂停后的超时计时时间 + */ public static Integer stopTime = 0; diff --git a/detection/src/main/java/com/njcn/gather/detection/util/socket/cilent/NettyDevClientHandler.java b/detection/src/main/java/com/njcn/gather/detection/util/socket/cilent/NettyDevClientHandler.java index 7173e24e..0e61b75f 100644 --- a/detection/src/main/java/com/njcn/gather/detection/util/socket/cilent/NettyDevClientHandler.java +++ b/detection/src/main/java/com/njcn/gather/detection/util/socket/cilent/NettyDevClientHandler.java @@ -101,7 +101,7 @@ public class NettyDevClientHandler extends SimpleChannelInboundHandler { public void userEventTriggered(ChannelHandlerContext ctx, Object evt) { if (evt instanceof IdleStateEvent) { if (((IdleStateEvent) evt).state() == IdleState.READER_IDLE) { - if(!FormalTestManager.stopFlag) { + if(!FormalTestManager.hasStopFlag) { if (CollUtil.isNotEmpty(SocketManager.getSourceList())) { SourceIssue sourceIssue = SocketManager.getSourceList().get(0); if (SocketManager.clockMap.containsKey(sourceIssue.getIndex())) {