From f4b7b3bdfe082fe4b616afc3944a9bc876131b6f Mon Sep 17 00:00:00 2001 From: chendaofei <857448963@qq.com> Date: Wed, 15 Jan 2025 13:32:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/SocketDevResponseService.java | 2 -- .../handler/SocketSourceResponseService.java | 26 ++++++++++++++----- 2 files changed, 20 insertions(+), 8 deletions(-) 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: