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-16 18:16:34 +08:00
parent 17f9ecee29
commit 6435d7135d
9 changed files with 65 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
detection/src/main/java/com/njcn/gather/detection/controller/PreDetectionController.java
View File

@@ -57,7 +57,6 @@ public class PreDetectionController extends BaseController {
@ApiOperation("开始检测") @ApiOperation("开始检测")
@ApiImplicitParam(name = "param", value = "查询参数", required = true) @ApiImplicitParam(name = "param", value = "查询参数", required = true)
public HttpResult<String> startPreTest(@RequestBody PreDetectionParam param){ public HttpResult<String> startPreTest(@RequestBody PreDetectionParam param){
System.out.println("开始检测controller进入================================22");
String methodDescribe = getMethodDescribe("startPreTest"); String methodDescribe = getMethodDescribe("startPreTest");
preDetectionService.sourceCommunicationCheck(param); preDetectionService.sourceCommunicationCheck(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
@@ -72,7 +71,6 @@ public class PreDetectionController extends BaseController {
@ApiOperation("系数校验") @ApiOperation("系数校验")
@ApiImplicitParam(name = "param", value = "查询参数", required = true) @ApiImplicitParam(name = "param", value = "查询参数", required = true)
public HttpResult<String> coefficientCheck(@RequestBody PreDetectionParam param){ public HttpResult<String> coefficientCheck(@RequestBody PreDetectionParam param){
System.out.println("系数校验controller进入================================");
String methodDescribe = getMethodDescribe("coefficientCheck"); String methodDescribe = getMethodDescribe("coefficientCheck");
preDetectionService.coefficientCheck(param); preDetectionService.coefficientCheck(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);

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

@@ -15,7 +15,6 @@ import com.njcn.gather.detection.pojo.po.SourceCompareDev;
import com.njcn.gather.detection.pojo.vo.*; import com.njcn.gather.detection.pojo.vo.*;
import com.njcn.gather.detection.service.impl.DetectionServiceImpl; import com.njcn.gather.detection.service.impl.DetectionServiceImpl;
import com.njcn.gather.detection.util.socket.*; 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.po.PqDev;
import com.njcn.gather.device.device.pojo.vo.PreDetection; import com.njcn.gather.device.device.pojo.vo.PreDetection;
import com.njcn.gather.device.device.service.IPqDevService; import com.njcn.gather.device.device.service.IPqDevService;
@@ -72,7 +71,7 @@ public class SocketDevResponseService {
private final List<String> 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<String> 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<String> harmonicList = Stream.of(DicDataEnum.HV.getCode(), DicDataEnum.HI.getCode(), DicDataEnum.HP.getCode(), DicDataEnum.HSV.getCode(), DicDataEnum.HSI.getCode()).collect(Collectors.toList()); private final List<String> 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 IPqDevService iPqDevService;
private final IPqScriptDtlsService scriptDtlsService; private final IPqScriptDtlsService scriptDtlsService;
private final IPqScriptDtlsService pqScriptDtlsService; private final IPqScriptDtlsService pqScriptDtlsService;
@@ -279,11 +278,12 @@ public class SocketDevResponseService {
gf.add(gfItem); gf.add(gfItem);
//表格数据 //表格数据
WebSocketVO<CoefficientVO> webSocketVO = new WebSocketVO<>(); WebSocketVO<Object> webSocketVO = new WebSocketVO<>();
webSocketVO.setRequestId(SourceOperateCodeEnum.Coefficient_Check.getValue()); webSocketVO.setRequestId(SourceOperateCodeEnum.Coefficient_Check.getValue());
webSocketVO.setOperateCode(SourceOperateCodeEnum.DATA_CHNFACTOR$02.getValue()); webSocketVO.setOperateCode(SourceOperateCodeEnum.DATA_CHNFACTOR$02.getValue());
webSocketVO.setData(coefficientVO); webSocketVO.setData(coefficientVO);
webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(webSocketVO));
WebServiceManager.sendMessage(param.getUserPageId(),webSocketVO);
}); });
DevXiNumData devXiNumData = new DevXiNumData(); DevXiNumData devXiNumData = new DevXiNumData();
devXiNumData.setChnNum(0); devXiNumData.setChnNum(0);
@@ -418,7 +418,7 @@ public class SocketDevResponseService {
} }
break; break;
case UNPROCESSED_BUSINESS: case UNPROCESSED_BUSINESS:
webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); WebServiceManager.sendMsg(param.getUserPageId(),JSON.toJSONString(socketDataMsg));
break; break;
case NORMAL_RESPONSE: case NORMAL_RESPONSE:
realDataXiList.add(devData); realDataXiList.add(devData);
@@ -427,7 +427,7 @@ public class SocketDevResponseService {
xiSocket.setRequestId(socketDataMsg.getRequestId()); xiSocket.setRequestId(socketDataMsg.getRequestId());
xiSocket.setOperateCode(socketDataMsg.getOperateCode()); xiSocket.setOperateCode(socketDataMsg.getOperateCode());
xiSocket.setData(dictDataEnumByCode.getMessage()); xiSocket.setData(dictDataEnumByCode.getMessage());
webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(xiSocket)); WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(xiSocket));
break; break;
} }
} }
@@ -564,7 +564,8 @@ public class SocketDevResponseService {
successComm.add(result); successComm.add(result);
//通讯校验成功 //通讯校验成功
if (!param.getOperateType().equals(SourceOperateCodeEnum.TEST_TEM_START.getValue())) { 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()); System.out.println("设备通讯校验！" + successComm.size() + "=====" + FormalTestManager.monitorIdListComm.size());
@@ -576,7 +577,7 @@ public class SocketDevResponseService {
temMsg.setCode(SourceResponseCodeEnum.DEV_COMM_ALL_SUCCESS.getCode()); temMsg.setCode(SourceResponseCodeEnum.DEV_COMM_ALL_SUCCESS.getCode());
temMsg.setOperateCode(SourceOperateCodeEnum.DEV_INIT_GATHER_01.getValue()); temMsg.setOperateCode(SourceOperateCodeEnum.DEV_INIT_GATHER_01.getValue());
temMsg.setRequestId(SourceOperateCodeEnum.YJC_SBTXJY.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; break;
case UNPROCESSED_BUSINESS: case UNPROCESSED_BUSINESS:
webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
break; break;
case DEV_ERROR: case DEV_ERROR:
failComm.addAll(FormalTestManager.devMapMonitorNum.get(socketDataMsg.getData())); 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); completeJudgment(param);
break; break;
case DEV_TARGET: case DEV_TARGET:
failComm.add(socketDataMsg.getData()); 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); completeJudgment(param);
break; break;
case RE_OPERATE: case RE_OPERATE:
//出现已经初始化情况，发送用户用户确认是否继续检测 //出现已经初始化情况，发送用户用户确认是否继续检测
webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
CnSocketUtil.quitSend(param); CnSocketUtil.quitSend(param);
break; break;
case NO_INIT_DEV: case NO_INIT_DEV:
@@ -638,7 +639,7 @@ public class SocketDevResponseService {
CnSocketUtil.quitSend(param); CnSocketUtil.quitSend(param);
WebSocketVO<String> webSocketVO = new WebSocketVO<>(); WebSocketVO<String> webSocketVO = new WebSocketVO<>();
webSocketVO.setRequestId(SourceOperateCodeEnum.ERROR_FLOW_END.getValue()); webSocketVO.setRequestId(SourceOperateCodeEnum.ERROR_FLOW_END.getValue());
webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(webSocketVO)); WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(webSocketVO));
} }
successComm.clear(); successComm.clear();
failComm.clear(); failComm.clear();
@@ -657,8 +658,7 @@ public class SocketDevResponseService {
if (socketDataMsg.getOperateCode().equals(SourceOperateCodeEnum.DEV_INIT_GATHER_02.getValue())) { if (socketDataMsg.getOperateCode().equals(SourceOperateCodeEnum.DEV_INIT_GATHER_02.getValue())) {
successComm.add(socketDataMsg.getData()); successComm.add(socketDataMsg.getData());
WebServiceManager.sendMsg(param.getUserPageId(), MsgUtil.msgToWebData(socketDataMsg, FormalTestManager.devNameMapComm, 1));
webSocketHandler.sendMsgToUser(param.getUserPageId(), MsgUtil.msgToWebData(socketDataMsg, FormalTestManager.devNameMapComm, 1));
if (successComm.size() == FormalTestManager.monitorIdListComm.size()) { if (successComm.size() == FormalTestManager.monitorIdListComm.size()) {
for (String string : successComm) { for (String string : successComm) {
//模拟统计协议校验，通讯校验已经校验过，模拟直接推送 //模拟统计协议校验，通讯校验已经校验过，模拟直接推送
@@ -667,7 +667,7 @@ public class SocketDevResponseService {
webSend.setCode(SourceResponseCodeEnum.SUCCESS.getCode()); webSend.setCode(SourceResponseCodeEnum.SUCCESS.getCode());
webSend.setRequestId(SourceOperateCodeEnum.YJC_XYJY.getValue()); webSend.setRequestId(SourceOperateCodeEnum.YJC_XYJY.getValue());
webSend.setData(string); 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(); successComm.clear();
@@ -687,7 +687,7 @@ public class SocketDevResponseService {
} else if (socketDataMsg.getOperateCode().equals(SourceOperateCodeEnum.DEV_INIT_GATHER_03.getValue())) { } else if (socketDataMsg.getOperateCode().equals(SourceOperateCodeEnum.DEV_INIT_GATHER_03.getValue())) {
successComm.add(socketDataMsg.getData()); 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()); System.out.println(successComm.size() + "=====" + FormalTestManager.monitorIdListComm.size());
if (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.setCode(SourceResponseCodeEnum.DEV_COMM_ALL_SUCCESS.getCode());
temMsg.setOperateCode(SourceOperateCodeEnum.DEV_INIT_GATHER_03.getValue()); temMsg.setOperateCode(SourceOperateCodeEnum.DEV_INIT_GATHER_03.getValue());
temMsg.setRequestId(SourceOperateCodeEnum.YJC_XYJY.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(); PqScriptIssueParam issueParam = new PqScriptIssueParam();
@@ -735,7 +735,7 @@ public class SocketDevResponseService {
WebSocketVO<Object> webSocketVO = new WebSocketVO(); WebSocketVO<Object> webSocketVO = new WebSocketVO();
webSocketVO.setRequestId(sourceIssues.get(0).getType() + stepBegin); webSocketVO.setRequestId(sourceIssues.get(0).getType() + stepBegin);
webSocketVO.setDesc(null); 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())) { } else if (SourceOperateCodeEnum.PRE_TEST.getValue().equals(param.getOperateType()) || SourceOperateCodeEnum.COEFFICIENT_TEST.getValue().equals(param.getOperateType())) {
@@ -768,22 +768,22 @@ public class SocketDevResponseService {
break; break;
case UNPROCESSED_BUSINESS: case UNPROCESSED_BUSINESS:
webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
break; break;
case DEV_ERROR: case DEV_ERROR:
failComm.addAll(FormalTestManager.devMapMonitorNum.get(socketDataMsg.getData())); 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); completeJudgment(param);
break; break;
case DEV_TARGET: case DEV_TARGET:
failComm.add(socketDataMsg.getData()); 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); completeJudgment(param);
break; break;
case RE_OPERATE: case RE_OPERATE:
//出现已经初始化情况，发送用户用户确认是否继续检测 //出现已经初始化情况，发送用户用户确认是否继续检测
webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
CnSocketUtil.quitSend(param); CnSocketUtil.quitSend(param);
break; break;
default: default:
@@ -804,7 +804,6 @@ public class SocketDevResponseService {
if (ObjectUtil.isNotNull(dictDataEnumByCode)) { if (ObjectUtil.isNotNull(dictDataEnumByCode)) {
switch (dictDataEnumByCode) { switch (dictDataEnumByCode) {
case SUCCESS: case SUCCESS:
//webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(MsgUtil.msgToWebData(socketDataMsg,devNameMapComm,1)));
devInfo.add(devData); devInfo.add(devData);
successComm.add(devData.getId()); successComm.add(devData.getId());
@@ -831,7 +830,7 @@ public class SocketDevResponseService {
for (SourceCompareDev sourceCompareDev : info) { for (SourceCompareDev sourceCompareDev : info) {
dataMsg.setData(sourceCompareDev.getDevName() + splitTag + sourceCompareDev.getLineNum() + "校验结果:" + sourceCompareDev.getDesc()); 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())) { if (info.stream().anyMatch(it -> !it.getIsQualified())) {
@@ -840,7 +839,7 @@ public class SocketDevResponseService {
webSocketVO.setOperateCode(SourceOperateCodeEnum.DEV_DATA_REQUEST_02.getValue()); webSocketVO.setOperateCode(SourceOperateCodeEnum.DEV_DATA_REQUEST_02.getValue());
webSocketVO.setCode(SourceResponseCodeEnum.PHASE_CHECK_FAIL.getCode()); webSocketVO.setCode(SourceResponseCodeEnum.PHASE_CHECK_FAIL.getCode());
webSocketVO.setData(SourceResponseCodeEnum.PHASE_CHECK_FAIL.getMessage()); webSocketVO.setData(SourceResponseCodeEnum.PHASE_CHECK_FAIL.getMessage());
webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(webSocketVO)); WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(webSocketVO));
return; return;
} }
@@ -850,7 +849,7 @@ public class SocketDevResponseService {
temMsg.setCode(SourceResponseCodeEnum.DEV_COMM_ALL_SUCCESS.getCode()); temMsg.setCode(SourceResponseCodeEnum.DEV_COMM_ALL_SUCCESS.getCode());
temMsg.setOperateCode(SourceOperateCodeEnum.DEV_DATA_REQUEST_02.getValue()); temMsg.setOperateCode(SourceOperateCodeEnum.DEV_DATA_REQUEST_02.getValue());
temMsg.setRequestId(SourceOperateCodeEnum.YJC_XUJY.getValue()); temMsg.setRequestId(SourceOperateCodeEnum.YJC_XUJY.getValue());
webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(temMsg)); WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(temMsg));
successComm.clear(); successComm.clear();
} }
@@ -864,7 +863,7 @@ public class SocketDevResponseService {
webSocketVO.setRequestId(SourceOperateCodeEnum.Coefficient_Check.getValue()); webSocketVO.setRequestId(SourceOperateCodeEnum.Coefficient_Check.getValue());
webSocketVO.setOperateCode(SourceOperateCodeEnum.big_start.getValue()); webSocketVO.setOperateCode(SourceOperateCodeEnum.big_start.getValue());
webSocketVO.setData(XiNumberManager.devParameterList.get(0)); 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.setRequestId(SourceOperateCodeEnum.Coefficient_Check.getValue());
socketMsg.setOperateCode(SourceOperateCodeEnum.OPER_GATHER.getValue()); socketMsg.setOperateCode(SourceOperateCodeEnum.OPER_GATHER.getValue());
@@ -889,11 +888,11 @@ public class SocketDevResponseService {
devInfo.add(devData); devInfo.add(devData);
break; break;
case DEV_ERROR: 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); CnSocketUtil.quitSend(param);
break; break;
case DEV_TARGET: 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); CnSocketUtil.quitSend(param);
break; break;
case RE_OPERATE: case RE_OPERATE:
@@ -1066,7 +1065,7 @@ public class SocketDevResponseService {
webSocketVO.setRequestId(socketDataMsg.getRequestId().split(stepTag)[1] + stepEnd); webSocketVO.setRequestId(socketDataMsg.getRequestId().split(stepTag)[1] + stepEnd);
webSocketVO.setDesc(sourceIssue.getDesc()); webSocketVO.setDesc(sourceIssue.getDesc());
webSocketVO.setData(devListRes); 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.setRequestId(requestId);
webSocketVO.setOperateCode(operatorType); webSocketVO.setOperateCode(operatorType);
webSocketVO.setData(devParameter); webSocketVO.setData(devParameter);
webSocketHandler.sendMsgToUser(userId, JSON.toJSONString(webSocketVO)); WebServiceManager.sendMsg(userId, JSON.toJSONString(webSocketVO));
} }
public void backCheckState(PreDetectionParam param) { public void backCheckState(PreDetectionParam param) {

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

@@ -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.CnSocketUtil;
import com.njcn.gather.detection.util.socket.MsgUtil; import com.njcn.gather.detection.util.socket.MsgUtil;
import com.njcn.gather.detection.util.socket.SocketManager; 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.NettyClient;
import com.njcn.gather.detection.util.socket.cilent.NettyDevClientHandler; import com.njcn.gather.detection.util.socket.cilent.NettyDevClientHandler;
import com.njcn.gather.detection.util.socket.web.WebSocketHandler; import com.njcn.gather.detection.util.socket.web.WebSocketHandler;
@@ -34,7 +35,7 @@ public class SocketSourceResponseService {
/** /**
* 向webSocket客户端发送消息 * 向webSocket客户端发送消息
*/ */
private final WebSocketHandler webSocketHandler;
private final SocketDevResponseService socketDevResponseService; private final SocketDevResponseService socketDevResponseService;
private final IPqDevService iPqDevService; private final IPqDevService iPqDevService;
@@ -103,7 +104,7 @@ public class SocketSourceResponseService {
switch (dictDataEnumByCode) { switch (dictDataEnumByCode) {
case SUCCESS: case SUCCESS:
//向前端推送信息 //向前端推送信息
webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
String s = param.getUserPageId() + DEV; String s = param.getUserPageId() + DEV;
socketMsg.setRequestId(SourceOperateCodeEnum.Coefficient_Check.getValue()); socketMsg.setRequestId(SourceOperateCodeEnum.Coefficient_Check.getValue());
@@ -119,14 +120,14 @@ public class SocketSourceResponseService {
break; break;
case UNPROCESSED_BUSINESS: case UNPROCESSED_BUSINESS:
webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
break; break;
default: default:
CnSocketUtil.quitSendSource(param); CnSocketUtil.quitSendSource(param);
socketMsg.setRequestId(socketDataMsg.getRequestId()); socketMsg.setRequestId(socketDataMsg.getRequestId());
socketMsg.setOperateCode(socketDataMsg.getOperateCode()); socketMsg.setOperateCode(socketDataMsg.getOperateCode());
socketMsg.setData(dictDataEnumByCode.getMessage()); socketMsg.setData(dictDataEnumByCode.getMessage());
webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketMsg)); WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketMsg));
break; break;
} }
} }
@@ -146,7 +147,7 @@ public class SocketSourceResponseService {
switch (dictDataEnumByCode) { switch (dictDataEnumByCode) {
case SUCCESS: case SUCCESS:
//todo 前端推送收到的消息暂未处理好 //todo 前端推送收到的消息暂未处理好
webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
String s = param.getUserPageId() + DEV; String s = param.getUserPageId() + DEV;
//开始设备通讯检测(发送设备初始化) //开始设备通讯检测(发送设备初始化)
List<PreDetection> devList = iPqDevService.getDevInfo(param.getDevIds()); List<PreDetection> devList = iPqDevService.getDevInfo(param.getDevIds());
@@ -161,36 +162,36 @@ public class SocketSourceResponseService {
NettyClient.socketClient(ip, port, param, json, new NettyDevClientHandler(param, socketDevResponseService)); NettyClient.socketClient(ip, port, param, json, new NettyDevClientHandler(param, socketDevResponseService));
break; break;
case UNPROCESSED_BUSINESS: case UNPROCESSED_BUSINESS:
webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
break; break;
case SOURCE_CONNECTION_ERROR: case SOURCE_CONNECTION_ERROR:
case CONTROLLED_SOURCE_ERROR: case CONTROLLED_SOURCE_ERROR:
CnSocketUtil.quitSendSource(param); CnSocketUtil.quitSendSource(param);
webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
break; break;
case TEST_ITEM_PARSING_ERROR: case TEST_ITEM_PARSING_ERROR:
CnSocketUtil.quitSendSource(param); CnSocketUtil.quitSendSource(param);
webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
break; break;
case SOURCE_CONTROL_ERROR: case SOURCE_CONTROL_ERROR:
CnSocketUtil.quitSendSource(param); CnSocketUtil.quitSendSource(param);
webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
break; break;
case TARGET_SOURCE_ERROR: case TARGET_SOURCE_ERROR:
CnSocketUtil.quitSendSource(param); CnSocketUtil.quitSendSource(param);
webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
break; break;
case NOT_INITIALIZED: case NOT_INITIALIZED:
CnSocketUtil.quitSendSource(param); CnSocketUtil.quitSendSource(param);
webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
break; break;
case UNKNOWN_ERROR: case UNKNOWN_ERROR:
CnSocketUtil.quitSendSource(param); CnSocketUtil.quitSendSource(param);
webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
break; break;
case UNABLE_TO_RESPOND: case UNABLE_TO_RESPOND:
CnSocketUtil.quitSendSource(param); CnSocketUtil.quitSendSource(param);
webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
break; break;
default: default:
CnSocketUtil.sendUnSocket(param.getUserPageId()); CnSocketUtil.sendUnSocket(param.getUserPageId());
@@ -212,7 +213,7 @@ public class SocketSourceResponseService {
switch (dictDataEnumByCode) { switch (dictDataEnumByCode) {
case SUCCESS: case SUCCESS:
//向前端推送信息 //向前端推送信息
webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
String s = param.getUserPageId() + DEV; String s = param.getUserPageId() + DEV;
socketMsg.setRequestId(SourceOperateCodeEnum.YJC_XUJY.getValue()); socketMsg.setRequestId(SourceOperateCodeEnum.YJC_XUJY.getValue());
@@ -231,7 +232,7 @@ public class SocketSourceResponseService {
SocketManager.sendMsg(s, JSON.toJSONString(socketMsg)); SocketManager.sendMsg(s, JSON.toJSONString(socketMsg));
break; break;
case UNPROCESSED_BUSINESS: case UNPROCESSED_BUSINESS:
webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
break; break;
case MESSAGE_PARSING_ERROR: case MESSAGE_PARSING_ERROR:
CnSocketUtil.quitSendSource(param); CnSocketUtil.quitSendSource(param);
@@ -241,7 +242,7 @@ public class SocketSourceResponseService {
socketMsg.setRequestId(socketDataMsg.getRequestId()); socketMsg.setRequestId(socketDataMsg.getRequestId());
socketMsg.setOperateCode(socketDataMsg.getOperateCode()); socketMsg.setOperateCode(socketDataMsg.getOperateCode());
socketMsg.setData(dictDataEnumByCode.getMessage()); socketMsg.setData(dictDataEnumByCode.getMessage());
webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketMsg)); WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketMsg));
break; break;
} }
} }
@@ -309,17 +310,17 @@ public class SocketSourceResponseService {
webSocketVO.setRequestId(socketDataMsg.getRequestId().split(stepTag)[1] + stepBegin); webSocketVO.setRequestId(socketDataMsg.getRequestId().split(stepTag)[1] + stepBegin);
webSocketVO.setDesc(SocketManager.getSourceList().get(0).getDesc()); webSocketVO.setDesc(SocketManager.getSourceList().get(0).getDesc());
webSocketVO.setData(devListRes); webSocketVO.setData(devListRes);
webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(webSocketVO)); WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(webSocketVO));
break; break;
case UNPROCESSED_BUSINESS: case UNPROCESSED_BUSINESS:
webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
break; break;
default: default:
CnSocketUtil.quitSendSource(param); CnSocketUtil.quitSendSource(param);
socketMsg.setRequestId(socketDataMsg.getRequestId()); socketMsg.setRequestId(socketDataMsg.getRequestId());
socketMsg.setOperateCode(socketDataMsg.getOperateCode()); socketMsg.setOperateCode(socketDataMsg.getOperateCode());
socketMsg.setData(dictDataEnumByCode.getMessage()); socketMsg.setData(dictDataEnumByCode.getMessage());
webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketMsg)); WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketMsg));
break; break;
} }
} }

3
detection/src/main/java/com/njcn/gather/detection/pojo/vo/WebSocketVO.java
View File

@@ -6,6 +6,9 @@ import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
/**
* @author chendaofei
*/
@Data @Data
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor

3
detection/src/main/java/com/njcn/gather/detection/util/socket/CnSocketUtil.java
View File

@@ -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.SocketMsg;
import com.njcn.gather.detection.pojo.vo.WebSocketVO; import com.njcn.gather.detection.pojo.vo.WebSocketVO;
import com.njcn.gather.detection.util.socket.web.WebSocketHandler; import com.njcn.gather.detection.util.socket.web.WebSocketHandler;
import org.apache.poi.ss.formula.functions.T;
import java.util.Objects; import java.util.Objects;
@@ -47,7 +48,7 @@ public class CnSocketUtil {
/** /**
* 推送webSocket数据 * 推送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<Object> webSocketVO = new WebSocketVO<>(); WebSocketVO<Object> webSocketVO = new WebSocketVO<>();
webSocketVO.setRequestId(requestId); webSocketVO.setRequestId(requestId);
webSocketVO.setOperateCode(operatorType); webSocketVO.setOperateCode(operatorType);

1
detection/src/main/java/com/njcn/gather/detection/util/socket/WebServiceManager.java
View File

@@ -5,6 +5,7 @@ import com.njcn.gather.detection.pojo.vo.WebSocketVO;
import io.netty.channel.Channel; import io.netty.channel.Channel;
import io.netty.handler.codec.http.websocketx.TextWebSocketFrame; import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.formula.functions.T;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Iterator; import java.util.Iterator;

11
detection/src/main/java/com/njcn/gather/detection/util/socket/web/WebSocketHandler.java
View File

@@ -23,8 +23,7 @@ import org.springframework.stereotype.Component;
* @Date: 2024/12/10 13:56 * @Date: 2024/12/10 13:56
*/ */
@Component
@ChannelHandler.Sharable
@Slf4j @Slf4j
public class WebSocketHandler extends SimpleChannelInboundHandler<TextWebSocketFrame> { public class WebSocketHandler extends SimpleChannelInboundHandler<TextWebSocketFrame> {
@@ -35,7 +34,7 @@ public class WebSocketHandler extends SimpleChannelInboundHandler<TextWebSocketF
@Override @Override
public void channelActive(ChannelHandlerContext ctx) throws Exception { public void channelActive(ChannelHandlerContext ctx) throws Exception {
System.out.println("webSocket服务端通道已建立" + ctx.channel().remoteAddress()); System.out.println("webSocket服务端通道已建立" + ctx.channel().id());
super.channelActive(ctx); super.channelActive(ctx);
} }
@@ -111,18 +110,18 @@ public class WebSocketHandler extends SimpleChannelInboundHandler<TextWebSocketF
@Override @Override
public void handlerRemoved(ChannelHandlerContext ctx) throws Exception { public void handlerRemoved(ChannelHandlerContext ctx) throws Exception {
// 假设用户 ID 是从某个地方获取的，这里简单示例为 "userId" // 假设用户 ID 是从某个地方获取的，这里简单示例为 "userId"
System.out.println("weoSocket退出: " + ctx); System.out.println("weoSocket客户端退出: " + ctx.channel().id());
WebServiceManager.removeChannel(ctx.channel().id().toString()); WebServiceManager.removeChannel(ctx.channel().id().toString());
} }
@Override @Override
public void channelInactive(ChannelHandlerContext ctx) throws Exception { public void channelInactive(ChannelHandlerContext ctx) throws Exception {
System.out.println("weoSocket断线"); System.out.println("weoSocket断线" + ctx.channel().id());
ctx.close(); ctx.close();
PreDetectionParam param = new PreDetectionParam(); PreDetectionParam param = new PreDetectionParam();
param.setUserPageId("cdf_Dev"); param.setUserPageId("cdf");
CnSocketUtil.quitSend(param); CnSocketUtil.quitSend(param);
} }

6
detection/src/main/java/com/njcn/gather/detection/util/socket/web/WebSocketInitializer.java
View File

@@ -21,11 +21,9 @@ import java.util.concurrent.TimeUnit;
* @Author: wr * @Author: wr
* @Date: 2024/12/10 14:20 * @Date: 2024/12/10 14:20
*/ */
@Component
@RequiredArgsConstructor
public class WebSocketInitializer extends ChannelInitializer<SocketChannel> { public class WebSocketInitializer extends ChannelInitializer<SocketChannel> {
private final WebSocketHandler webSocketHandler;
@@ -48,7 +46,7 @@ public class WebSocketInitializer extends ChannelInitializer<SocketChannel> {
* 这个handler是将http协议升级为websocket 并且使用 101 作为响应码 * 这个handler是将http协议升级为websocket 并且使用 101 作为响应码
* */ * */
pipeline.addLast(new IdleStateHandler(10, -1, -1, TimeUnit.SECONDS)); pipeline.addLast(new IdleStateHandler(10, -1, -1, TimeUnit.SECONDS));
pipeline.addLast(webSocketHandler); pipeline.addLast(new WebSocketHandler());
pipeline.addLast(new WebSocketServerProtocolHandler("/hello")); pipeline.addLast(new WebSocketServerProtocolHandler("/hello"));
pipeline.addLast(new ChannelInboundHandlerAdapter() { pipeline.addLast(new ChannelInboundHandlerAdapter() {

3
detection/src/main/java/com/njcn/gather/detection/util/socket/web/WebSocketService.java
View File

@@ -25,7 +25,6 @@ import javax.annotation.PreDestroy;
@RequiredArgsConstructor @RequiredArgsConstructor
public class WebSocketService { public class WebSocketService {
private final WebSocketInitializer webSocketInitializer;
/** /**
* 端口号 * 端口号
@@ -57,7 +56,7 @@ public class WebSocketService {
//设置连接保持为活动状态 //设置连接保持为活动状态
.childOption(ChannelOption.SO_KEEPALIVE, true) .childOption(ChannelOption.SO_KEEPALIVE, true)
.childHandler(webSocketInitializer); .childHandler(new WebSocketInitializer());
ChannelFuture future = serverBootstrap.bind(port).sync(); ChannelFuture future = serverBootstrap.bind(port).sync();
future.addListener(f -> { future.addListener(f -> {
if (future.isSuccess()) { if (future.isSuccess()) {