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 0e938af5..65c3392d 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 @@ -1030,8 +1030,6 @@ public class SocketDevResponseService { webSocketVO.setData(new ArrayList<>()); webSocketVO.setDesc(null); webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(webSocketVO)); - webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(webSocketVO)); - } SocketMsg xuMsg = new SocketMsg<>(); diff --git a/detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java b/detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java index 4af5820b..16fc04c7 100644 --- a/detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java +++ b/detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java @@ -324,12 +324,26 @@ public class SocketSourceResponseService { devListRes.add(devLineTestResult); }); - //告诉前端当前项开始了 - WebSocketVO> webSocketVO = new WebSocketVO<>(); - webSocketVO.setRequestId(socketDataMsg.getRequestId().split(stepTag)[1]+stepBegin); - webSocketVO.setDesc(SocketManager.getSourceList().get(0).getDesc()); - webSocketVO.setData(devListRes); - webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(webSocketVO)); + WebSocketVO webSocketVO = new WebSocketVO<>(); + if(SocketManager.getSourceList().get(0).getIndex() == 1){ + //告诉前端当前项开始了 + webSocketVO.setRequestId(SocketManager.getSourceList().get(0).getType()+stepBegin); + webSocketVO.setDesc(null); + webSocketVO.setData(devListRes); + webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(webSocketVO)); + + + webSocketVO.setRequestId(SocketManager.getSourceList().get(0).getType()+stepBegin); + webSocketVO.setDesc(SocketManager.getSourceList().get(0).getDesc()); + webSocketVO.setData(devListRes); + webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(webSocketVO)); + }else { + webSocketVO.setRequestId(socketDataMsg.getRequestId().split(stepTag)[1]+stepBegin); + webSocketVO.setDesc(SocketManager.getSourceList().get(0).getDesc()); + webSocketVO.setData(devListRes); + webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(webSocketVO)); + } + break; case UNPROCESSED_BUSINESS: