ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调

Browse Source
This commit is contained in:
chendaofei
2025-01-15 13:32:31 +08:00
parent 9c8ea385ed
commit f4b7b3bdfe
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java
View File

@@ -1030,8 +1030,6 @@ public class SocketDevResponseService {
webSocketVO.setData(new ArrayList<>()); webSocketVO.setData(new ArrayList<>());
webSocketVO.setDesc(null); webSocketVO.setDesc(null);
webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(webSocketVO)); webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(webSocketVO));
webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(webSocketVO));
} }
SocketMsg<String> xuMsg = new SocketMsg<>(); SocketMsg<String> xuMsg = new SocketMsg<>();

26
detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java
View File

@@ -324,12 +324,26 @@ public class SocketSourceResponseService {
devListRes.add(devLineTestResult); devListRes.add(devLineTestResult);
}); });
//告诉前端当前项开始了 WebSocketVO<Object> webSocketVO = new WebSocketVO<>();
WebSocketVO<List<DevLineTestResult>> webSocketVO = new WebSocketVO<>(); if(SocketManager.getSourceList().get(0).getIndex() == 1){
webSocketVO.setRequestId(socketDataMsg.getRequestId().split(stepTag)[1]+stepBegin); //告诉前端当前项开始了
webSocketVO.setDesc(SocketManager.getSourceList().get(0).getDesc()); webSocketVO.setRequestId(SocketManager.getSourceList().get(0).getType()+stepBegin);
webSocketVO.setData(devListRes); webSocketVO.setDesc(null);
webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(webSocketVO)); 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; break;
case UNPROCESSED_BUSINESS: case UNPROCESSED_BUSINESS: