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-15 10:49:14 +08:00
parent d4dba1617d
commit 2e9d640a75
2 changed files with 39 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,22 +97,22 @@ public class SocketDevResponseService {
/** /**
* 成功结束的测点 * 成功结束的测点
*/ */
List<String> successComm = new ArrayList<>(); Set<String> successComm = new HashSet<>();
/** /**
* 失败的测点 * 失败的测点
*/ */
List<String> failComm = new ArrayList<>(); Set<String> failComm = new HashSet<>();
/** /**
* 成功结束的装置 * 成功结束的装置
*/ */
Set<String> successDevComm = new HashSet<>(); //Set<String> successDevComm = new HashSet<>();
/** /**
* 失败结束的装置 * 失败结束的装置
*/ */
Set<String> failDevComm = new HashSet<>(); //Set<String> failDevComm = new HashSet<>();
/** /**
* 保存成功的协议 * 保存成功的协议
@@ -565,13 +565,12 @@ public class SocketDevResponseService {
switch (Objects.requireNonNull(dictDataEnumByCode)) { switch (Objects.requireNonNull(dictDataEnumByCode)) {
case SUCCESS: case SUCCESS:
String result = socketDataMsg.getData(); String result = socketDataMsg.getData();
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)); webSocketHandler.sendMsgToUser(param.getUserPageId(), MsgUtil.msgToWebData(socketDataMsg, FormalTestManager.devNameMapComm, 1));
} }
successDevComm.add(result.split(splitTag)[0]);
successComm.add(result);
System.out.println("设备通讯校验！" + successComm.size() + "=====" + FormalTestManager.monitorIdListComm.size()); System.out.println("设备通讯校验！" + successComm.size() + "=====" + FormalTestManager.monitorIdListComm.size());
@@ -586,8 +585,7 @@ public class SocketDevResponseService {
//开始进行协议校验 //开始进行协议校验
successComm.clear(); successComm.clear();
successDevComm.clear(); failComm.clear();
failDevComm.clear();
Map<String, List<PreDetection>> map = new HashMap<>(1); Map<String, List<PreDetection>> map = new HashMap<>(1);
map.put("deviceList", FormalTestManager.devList); map.put("deviceList", FormalTestManager.devList);
String jsonString = JSON.toJSONString(map); String jsonString = JSON.toJSONString(map);
@@ -609,18 +607,13 @@ public class SocketDevResponseService {
break; break;
case DEV_ERROR: case DEV_ERROR:
failDevComm.add(socketDataMsg.getData());
failComm.addAll(FormalTestManager.devMapMonitorNum.get(socketDataMsg.getData())); failComm.addAll(FormalTestManager.devMapMonitorNum.get(socketDataMsg.getData()));
System.out.println(failDevComm.size() + "xNNN+" + successDevComm.size());
webSocketHandler.sendMsgToUser(param.getUserPageId(), MsgUtil.msgToWebData(socketDataMsg, FormalTestManager.devNameMapComm, 0)); webSocketHandler.sendMsgToUser(param.getUserPageId(), MsgUtil.msgToWebData(socketDataMsg, FormalTestManager.devNameMapComm, 0));
completeJudgment(param); completeJudgment(param);
break; break;
case DEV_TARGET: case DEV_TARGET:
failDevComm.add(socketDataMsg.getData()); failComm.add(socketDataMsg.getData());
failComm.addAll(FormalTestManager.devMapMonitorNum.get(socketDataMsg.getData())); webSocketHandler.sendMsgToUser(param.getUserPageId(), MsgUtil.msgToWebData(socketDataMsg, FormalTestManager.devNameMapComm, 1));
webSocketHandler.sendMsgToUser(param.getUserPageId(), MsgUtil.msgToWebData(socketDataMsg, FormalTestManager.devNameMapComm, 0));
completeJudgment(param); completeJudgment(param);
break; break;
@@ -644,16 +637,16 @@ public class SocketDevResponseService {
private void completeJudgment(PreDetectionParam param) { private void completeJudgment(PreDetectionParam param) {
if (successDevComm.size() + failDevComm.size() == FormalTestManager.devList.size() && successComm.size() + failComm.size() == FormalTestManager.monitorIdListComm.size()) { System.out.println("成功失败测点数量"+successComm.size()+":"+failComm.size()+"监测点总数"+FormalTestManager.monitorIdListComm.size());
if (successComm.size() + failComm.size() == FormalTestManager.monitorIdListComm.size()) {
//全部装置返回 //全部装置返回
if (!failDevComm.isEmpty()) { if (!failComm.isEmpty()) {
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)); webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(webSocketVO));
} }
successDevComm.clear();
failDevComm.clear();
successComm.clear(); successComm.clear();
failComm.clear(); failComm.clear();
} }
@@ -668,11 +661,11 @@ public class SocketDevResponseService {
String s = param.getUserPageId() + handlerStr; String s = param.getUserPageId() + handlerStr;
switch (Objects.requireNonNull(dictDataEnumByCode)) { switch (Objects.requireNonNull(dictDataEnumByCode)) {
case SUCCESS: case SUCCESS:
webSocketHandler.sendMsgToUser(param.getUserPageId(), MsgUtil.msgToWebData(socketDataMsg, FormalTestManager.devNameMapComm, 0));
if (socketDataMsg.getOperateCode().equals(SourceOperateCodeEnum.DEV_INIT_GATHER_02.getValue())) { if (socketDataMsg.getOperateCode().equals(SourceOperateCodeEnum.DEV_INIT_GATHER_02.getValue())) {
successDevComm.add(socketDataMsg.getData().split(splitTag)[0]);
successComm.add(socketDataMsg.getData()); successComm.add(socketDataMsg.getData());
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) {
//模拟统计协议校验，通讯校验已经校验过，模拟直接推送 //模拟统计协议校验，通讯校验已经校验过，模拟直接推送
@@ -685,7 +678,7 @@ public class SocketDevResponseService {
} }
successComm.clear(); successComm.clear();
successDevComm.clear(); failComm.clear();
Map<String, List<PreDetection>> map = new HashMap<>(1); Map<String, List<PreDetection>> map = new HashMap<>(1);
map.put("deviceList", FormalTestManager.devList); map.put("deviceList", FormalTestManager.devList);
String jsonString = JSON.toJSONString(map); String jsonString = JSON.toJSONString(map);
@@ -700,8 +693,8 @@ 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())) {
successDevComm.add(socketDataMsg.getData().split(splitTag)[0]);
successComm.add(socketDataMsg.getData()); successComm.add(socketDataMsg.getData());
webSocketHandler.sendMsgToUser(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()) {
@@ -717,8 +710,7 @@ public class SocketDevResponseService {
issueParam.setSourceId(param.getSourceId()); issueParam.setSourceId(param.getSourceId());
issueParam.setDevIds(param.getDevIds()); issueParam.setDevIds(param.getDevIds());
issueParam.setScriptId(param.getScriptId()); issueParam.setScriptId(param.getScriptId());
successComm.clear();
successDevComm.clear();
socketMsg.setOperateCode(SourceOperateCodeEnum.OPER_GATHER.getValue()); socketMsg.setOperateCode(SourceOperateCodeEnum.OPER_GATHER.getValue());
List<SourceIssue> sourceIssues; List<SourceIssue> sourceIssues;
if (SourceOperateCodeEnum.FORMAL_TEST.getValue().equals(param.getOperateType()) || SourceOperateCodeEnum.RE_ERROR_TEST.getValue().equals(param.getOperateType())) { if (SourceOperateCodeEnum.FORMAL_TEST.getValue().equals(param.getOperateType()) || SourceOperateCodeEnum.RE_ERROR_TEST.getValue().equals(param.getOperateType())) {
@@ -766,6 +758,7 @@ public class SocketDevResponseService {
} }
successComm.clear(); successComm.clear();
failComm.clear();
} }
completeJudgment(param); completeJudgment(param);
@@ -777,14 +770,14 @@ public class SocketDevResponseService {
webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
break; break;
case DEV_ERROR: case DEV_ERROR:
failDevComm.add(socketDataMsg.getData()); failComm.addAll(FormalTestManager.devMapMonitorNum.get(socketDataMsg.getData()));
webSocketHandler.sendMsgToUser(param.getUserPageId(), MsgUtil.msgToWebData(socketDataMsg, FormalTestManager.devNameMapComm, 0)); webSocketHandler.sendMsgToUser(param.getUserPageId(), MsgUtil.msgToWebData(socketDataMsg, FormalTestManager.devNameMapComm, 0));
CnSocketUtil.quitSend(param); completeJudgment(param);
break; break;
case DEV_TARGET: case DEV_TARGET:
failDevComm.add(socketDataMsg.getData()); failComm.add(socketDataMsg.getData());
webSocketHandler.sendMsgToUser(param.getUserPageId(), MsgUtil.msgToWebData(socketDataMsg, FormalTestManager.devNameMapComm, 0)); webSocketHandler.sendMsgToUser(param.getUserPageId(), MsgUtil.msgToWebData(socketDataMsg, FormalTestManager.devNameMapComm, 1));
CnSocketUtil.quitSend(param); completeJudgment(param);
break; break;
case RE_OPERATE: case RE_OPERATE:
@@ -840,7 +833,14 @@ public class SocketDevResponseService {
dataMsg.setCode(SourceResponseCodeEnum.SUCCESS.getCode()); dataMsg.setCode(SourceResponseCodeEnum.SUCCESS.getCode());
for (SourceCompareDev sourceCompareDev : info) { for (SourceCompareDev sourceCompareDev : info) {
dataMsg.setData(sourceCompareDev.getDevName() + splitTag + sourceCompareDev.getLineNum() + SocketManager.valueTypeMap.get(sourceCompareDev.getDesc()) + "校验结果:" + (sourceCompareDev.getIsQualified() ? "合格" : "不合格"));
String temStr = "";
if("VRMS".equals(sourceCompareDev.getDesc())){
temStr = "电压";
}else if("IRMS".equals(sourceCompareDev.getDesc())){
temStr = "电流";
}
dataMsg.setData(sourceCompareDev.getDevName() + splitTag + sourceCompareDev.getLineNum() + temStr + "校验结果:" + (sourceCompareDev.getIsQualified() ? "合格" : "不合格"));
webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(dataMsg)); webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(dataMsg));
} }
@@ -849,6 +849,7 @@ public class SocketDevResponseService {
webSocketVO.setRequestId(SourceOperateCodeEnum.YJC_XUJY.getValue()); webSocketVO.setRequestId(SourceOperateCodeEnum.YJC_XUJY.getValue());
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());
webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(webSocketVO)); webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(webSocketVO));
return; return;
} }
@@ -1227,8 +1228,7 @@ public class SocketDevResponseService {
SocketManager.valueTypeMap.clear(); SocketManager.valueTypeMap.clear();
SocketManager.clockMap.clear(); SocketManager.clockMap.clear();
successComm.clear(); successComm.clear();
successDevComm.clear();
failDevComm.clear();
FormalTestManager.stopFlag = false; FormalTestManager.stopFlag = false;
FormalTestManager.hasStopFlag = false; FormalTestManager.hasStopFlag = false;
FormalTestManager.stopTime = 0; FormalTestManager.stopTime = 0;

7
detection/src/main/java/com/njcn/gather/detection/util/socket/FormalTestManager.java
View File

@@ -16,6 +16,9 @@ import java.util.concurrent.ConcurrentHashMap;
public class FormalTestManager { public class FormalTestManager {
/**
* key:设备ip,value:当前设备下面的通道序号
*/
public static Map<String,List<String>> devMapMonitorNum = new ConcurrentHashMap<>(); public static Map<String,List<String>> devMapMonitorNum = new ConcurrentHashMap<>();
/** /**
@@ -31,11 +34,11 @@ public class FormalTestManager {
/** /**
* 装置名称 * key:设备ip,value:装置名称
*/ */
public static Map<String, String> devNameMapComm = new HashMap<>(); public static Map<String, String> devNameMapComm = new HashMap<>();
/** /**
* 装置id * key:设备ip,value:装置id
*/ */
public static Map<String, String> devIdMapComm = new HashMap<>(); public static Map<String, String> devIdMapComm = new HashMap<>();