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

微调

Browse Source
This commit is contained in:
caozehui
2025-04-28 11:40:32 +08:00
parent c96cadc5d1
commit 5fa09bb41b
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -778,6 +778,7 @@ public class SocketDevResponseService {
if (successComm.size() == FormalTestManager.monitorIdListComm.size()) { if (successComm.size() == FormalTestManager.monitorIdListComm.size()) {
successComm.clear(); successComm.clear();
failComm.clear(); failComm.clear();
icdCheckDataMap.clear();
dataTypeList = pqScriptDtlsService.getScriptToIcdCheckInfo(param); dataTypeList = pqScriptDtlsService.getScriptToIcdCheckInfo(param);
icdTypeList = FormalTestManager.devList.stream().map(PreDetection::getIcdType).distinct().collect(Collectors.toList()); icdTypeList = FormalTestManager.devList.stream().map(PreDetection::getIcdType).distinct().collect(Collectors.toList());
@@ -822,6 +823,7 @@ public class SocketDevResponseService {
icdCheckDataMap.put(icdCheckData.getIcdType(), icdCheckData); icdCheckDataMap.put(icdCheckData.getIcdType(), icdCheckData);
if (isContinue) { if (isContinue) {
//System.out.println("icdCheckDataMap.size()="+icdCheckDataMap.size()+",icdTypeList.size()="+icdTypeList.size());
if (icdCheckDataMap.size() == icdTypeList.size()) { if (icdCheckDataMap.size() == icdTypeList.size()) {
SocketDataMsg temMsg = new SocketDataMsg(); SocketDataMsg temMsg = new SocketDataMsg();
temMsg.setCode(SourceResponseCodeEnum.DEV_COMM_ALL_SUCCESS.getCode()); temMsg.setCode(SourceResponseCodeEnum.DEV_COMM_ALL_SUCCESS.getCode());
@@ -906,13 +908,15 @@ public class SocketDevResponseService {
} }
} else { } else {
// 发送下一个脚本与icd校验 // 发送下一个脚本与icd校验
Map<String, Object> map = new HashMap<>(2); String icdType = icdTypeList.stream().filter(it -> !icdCheckDataMap.containsKey(it)).findFirst().orElse(null);
map.put("dataType", dataTypeList); if(ObjectUtil.isNotNull(icdType)){
String icdType = icdTypeList.stream().filter(it -> !icdCheckDataMap.containsKey(it)).findFirst().get(); Map<String, Object> map = new HashMap<>(2);
map.put("icdType", icdType); map.put("dataType", dataTypeList);
socketMsg.setData(JSON.toJSONString(map)); map.put("icdType", icdType);
System.out.println("开始脚本与icd校验:++++++++++"); socketMsg.setData(JSON.toJSONString(map));
SocketManager.sendMsg(s, JSON.toJSONString(socketMsg)); System.out.println("开始脚本与icd校验:++++++++++");
SocketManager.sendMsg(s, JSON.toJSONString(socketMsg));
}
} }
} }
} }