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-10 13:14:33 +08:00
parent e5eef6b1d1
commit d52c3e680b
3 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1204,6 +1204,7 @@ public class SocketDevResponseService {
issueParam.setDevIds(param.getDevIds()); issueParam.setDevIds(param.getDevIds());
issueParam.setScriptId(param.getScriptId()); issueParam.setScriptId(param.getScriptId());
issueParam.setIsPhaseSequence(SourceOperateCodeEnum.COEFFICIENT_TEST.getValue()); issueParam.setIsPhaseSequence(SourceOperateCodeEnum.COEFFICIENT_TEST.getValue());
issueParam.setIndexList(Stream.of(-2,-3).collect(Collectors.toList()));
List<SourceIssue> sourceIssues = pqScriptDtlsService.listSourceIssue(issueParam); List<SourceIssue> sourceIssues = pqScriptDtlsService.listSourceIssue(issueParam);
for (int j = 0; j < sourceIssues.size(); j++) { for (int j = 0; j < sourceIssues.size(); j++) {
if (j == 0) { if (j == 0) {

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

@@ -183,6 +183,24 @@ public class SocketSourceResponseService {
CnSocketUtil.quitSendSource(param); CnSocketUtil.quitSendSource(param);
webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
break; 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: default:
socketMsg = new SocketMsg<>(); socketMsg = new SocketMsg<>();
@@ -340,6 +358,10 @@ public class SocketSourceResponseService {
case UNPROCESSED_BUSINESS: case UNPROCESSED_BUSINESS:
break; break;
case MESSAGE_PARSING_ERROR: case MESSAGE_PARSING_ERROR:
SocketManager.removeUser(param.getUserPageId() + source);
break;
case UNABLE_TO_RESPOND:
SocketManager.removeUser(param.getUserPageId() + source);
break; break;
default: default:
break; break;

1
detection/src/main/java/com/njcn/gather/detection/pojo/enums/SourceResponseCodeEnum.java
View File

@@ -23,6 +23,7 @@ public enum SourceResponseCodeEnum {
NOT_INITIALIZED(10527, "源未进行初始化"), NOT_INITIALIZED(10527, "源未进行初始化"),
TARGET_SOURCE_ERROR(10528, "目标源有误（该用户已控制其他源，在关闭前无法操作新的源）"), TARGET_SOURCE_ERROR(10528, "目标源有误（该用户已控制其他源，在关闭前无法操作新的源）"),
UNABLE_TO_RESPOND(10529, "源状态有误，无法响应报文（例如源处于输出状态，无法响应初始化报文）"), UNABLE_TO_RESPOND(10529, "源状态有误，无法响应报文（例如源处于输出状态，无法响应初始化报文）"),
UNKNOWN_ERROR(-1, "未知异常"),
//通讯模块 //通讯模块