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
2024-12-19 13:41:18 +08:00
parent 8760821aec
commit 0e682e8d33
1 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,6 +39,7 @@ public class SocketDevResponseService {
private final WebSocketHandler webSocketHandler; private final WebSocketHandler webSocketHandler;
private final IPqDevService iPqDevService; private final IPqDevService iPqDevService;
private final IPqScriptDtlsService scriptDtlsService; private final IPqScriptDtlsService scriptDtlsService;
private final IPqScriptDtlsService pqScriptDtlsService;
/** /**
* 所有装置通道信息 * 所有装置通道信息
@@ -181,7 +182,7 @@ public class SocketDevResponseService {
break; break;
case RE_OPERATE: case RE_OPERATE:
//发起关闭操作 //发起关闭操作
quitSend(param,socketDataMsg,socketMsg); quitSend(param,socketMsg);
break; break;
default: default:
WebSocketVO webSocketVO = new WebSocketVO(); WebSocketVO webSocketVO = new WebSocketVO();
@@ -226,12 +227,22 @@ public class SocketDevResponseService {
} }
} else if (type.equals(SourceOperateCodeEnum.DEV_INIT_GATHER_03.getValue())) { } else if (type.equals(SourceOperateCodeEnum.DEV_INIT_GATHER_03.getValue())) {
System.out.println(successXieyi3.size() + "=====" + moniterIdListComm.size());
successXieyi3.add(mId); successXieyi3.add(mId);
System.out.println(successXieyi3.size() + "=====" + moniterIdListComm.size());
if (successXieyi3.size() == moniterIdListComm.size()) { if (successXieyi3.size() == moniterIdListComm.size()) {
System.out.println("开始相序校验++++++++++"); System.out.println("开始相序校验++++++++++");
PqScriptIssueParam issueParam=new PqScriptIssueParam();
issueParam.setPlanId(param.getPlanId());
issueParam.setIsPhaseSequence(true);
issueParam.setDevIds(param.getDevIds());
List<SourceIssue> sourceIssues = pqScriptDtlsService.listSourceIssue(issueParam);
if(CollUtil.isNotEmpty(sourceIssues)){
SocketMsg xuMsg=new SocketMsg();
xuMsg.setRequestId(SourceOperateCodeEnum.YJC_XUJY.getValue());
xuMsg.setOperateCode(SourceOperateCodeEnum.OPER_GATHER.getValue());
xuMsg.setData(JSON.toJSONString(sourceIssues.get(0)));
SocketManager.sendMsg(param.getUserPageId()+"_Source",JSON.toJSONString(xuMsg));
}
} }
} }
@@ -241,7 +252,7 @@ public class SocketDevResponseService {
break; break;
case RE_OPERATE: case RE_OPERATE:
//发起关闭操作 //发起关闭操作
quitSend(param,socketDataMsg,socketMsg); quitSend(param,socketMsg);
break; break;
default: default:
WebSocketVO webSocketVO = new WebSocketVO(); WebSocketVO webSocketVO = new WebSocketVO();
@@ -254,23 +265,11 @@ public class SocketDevResponseService {
/** /**
* 退出检测 * 退出检测
*/ */
private void quitSend(PreDetectionParam param,SocketDataMsg socketDataMsg,SocketMsg socketMsg){ private void quitSend(PreDetectionParam param,SocketMsg socketMsg){
SourceOperateCodeEnum operateCodeEnum = SourceOperateCodeEnum.getDictDataEnumByCode(socketDataMsg.getOperateCode());
socketMsg.setRequestId(SourceOperateCodeEnum.QUITE.getValue()); socketMsg.setRequestId(SourceOperateCodeEnum.QUITE.getValue());
switch (operateCodeEnum){ socketMsg.setOperateCode(SourceOperateCodeEnum.QUIT_INIT_03.getValue());
case DEV_INIT_GATHER_01: SocketManager.sendMsg(param.getUserPageId()+handlerStr, JSON.toJSONString(socketMsg));
socketMsg.setOperateCode(SourceOperateCodeEnum.QUIT_INIT_01.getValue());
SocketManager.sendMsg(param.getUserPageId()+handlerStr, JSON.toJSONString(socketMsg));
break;
case DEV_INIT_GATHER_02:
socketMsg.setOperateCode(SourceOperateCodeEnum.QUIT_INIT_02.getValue());
SocketManager.sendMsg(param.getUserPageId()+handlerStr, JSON.toJSONString(socketMsg));
break;
case DEV_INIT_GATHER_03:
socketMsg.setOperateCode(SourceOperateCodeEnum.QUIT_INIT_03.getValue());
SocketManager.sendMsg(param.getUserPageId()+handlerStr, JSON.toJSONString(socketMsg));
break;
}
} }