From b4114f19de41018d068665ccc323483bb2a2cf22 Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Tue, 3 Jun 2025 19:53:17 +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 | 148 +++++++++--------- 1 file changed, 76 insertions(+), 72 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 04b2f68b..1f39ebb5 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 @@ -997,88 +997,92 @@ public class SocketDevResponseService { if (ObjectUtil.isNotNull(dictDataEnumByCode)) { switch (dictDataEnumByCode) { case SUCCESS: - devInfo.add(devData); - successComm.add(devData.getId()); + if (devData.getResult()) { + devInfo.add(devData); + successComm.add(devData.getId()); - if (successComm.size() == FormalTestManager.monitorIdListComm.size()) { - System.out.println("相序校验接受数据完成---------" + successComm.size() + "__" + FormalTestManager.monitorIdListComm.size()); + if (successComm.size() == FormalTestManager.monitorIdListComm.size()) { + System.out.println("相序校验接受数据完成---------" + successComm.size() + "__" + FormalTestManager.monitorIdListComm.size()); - PqScriptIssueParam sourceParam = new PqScriptIssueParam(); - sourceParam.setPlanId(param.getPlanId()); - sourceParam.setDevIds(param.getDevIds()); - sourceParam.setIsPhaseSequence(SourceOperateCodeEnum.PHASE_TEST.getValue()); - sourceParam.setScriptId(param.getScriptId()); - sourceParam.setSourceId(param.getSourceId()); - List sourceIssues = scriptDtlsService.listSourceIssue(sourceParam); - List info = new ArrayList<>(); - if (CollUtil.isNotEmpty(sourceIssues)) { - devInfo.stream().sorted(Comparator.comparing(DevData::getId)); - info.addAll(devIsSource(devInfo, sourceIssues.get(0))); - } - if (CollUtil.isNotEmpty(info)) { - SocketDataMsg dataMsg = new SocketDataMsg(); - dataMsg.setOperateCode(SourceOperateCodeEnum.DEV_DATA_REQUEST_02.getValue()); - dataMsg.setRequestId(SourceOperateCodeEnum.YJC_XUJY.getValue()); - dataMsg.setCode(SourceResponseCodeEnum.SUCCESS.getCode()); + PqScriptIssueParam sourceParam = new PqScriptIssueParam(); + sourceParam.setPlanId(param.getPlanId()); + sourceParam.setDevIds(param.getDevIds()); + sourceParam.setIsPhaseSequence(SourceOperateCodeEnum.PHASE_TEST.getValue()); + sourceParam.setScriptId(param.getScriptId()); + sourceParam.setSourceId(param.getSourceId()); + List sourceIssues = scriptDtlsService.listSourceIssue(sourceParam); + List info = new ArrayList<>(); + if (CollUtil.isNotEmpty(sourceIssues)) { + devInfo.stream().sorted(Comparator.comparing(DevData::getId)); + info.addAll(devIsSource(devInfo, sourceIssues.get(0))); + } + if (CollUtil.isNotEmpty(info)) { + SocketDataMsg dataMsg = new SocketDataMsg(); + dataMsg.setOperateCode(SourceOperateCodeEnum.DEV_DATA_REQUEST_02.getValue()); + dataMsg.setRequestId(SourceOperateCodeEnum.YJC_XUJY.getValue()); + dataMsg.setCode(SourceResponseCodeEnum.SUCCESS.getCode()); - for (SourceCompareDev sourceCompareDev : info) { - dataMsg.setData(sourceCompareDev.getDevName() + splitTag + sourceCompareDev.getLineNum() + "校验结果:" + sourceCompareDev.getDesc()); - WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(dataMsg)); + for (SourceCompareDev sourceCompareDev : info) { + dataMsg.setData(sourceCompareDev.getDevName() + splitTag + sourceCompareDev.getLineNum() + "校验结果:" + sourceCompareDev.getDesc()); + WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(dataMsg)); + } + + if (info.stream().anyMatch(it -> !it.getIsQualified())) { + WebSocketVO webSocketVO = new WebSocketVO<>(); + webSocketVO.setRequestId(SourceOperateCodeEnum.YJC_XUJY.getValue()); + webSocketVO.setOperateCode(SourceOperateCodeEnum.DEV_DATA_REQUEST_02.getValue()); + webSocketVO.setCode(SourceResponseCodeEnum.PHASE_CHECK_FAIL.getCode()); + webSocketVO.setData(SourceResponseCodeEnum.PHASE_CHECK_FAIL.getMessage()); + WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(webSocketVO)); + + CnSocketUtil.quitSend(param); + return; + } + + + //向前端推送消息 + SocketDataMsg temMsg = new SocketDataMsg(); + temMsg.setCode(SourceResponseCodeEnum.DEV_COMM_ALL_SUCCESS.getCode()); + temMsg.setOperateCode(SourceOperateCodeEnum.DEV_DATA_REQUEST_02.getValue()); + temMsg.setRequestId(SourceOperateCodeEnum.YJC_XUJY.getValue()); + WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(temMsg)); + successComm.clear(); } - if (info.stream().anyMatch(it -> !it.getIsQualified())) { - WebSocketVO webSocketVO = new WebSocketVO<>(); - webSocketVO.setRequestId(SourceOperateCodeEnum.YJC_XUJY.getValue()); - webSocketVO.setOperateCode(SourceOperateCodeEnum.DEV_DATA_REQUEST_02.getValue()); - webSocketVO.setCode(SourceResponseCodeEnum.PHASE_CHECK_FAIL.getCode()); - webSocketVO.setData(SourceResponseCodeEnum.PHASE_CHECK_FAIL.getMessage()); + + if (param.getOperateType().equals(SourceOperateCodeEnum.PRE_TEST.getValue())) { + System.out.println("预检测流程结束-----------------关闭源"); + //同时关闭设备三个步骤 + CnSocketUtil.quitSend(param); + } else if (param.getOperateType().equals(SourceOperateCodeEnum.COEFFICIENT_TEST.getValue())) { + WebSocketVO webSocketVO = new WebSocketVO<>(); + webSocketVO.setRequestId(SourceOperateCodeEnum.Coefficient_Check.getValue()); + webSocketVO.setOperateCode(SourceOperateCodeEnum.big_start.getValue()); + webSocketVO.setData(XiNumberManager.devParameterList.get(0)); WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(webSocketVO)); - CnSocketUtil.quitSend(param); - return; + //下发命令获取所有装置通道系数,首先需要获取所有装置，通过所有装置下发获取系数命令，目前只支持单台装置获取系数 + socketMsg.setRequestId(SourceOperateCodeEnum.Coefficient_Check.getValue()); + socketMsg.setOperateCode(SourceOperateCodeEnum.DATA_CHNFACTOR$01.getValue()); + PreDetection preDetection = XiNumberManager.xiDevList.get(0); + Map map = new HashMap<>(); + map.put("devIP", preDetection.getDevIP()); + map.put("chnNum", preDetection.getDevChns()); + socketMsg.setData(JSON.toJSONString(map)); + SocketManager.sendMsg(param.getUserPageId() + handlerStr, JSON.toJSONString(socketMsg)); + + + XiNumberManager.stepNumber = 0; + XiNumberManager.devXiList.clear(); + XiNumberManager.devXiNumDataMap.clear(); + XiNumberManager.smallDevXiNumDataMap.clear(); + + System.out.println("开始系数校准》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》"); } - - //向前端推送消息 - SocketDataMsg temMsg = new SocketDataMsg(); - temMsg.setCode(SourceResponseCodeEnum.DEV_COMM_ALL_SUCCESS.getCode()); - temMsg.setOperateCode(SourceOperateCodeEnum.DEV_DATA_REQUEST_02.getValue()); - temMsg.setRequestId(SourceOperateCodeEnum.YJC_XUJY.getValue()); - WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(temMsg)); - successComm.clear(); } - - - if (param.getOperateType().equals(SourceOperateCodeEnum.PRE_TEST.getValue())) { - System.out.println("预检测流程结束-----------------关闭源"); - //同时关闭设备三个步骤 - CnSocketUtil.quitSend(param); - } else if (param.getOperateType().equals(SourceOperateCodeEnum.COEFFICIENT_TEST.getValue())) { - WebSocketVO webSocketVO = new WebSocketVO<>(); - webSocketVO.setRequestId(SourceOperateCodeEnum.Coefficient_Check.getValue()); - webSocketVO.setOperateCode(SourceOperateCodeEnum.big_start.getValue()); - webSocketVO.setData(XiNumberManager.devParameterList.get(0)); - WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(webSocketVO)); - - //下发命令获取所有装置通道系数,首先需要获取所有装置，通过所有装置下发获取系数命令，目前只支持单台装置获取系数 - socketMsg.setRequestId(SourceOperateCodeEnum.Coefficient_Check.getValue()); - socketMsg.setOperateCode(SourceOperateCodeEnum.DATA_CHNFACTOR$01.getValue()); - PreDetection preDetection = XiNumberManager.xiDevList.get(0); - Map map = new HashMap<>(); - map.put("devIP", preDetection.getDevIP()); - map.put("chnNum", preDetection.getDevChns()); - socketMsg.setData(JSON.toJSONString(map)); - SocketManager.sendMsg(param.getUserPageId() + handlerStr, JSON.toJSONString(socketMsg)); - - - XiNumberManager.stepNumber = 0; - XiNumberManager.devXiList.clear(); - XiNumberManager.devXiNumDataMap.clear(); - XiNumberManager.smallDevXiNumDataMap.clear(); - - System.out.println("开始系数校准》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》"); - } - + } else { + System.out.println("被抛除的数据：" + data); } break; case UNPROCESSED_BUSINESS: