diff --git a/detection/src/main/java/com/njcn/gather/detection/controller/PreDetectionController.java b/detection/src/main/java/com/njcn/gather/detection/controller/PreDetectionController.java index e916f9ee..7311a41f 100644 --- a/detection/src/main/java/com/njcn/gather/detection/controller/PreDetectionController.java +++ b/detection/src/main/java/com/njcn/gather/detection/controller/PreDetectionController.java @@ -57,7 +57,6 @@ public class PreDetectionController extends BaseController { @ApiOperation("开始检测") @ApiImplicitParam(name = "param", value = "查询参数", required = true) public HttpResult startPreTest(@RequestBody PreDetectionParam param){ - System.out.println("开始检测controller进入================================22"); String methodDescribe = getMethodDescribe("startPreTest"); preDetectionService.sourceCommunicationCheck(param); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); @@ -72,7 +71,6 @@ public class PreDetectionController extends BaseController { @ApiOperation("系数校验") @ApiImplicitParam(name = "param", value = "查询参数", required = true) public HttpResult coefficientCheck(@RequestBody PreDetectionParam param){ - System.out.println("系数校验controller进入================================"); String methodDescribe = getMethodDescribe("coefficientCheck"); preDetectionService.coefficientCheck(param); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); 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 ce6ccde5..db212435 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 @@ -15,7 +15,6 @@ import com.njcn.gather.detection.pojo.po.SourceCompareDev; import com.njcn.gather.detection.pojo.vo.*; import com.njcn.gather.detection.service.impl.DetectionServiceImpl; import com.njcn.gather.detection.util.socket.*; -import com.njcn.gather.detection.util.socket.web.WebSocketHandler; import com.njcn.gather.device.device.pojo.po.PqDev; import com.njcn.gather.device.device.pojo.vo.PreDetection; import com.njcn.gather.device.device.service.IPqDevService; @@ -72,7 +71,7 @@ public class SocketDevResponseService { private final List nonHarmonicList = Stream.of(DicDataEnum.FREQ.getCode(), DicDataEnum.V.getCode(), DicDataEnum.I.getCode(), DicDataEnum.IMBV.getCode(), DicDataEnum.IMBA.getCode(), DicDataEnum.VOLTAGE.getCode(), DicDataEnum.F.getCode()).collect(Collectors.toList()); private final List harmonicList = Stream.of(DicDataEnum.HV.getCode(), DicDataEnum.HI.getCode(), DicDataEnum.HP.getCode(), DicDataEnum.HSV.getCode(), DicDataEnum.HSI.getCode()).collect(Collectors.toList()); - private final WebSocketHandler webSocketHandler; + private final IPqDevService iPqDevService; private final IPqScriptDtlsService scriptDtlsService; private final IPqScriptDtlsService pqScriptDtlsService; @@ -279,11 +278,12 @@ public class SocketDevResponseService { gf.add(gfItem); //表格数据 - WebSocketVO webSocketVO = new WebSocketVO<>(); + WebSocketVO webSocketVO = new WebSocketVO<>(); webSocketVO.setRequestId(SourceOperateCodeEnum.Coefficient_Check.getValue()); webSocketVO.setOperateCode(SourceOperateCodeEnum.DATA_CHNFACTOR$02.getValue()); webSocketVO.setData(coefficientVO); - webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(webSocketVO)); + + WebServiceManager.sendMessage(param.getUserPageId(),webSocketVO); }); DevXiNumData devXiNumData = new DevXiNumData(); devXiNumData.setChnNum(0); @@ -418,7 +418,7 @@ public class SocketDevResponseService { } break; case UNPROCESSED_BUSINESS: - webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); + WebServiceManager.sendMsg(param.getUserPageId(),JSON.toJSONString(socketDataMsg)); break; case NORMAL_RESPONSE: realDataXiList.add(devData); @@ -427,7 +427,7 @@ public class SocketDevResponseService { xiSocket.setRequestId(socketDataMsg.getRequestId()); xiSocket.setOperateCode(socketDataMsg.getOperateCode()); xiSocket.setData(dictDataEnumByCode.getMessage()); - webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(xiSocket)); + WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(xiSocket)); break; } } @@ -564,7 +564,8 @@ public class SocketDevResponseService { successComm.add(result); //通讯校验成功 if (!param.getOperateType().equals(SourceOperateCodeEnum.TEST_TEM_START.getValue())) { - webSocketHandler.sendMsgToUser(param.getUserPageId(), MsgUtil.msgToWebData(socketDataMsg, FormalTestManager.devNameMapComm, 1)); + WebServiceManager.sendMsg(param.getUserPageId(), MsgUtil.msgToWebData(socketDataMsg, FormalTestManager.devNameMapComm, 1)); + } System.out.println("设备通讯校验!" + successComm.size() + "=====" + FormalTestManager.monitorIdListComm.size()); @@ -576,7 +577,7 @@ public class SocketDevResponseService { temMsg.setCode(SourceResponseCodeEnum.DEV_COMM_ALL_SUCCESS.getCode()); temMsg.setOperateCode(SourceOperateCodeEnum.DEV_INIT_GATHER_01.getValue()); temMsg.setRequestId(SourceOperateCodeEnum.YJC_SBTXJY.getValue()); - webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(temMsg)); + WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(temMsg)); } //开始进行协议校验 @@ -599,23 +600,23 @@ public class SocketDevResponseService { break; case UNPROCESSED_BUSINESS: - webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); + WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); break; case DEV_ERROR: failComm.addAll(FormalTestManager.devMapMonitorNum.get(socketDataMsg.getData())); - webSocketHandler.sendMsgToUser(param.getUserPageId(), MsgUtil.msgToWebData(socketDataMsg, FormalTestManager.devNameMapComm, 0)); + WebServiceManager.sendMsg(param.getUserPageId(), MsgUtil.msgToWebData(socketDataMsg, FormalTestManager.devNameMapComm, 0)); completeJudgment(param); break; case DEV_TARGET: failComm.add(socketDataMsg.getData()); - webSocketHandler.sendMsgToUser(param.getUserPageId(), MsgUtil.msgToWebData(socketDataMsg, FormalTestManager.devNameMapComm, 1)); + WebServiceManager.sendMsg(param.getUserPageId(), MsgUtil.msgToWebData(socketDataMsg, FormalTestManager.devNameMapComm, 1)); completeJudgment(param); break; case RE_OPERATE: //出现已经初始化情况,发送用户用户确认是否继续检测 - webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); + WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); CnSocketUtil.quitSend(param); break; case NO_INIT_DEV: @@ -638,7 +639,7 @@ public class SocketDevResponseService { CnSocketUtil.quitSend(param); WebSocketVO webSocketVO = new WebSocketVO<>(); webSocketVO.setRequestId(SourceOperateCodeEnum.ERROR_FLOW_END.getValue()); - webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(webSocketVO)); + WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(webSocketVO)); } successComm.clear(); failComm.clear(); @@ -657,8 +658,7 @@ public class SocketDevResponseService { if (socketDataMsg.getOperateCode().equals(SourceOperateCodeEnum.DEV_INIT_GATHER_02.getValue())) { successComm.add(socketDataMsg.getData()); - - webSocketHandler.sendMsgToUser(param.getUserPageId(), MsgUtil.msgToWebData(socketDataMsg, FormalTestManager.devNameMapComm, 1)); + WebServiceManager.sendMsg(param.getUserPageId(), MsgUtil.msgToWebData(socketDataMsg, FormalTestManager.devNameMapComm, 1)); if (successComm.size() == FormalTestManager.monitorIdListComm.size()) { for (String string : successComm) { //模拟统计协议校验,通讯校验已经校验过,模拟直接推送 @@ -667,7 +667,7 @@ public class SocketDevResponseService { webSend.setCode(SourceResponseCodeEnum.SUCCESS.getCode()); webSend.setRequestId(SourceOperateCodeEnum.YJC_XYJY.getValue()); webSend.setData(string); - webSocketHandler.sendMsgToUser(param.getUserPageId(), MsgUtil.msgToWebData(webSend, FormalTestManager.devNameMapComm, 1)); + WebServiceManager.sendMsg(param.getUserPageId(), MsgUtil.msgToWebData(webSend, FormalTestManager.devNameMapComm, 1)); } successComm.clear(); @@ -687,7 +687,7 @@ public class SocketDevResponseService { } else if (socketDataMsg.getOperateCode().equals(SourceOperateCodeEnum.DEV_INIT_GATHER_03.getValue())) { successComm.add(socketDataMsg.getData()); - webSocketHandler.sendMsgToUser(param.getUserPageId(), MsgUtil.msgToWebData(socketDataMsg, FormalTestManager.devNameMapComm, 1)); + WebServiceManager.sendMsg(param.getUserPageId(), MsgUtil.msgToWebData(socketDataMsg, FormalTestManager.devNameMapComm, 1)); System.out.println(successComm.size() + "=====" + FormalTestManager.monitorIdListComm.size()); if (successComm.size() == FormalTestManager.monitorIdListComm.size()) { @@ -695,7 +695,7 @@ public class SocketDevResponseService { temMsg.setCode(SourceResponseCodeEnum.DEV_COMM_ALL_SUCCESS.getCode()); temMsg.setOperateCode(SourceOperateCodeEnum.DEV_INIT_GATHER_03.getValue()); temMsg.setRequestId(SourceOperateCodeEnum.YJC_XYJY.getValue()); - webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(temMsg)); + WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(temMsg)); //开始下源控制脚本 PqScriptIssueParam issueParam = new PqScriptIssueParam(); @@ -735,7 +735,7 @@ public class SocketDevResponseService { WebSocketVO webSocketVO = new WebSocketVO(); webSocketVO.setRequestId(sourceIssues.get(0).getType() + stepBegin); webSocketVO.setDesc(null); - webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(webSocketVO)); + WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(webSocketVO)); } else if (SourceOperateCodeEnum.PRE_TEST.getValue().equals(param.getOperateType()) || SourceOperateCodeEnum.COEFFICIENT_TEST.getValue().equals(param.getOperateType())) { @@ -768,22 +768,22 @@ public class SocketDevResponseService { break; case UNPROCESSED_BUSINESS: - webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); + WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); break; case DEV_ERROR: failComm.addAll(FormalTestManager.devMapMonitorNum.get(socketDataMsg.getData())); - webSocketHandler.sendMsgToUser(param.getUserPageId(), MsgUtil.msgToWebData(socketDataMsg, FormalTestManager.devNameMapComm, 0)); + WebServiceManager.sendMsg(param.getUserPageId(), MsgUtil.msgToWebData(socketDataMsg, FormalTestManager.devNameMapComm, 0)); completeJudgment(param); break; case DEV_TARGET: failComm.add(socketDataMsg.getData()); - webSocketHandler.sendMsgToUser(param.getUserPageId(), MsgUtil.msgToWebData(socketDataMsg, FormalTestManager.devNameMapComm, 1)); + WebServiceManager.sendMsg(param.getUserPageId(), MsgUtil.msgToWebData(socketDataMsg, FormalTestManager.devNameMapComm, 1)); completeJudgment(param); break; case RE_OPERATE: //出现已经初始化情况,发送用户用户确认是否继续检测 - webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); + WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); CnSocketUtil.quitSend(param); break; default: @@ -804,7 +804,6 @@ public class SocketDevResponseService { if (ObjectUtil.isNotNull(dictDataEnumByCode)) { switch (dictDataEnumByCode) { case SUCCESS: - //webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(MsgUtil.msgToWebData(socketDataMsg,devNameMapComm,1))); devInfo.add(devData); successComm.add(devData.getId()); @@ -831,7 +830,7 @@ public class SocketDevResponseService { for (SourceCompareDev sourceCompareDev : info) { dataMsg.setData(sourceCompareDev.getDevName() + splitTag + sourceCompareDev.getLineNum() + "校验结果:" + sourceCompareDev.getDesc()); - webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(dataMsg)); + WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(dataMsg)); } if (info.stream().anyMatch(it -> !it.getIsQualified())) { @@ -840,7 +839,7 @@ public class SocketDevResponseService { webSocketVO.setOperateCode(SourceOperateCodeEnum.DEV_DATA_REQUEST_02.getValue()); webSocketVO.setCode(SourceResponseCodeEnum.PHASE_CHECK_FAIL.getCode()); webSocketVO.setData(SourceResponseCodeEnum.PHASE_CHECK_FAIL.getMessage()); - webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(webSocketVO)); + WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(webSocketVO)); return; } @@ -850,7 +849,7 @@ public class SocketDevResponseService { temMsg.setCode(SourceResponseCodeEnum.DEV_COMM_ALL_SUCCESS.getCode()); temMsg.setOperateCode(SourceOperateCodeEnum.DEV_DATA_REQUEST_02.getValue()); temMsg.setRequestId(SourceOperateCodeEnum.YJC_XUJY.getValue()); - webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(temMsg)); + WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(temMsg)); successComm.clear(); } @@ -864,7 +863,7 @@ public class SocketDevResponseService { webSocketVO.setRequestId(SourceOperateCodeEnum.Coefficient_Check.getValue()); webSocketVO.setOperateCode(SourceOperateCodeEnum.big_start.getValue()); webSocketVO.setData(XiNumberManager.devParameterList.get(0)); - webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(webSocketVO)); + WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(webSocketVO)); socketMsg.setRequestId(SourceOperateCodeEnum.Coefficient_Check.getValue()); socketMsg.setOperateCode(SourceOperateCodeEnum.OPER_GATHER.getValue()); @@ -889,11 +888,11 @@ public class SocketDevResponseService { devInfo.add(devData); break; case DEV_ERROR: - webSocketHandler.sendMsgToUser(param.getUserPageId(), MsgUtil.msgToWebData(socketDataMsg, FormalTestManager.devNameMapComm, 0)); + WebServiceManager.sendMsg(param.getUserPageId(), MsgUtil.msgToWebData(socketDataMsg, FormalTestManager.devNameMapComm, 0)); CnSocketUtil.quitSend(param); break; case DEV_TARGET: - webSocketHandler.sendMsgToUser(param.getUserPageId(), MsgUtil.msgToWebData(socketDataMsg, FormalTestManager.devNameMapComm, 1)); + WebServiceManager.sendMsg(param.getUserPageId(), MsgUtil.msgToWebData(socketDataMsg, FormalTestManager.devNameMapComm, 1)); CnSocketUtil.quitSend(param); break; case RE_OPERATE: @@ -1066,7 +1065,7 @@ public class SocketDevResponseService { webSocketVO.setRequestId(socketDataMsg.getRequestId().split(stepTag)[1] + stepEnd); webSocketVO.setDesc(sourceIssue.getDesc()); webSocketVO.setData(devListRes); - webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(webSocketVO)); + WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(webSocketVO)); } /** @@ -1550,7 +1549,7 @@ public class SocketDevResponseService { webSocketVO.setRequestId(requestId); webSocketVO.setOperateCode(operatorType); webSocketVO.setData(devParameter); - webSocketHandler.sendMsgToUser(userId, JSON.toJSONString(webSocketVO)); + WebServiceManager.sendMsg(userId, JSON.toJSONString(webSocketVO)); } public void backCheckState(PreDetectionParam param) { 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 c84b0ff9..9f464f4e 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 @@ -13,6 +13,7 @@ import com.njcn.gather.detection.pojo.vo.WebSocketVO; import com.njcn.gather.detection.util.socket.CnSocketUtil; import com.njcn.gather.detection.util.socket.MsgUtil; import com.njcn.gather.detection.util.socket.SocketManager; +import com.njcn.gather.detection.util.socket.WebServiceManager; import com.njcn.gather.detection.util.socket.cilent.NettyClient; import com.njcn.gather.detection.util.socket.cilent.NettyDevClientHandler; import com.njcn.gather.detection.util.socket.web.WebSocketHandler; @@ -34,7 +35,7 @@ public class SocketSourceResponseService { /** * 向webSocket客户端发送消息 */ - private final WebSocketHandler webSocketHandler; + private final SocketDevResponseService socketDevResponseService; private final IPqDevService iPqDevService; @@ -103,7 +104,7 @@ public class SocketSourceResponseService { switch (dictDataEnumByCode) { case SUCCESS: //向前端推送信息 - webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); + WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); String s = param.getUserPageId() + DEV; socketMsg.setRequestId(SourceOperateCodeEnum.Coefficient_Check.getValue()); @@ -119,14 +120,14 @@ public class SocketSourceResponseService { break; case UNPROCESSED_BUSINESS: - webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); + WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); break; default: CnSocketUtil.quitSendSource(param); socketMsg.setRequestId(socketDataMsg.getRequestId()); socketMsg.setOperateCode(socketDataMsg.getOperateCode()); socketMsg.setData(dictDataEnumByCode.getMessage()); - webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketMsg)); + WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketMsg)); break; } } @@ -146,7 +147,7 @@ public class SocketSourceResponseService { switch (dictDataEnumByCode) { case SUCCESS: //todo 前端推送收到的消息暂未处理好 - webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); + WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); String s = param.getUserPageId() + DEV; //开始设备通讯检测(发送设备初始化) List devList = iPqDevService.getDevInfo(param.getDevIds()); @@ -161,36 +162,36 @@ public class SocketSourceResponseService { NettyClient.socketClient(ip, port, param, json, new NettyDevClientHandler(param, socketDevResponseService)); break; case UNPROCESSED_BUSINESS: - webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); + WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); break; case SOURCE_CONNECTION_ERROR: case CONTROLLED_SOURCE_ERROR: CnSocketUtil.quitSendSource(param); - webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); + WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); break; case TEST_ITEM_PARSING_ERROR: CnSocketUtil.quitSendSource(param); - webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); + WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); break; case SOURCE_CONTROL_ERROR: CnSocketUtil.quitSendSource(param); - webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); + WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); break; case TARGET_SOURCE_ERROR: CnSocketUtil.quitSendSource(param); - webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); + WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); break; case NOT_INITIALIZED: CnSocketUtil.quitSendSource(param); - webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); + WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); break; case UNKNOWN_ERROR: CnSocketUtil.quitSendSource(param); - webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); + WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); break; case UNABLE_TO_RESPOND: CnSocketUtil.quitSendSource(param); - webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); + WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); break; default: CnSocketUtil.sendUnSocket(param.getUserPageId()); @@ -212,7 +213,7 @@ public class SocketSourceResponseService { switch (dictDataEnumByCode) { case SUCCESS: //向前端推送信息 - webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); + WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); String s = param.getUserPageId() + DEV; socketMsg.setRequestId(SourceOperateCodeEnum.YJC_XUJY.getValue()); @@ -231,7 +232,7 @@ public class SocketSourceResponseService { SocketManager.sendMsg(s, JSON.toJSONString(socketMsg)); break; case UNPROCESSED_BUSINESS: - webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); + WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); break; case MESSAGE_PARSING_ERROR: CnSocketUtil.quitSendSource(param); @@ -241,7 +242,7 @@ public class SocketSourceResponseService { socketMsg.setRequestId(socketDataMsg.getRequestId()); socketMsg.setOperateCode(socketDataMsg.getOperateCode()); socketMsg.setData(dictDataEnumByCode.getMessage()); - webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketMsg)); + WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketMsg)); break; } } @@ -309,17 +310,17 @@ public class SocketSourceResponseService { 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)); + WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(webSocketVO)); break; case UNPROCESSED_BUSINESS: - webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); + WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); break; default: CnSocketUtil.quitSendSource(param); socketMsg.setRequestId(socketDataMsg.getRequestId()); socketMsg.setOperateCode(socketDataMsg.getOperateCode()); socketMsg.setData(dictDataEnumByCode.getMessage()); - webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketMsg)); + WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketMsg)); break; } } diff --git a/detection/src/main/java/com/njcn/gather/detection/pojo/vo/WebSocketVO.java b/detection/src/main/java/com/njcn/gather/detection/pojo/vo/WebSocketVO.java index 931fe48d..3df6328f 100644 --- a/detection/src/main/java/com/njcn/gather/detection/pojo/vo/WebSocketVO.java +++ b/detection/src/main/java/com/njcn/gather/detection/pojo/vo/WebSocketVO.java @@ -6,6 +6,9 @@ import lombok.Data; import lombok.NoArgsConstructor; +/** + * @author chendaofei + */ @Data @AllArgsConstructor @NoArgsConstructor diff --git a/detection/src/main/java/com/njcn/gather/detection/util/socket/CnSocketUtil.java b/detection/src/main/java/com/njcn/gather/detection/util/socket/CnSocketUtil.java index 319ecbbb..3584e054 100644 --- a/detection/src/main/java/com/njcn/gather/detection/util/socket/CnSocketUtil.java +++ b/detection/src/main/java/com/njcn/gather/detection/util/socket/CnSocketUtil.java @@ -8,6 +8,7 @@ import com.njcn.gather.detection.pojo.vo.CoefficientVO; import com.njcn.gather.detection.pojo.vo.SocketMsg; import com.njcn.gather.detection.pojo.vo.WebSocketVO; import com.njcn.gather.detection.util.socket.web.WebSocketHandler; +import org.apache.poi.ss.formula.functions.T; import java.util.Objects; @@ -47,7 +48,7 @@ public class CnSocketUtil { /** * 推送webSocket数据 */ - public static void sendToWebSocket(String userId,String requestId, String operatorType, Object data,String desc){ + public static void sendToWebSocket(String userId, String requestId, String operatorType, Object data, String desc){ WebSocketVO webSocketVO = new WebSocketVO<>(); webSocketVO.setRequestId(requestId); webSocketVO.setOperateCode(operatorType); diff --git a/detection/src/main/java/com/njcn/gather/detection/util/socket/WebServiceManager.java b/detection/src/main/java/com/njcn/gather/detection/util/socket/WebServiceManager.java index c21d84fa..a64fd709 100644 --- a/detection/src/main/java/com/njcn/gather/detection/util/socket/WebServiceManager.java +++ b/detection/src/main/java/com/njcn/gather/detection/util/socket/WebServiceManager.java @@ -5,6 +5,7 @@ import com.njcn.gather.detection.pojo.vo.WebSocketVO; import io.netty.channel.Channel; import io.netty.handler.codec.http.websocketx.TextWebSocketFrame; import lombok.extern.slf4j.Slf4j; +import org.apache.poi.ss.formula.functions.T; import java.time.LocalDateTime; import java.util.Iterator; diff --git a/detection/src/main/java/com/njcn/gather/detection/util/socket/web/WebSocketHandler.java b/detection/src/main/java/com/njcn/gather/detection/util/socket/web/WebSocketHandler.java index 5d96ff60..5d720081 100644 --- a/detection/src/main/java/com/njcn/gather/detection/util/socket/web/WebSocketHandler.java +++ b/detection/src/main/java/com/njcn/gather/detection/util/socket/web/WebSocketHandler.java @@ -23,8 +23,7 @@ import org.springframework.stereotype.Component; * @Date: 2024/12/10 13:56 */ -@Component -@ChannelHandler.Sharable + @Slf4j public class WebSocketHandler extends SimpleChannelInboundHandler { @@ -35,7 +34,7 @@ public class WebSocketHandler extends SimpleChannelInboundHandler { - private final WebSocketHandler webSocketHandler; @@ -48,7 +46,7 @@ public class WebSocketInitializer extends ChannelInitializer { * 这个handler是将http协议升级为websocket 并且使用 101 作为响应码 * */ pipeline.addLast(new IdleStateHandler(10, -1, -1, TimeUnit.SECONDS)); - pipeline.addLast(webSocketHandler); + pipeline.addLast(new WebSocketHandler()); pipeline.addLast(new WebSocketServerProtocolHandler("/hello")); pipeline.addLast(new ChannelInboundHandlerAdapter() { diff --git a/detection/src/main/java/com/njcn/gather/detection/util/socket/web/WebSocketService.java b/detection/src/main/java/com/njcn/gather/detection/util/socket/web/WebSocketService.java index d53473c0..534f9e69 100644 --- a/detection/src/main/java/com/njcn/gather/detection/util/socket/web/WebSocketService.java +++ b/detection/src/main/java/com/njcn/gather/detection/util/socket/web/WebSocketService.java @@ -25,7 +25,6 @@ import javax.annotation.PreDestroy; @RequiredArgsConstructor public class WebSocketService { - private final WebSocketInitializer webSocketInitializer; /** * 端口号 @@ -57,7 +56,7 @@ public class WebSocketService { //设置连接保持为活动状态 .childOption(ChannelOption.SO_KEEPALIVE, true) - .childHandler(webSocketInitializer); + .childHandler(new WebSocketInitializer()); ChannelFuture future = serverBootstrap.bind(port).sync(); future.addListener(f -> { if (future.isSuccess()) {