ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调

Browse Source
This commit is contained in:
wr
2025-03-07 11:35:51 +08:00
parent c0466ed189
commit fe9a81a3a3
4 changed files with 29 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1043,40 +1043,38 @@ public class SocketDevResponseService {
allDevTestList.clear(); allDevTestList.clear();
CnSocketUtil.sendToWebSocket(param.getUserPageId(), socketDataMsg.getRequestId().split(stepTag)[1] + stepEnd, null, resultList, null); CnSocketUtil.sendToWebSocket(param.getUserPageId(), socketDataMsg.getRequestId().split(stepTag)[1] + stepEnd, null, resultList, null);
} }
if (!param.getIsTeachingMode()) { //在这一步判断是否已经触发暂停按钮
//在这一步判断是否已经触发暂停按钮 if (FormalTestManager.stopFlag && CollUtil.isNotEmpty(SocketManager.getSourceList())) {
if (FormalTestManager.stopFlag && CollUtil.isNotEmpty(SocketManager.getSourceList())) { FormalTestManager.stopTime = 0;
FormalTestManager.stopTime = 0; FormalTestManager.hasStopFlag = true;
FormalTestManager.hasStopFlag = true; successComm.clear();
successComm.clear(); FormalTestManager.realDataXiList.clear();
FormalTestManager.realDataXiList.clear(); sendWebSocket(param.getUserPageId(), "preStopTest", "stop", null);
sendWebSocket(param.getUserPageId(), "preStopTest", "stop", null); return;
return; }
//开始进行下一项检测
List<SourceIssue> sourceIssueList = SocketManager.getSourceList();
if (CollUtil.isNotEmpty(sourceIssueList)) {
SourceIssue sourceIssues = SocketManager.getSourceList().get(0);
if (residueCount == 0) {
CnSocketUtil.sendToWebSocket(param.getUserPageId(), sourceIssues.getType() + stepBegin, null, new ArrayList<>(), null);
} }
//开始进行下一项检测 SocketMsg<String> xuMsg = new SocketMsg<>();
List<SourceIssue> sourceIssueList = SocketManager.getSourceList(); xuMsg.setOperateCode(SourceOperateCodeEnum.OPER_GATHER.getValue());
if (CollUtil.isNotEmpty(sourceIssueList)) { xuMsg.setData(JSON.toJSONString(sourceIssues));
SourceIssue sourceIssues = SocketManager.getSourceList().get(0); xuMsg.setRequestId(SourceOperateCodeEnum.FORMAL_REAL.getValue() + stepTag + sourceIssues.getType());
if (residueCount == 0) { SocketManager.sendMsg(param.getUserPageId() + handlerSourceStr, JSON.toJSONString(xuMsg));
CnSocketUtil.sendToWebSocket(param.getUserPageId(), sourceIssues.getType() + stepBegin, null, new ArrayList<>(), null); } else {
} //TODO 是否最终检测完成需要推送给用户
PqScriptCheckDataParam checkDataParam = new PqScriptCheckDataParam();
checkDataParam.setScriptId(param.getScriptId());
checkDataParam.setIsValueTypeName(false);
List<String> valueType = iPqScriptCheckDataService.getValueType(checkDataParam);
SocketMsg<String> xuMsg = new SocketMsg<>(); iPqDevService.updateResult(param.getDevIds(), valueType, param.getCode());
xuMsg.setOperateCode(SourceOperateCodeEnum.OPER_GATHER.getValue()); CnSocketUtil.quitSend(param);
xuMsg.setData(JSON.toJSONString(sourceIssues));
xuMsg.setRequestId(SourceOperateCodeEnum.FORMAL_REAL.getValue() + stepTag + sourceIssues.getType());
SocketManager.sendMsg(param.getUserPageId() + handlerSourceStr, JSON.toJSONString(xuMsg));
} else {
//TODO 是否最终检测完成需要推送给用户
PqScriptCheckDataParam checkDataParam = new PqScriptCheckDataParam();
checkDataParam.setScriptId(param.getScriptId());
checkDataParam.setIsValueTypeName(false);
List<String> valueType = iPqScriptCheckDataService.getValueType(checkDataParam);
iPqDevService.updateResult(param.getDevIds(), valueType, param.getCode());
CnSocketUtil.quitSend(param);
}
} }
successComm.clear(); successComm.clear();
FormalTestManager.realDataXiList.clear(); FormalTestManager.realDataXiList.clear();

4
detection/src/main/java/com/njcn/gather/detection/pojo/param/PreDetectionParam.java
View File

@@ -62,8 +62,4 @@ public class PreDetectionParam {
*/ */
private String code; private String code;
/**
* 是否是教学模式
*/
private Boolean isTeachingMode=false;
} }

4
detection/src/main/java/com/njcn/gather/detection/service/PreDetectionService.java
View File

@@ -32,10 +32,6 @@ public interface PreDetectionService {
boolean restartTemTest(PreDetectionParam param); boolean restartTemTest(PreDetectionParam param);
void closeCheck(PreDetectionParam param);
void nextScript(PreDetectionParam param);
/** /**
* 模拟测试-源通讯校验 * 模拟测试-源通讯校验
* *

34
detection/src/main/java/com/njcn/gather/detection/service/impl/PreDetectionServiceImpl.java
View File

@@ -223,40 +223,6 @@ public class PreDetectionServiceImpl implements PreDetectionService {
return true; return true;
} }
@Override
public void closeCheck(PreDetectionParam param) {
commCheck(param);
specialDeal(param);
}
@Override
public void nextScript(PreDetectionParam param) {
//开始进行下一项检测
SourceIssue sourceIssue = SocketManager.getSourceList().get(0);
long residueCount = SocketManager.getSourceTarget(sourceIssue.getType()) - 1;
List<SourceIssue> sourceIssueList = SocketManager.getSourceList();
if (CollUtil.isNotEmpty(sourceIssueList)) {
SourceIssue sourceIssues = SocketManager.getSourceList().get(0);
if (residueCount == 0) {
CnSocketUtil.sendToWebSocket(param.getUserPageId(), sourceIssues.getType() + "_Start", null, new ArrayList<>(), null);
}
SocketMsg<String> xuMsg = new SocketMsg<>();
xuMsg.setOperateCode(SourceOperateCodeEnum.OPER_GATHER.getValue());
xuMsg.setData(JSON.toJSONString(sourceIssues));
xuMsg.setRequestId(SourceOperateCodeEnum.FORMAL_REAL.getValue() + "&&" + sourceIssues.getType());
SocketManager.sendMsg(param.getUserPageId() + "_Source", JSON.toJSONString(xuMsg));
} else {
//TODO 是否最终检测完成需要推送给用户
PqScriptCheckDataParam checkDataParam = new PqScriptCheckDataParam();
checkDataParam.setScriptId(param.getScriptId());
checkDataParam.setIsValueTypeName(false);
List<String> valueType = iPqScriptCheckDataService.getValueType(checkDataParam);
iPqDevService.updateResult(param.getDevIds(), valueType, param.getCode());
CnSocketUtil.quitSend(param);
}
}
@Override @Override
public void ytxCheckSimulate(SimulateDetectionParam param) { public void ytxCheckSimulate(SimulateDetectionParam param) {
PreDetectionParam preDetectionParam = new PreDetectionParam(); PreDetectionParam preDetectionParam = new PreDetectionParam();