From d52c3e680be44e590212596a0c909e3f51f40375 Mon Sep 17 00:00:00 2001 From: chendaofei <857448963@qq.com> Date: Fri, 10 Jan 2025 13:14:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/SocketDevResponseService.java | 1 + .../handler/SocketSourceResponseService.java | 22 +++++++++++++++++++ .../pojo/enums/SourceResponseCodeEnum.java | 1 + 3 files changed, 24 insertions(+) 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 83c9696b..7876369a 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 @@ -1204,6 +1204,7 @@ public class SocketDevResponseService { issueParam.setDevIds(param.getDevIds()); issueParam.setScriptId(param.getScriptId()); issueParam.setIsPhaseSequence(SourceOperateCodeEnum.COEFFICIENT_TEST.getValue()); + issueParam.setIndexList(Stream.of(-2,-3).collect(Collectors.toList())); List sourceIssues = pqScriptDtlsService.listSourceIssue(issueParam); for (int j = 0; j < sourceIssues.size(); j++) { if (j == 0) { 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 7d9588af..a3203ce5 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 @@ -183,6 +183,24 @@ public class SocketSourceResponseService { CnSocketUtil.quitSendSource(param); webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); break; + case TARGET_SOURCE_ERROR: + CnSocketUtil.quitSendSource(param); + webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); + break; + case NOT_INITIALIZED: + CnSocketUtil.quitSendSource(param); + webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); + break; + case UNKNOWN_ERROR: + CnSocketUtil.quitSendSource(param); + webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); + break; + case UNABLE_TO_RESPOND: + CnSocketUtil.quitSendSource(param); + webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); + break; + + default: socketMsg = new SocketMsg<>(); @@ -340,6 +358,10 @@ public class SocketSourceResponseService { case UNPROCESSED_BUSINESS: break; case MESSAGE_PARSING_ERROR: + SocketManager.removeUser(param.getUserPageId() + source); + break; + case UNABLE_TO_RESPOND: + SocketManager.removeUser(param.getUserPageId() + source); break; default: break; diff --git a/detection/src/main/java/com/njcn/gather/detection/pojo/enums/SourceResponseCodeEnum.java b/detection/src/main/java/com/njcn/gather/detection/pojo/enums/SourceResponseCodeEnum.java index 144d4cc3..b2267d36 100644 --- a/detection/src/main/java/com/njcn/gather/detection/pojo/enums/SourceResponseCodeEnum.java +++ b/detection/src/main/java/com/njcn/gather/detection/pojo/enums/SourceResponseCodeEnum.java @@ -23,6 +23,7 @@ public enum SourceResponseCodeEnum { NOT_INITIALIZED(10527, "源未进行初始化"), TARGET_SOURCE_ERROR(10528, "目标源有误（该用户已控制其他源，在关闭前无法操作新的源）"), UNABLE_TO_RESPOND(10529, "源状态有误，无法响应报文（例如源处于输出状态，无法响应初始化报文）"), + UNKNOWN_ERROR(-1, "未知异常"), //通讯模块