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-06-23 20:00:40 +08:00
parent 512ed2a542
commit 76a571921a
2 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -283,19 +283,26 @@ public class SocketDevResponseService {
if (ObjectUtil.isNotNull(dictDataEnumByCode)) { if (ObjectUtil.isNotNull(dictDataEnumByCode)) {
switch (dictDataEnumByCode) { switch (dictDataEnumByCode) {
case SUCCESS: case SUCCESS:
if (devData.getResult()) {
FormalTestManager.realDataXiList.add(devData); FormalTestManager.realDataXiList.add(devData);
successComm.add(devData.getId()); successComm.add(devData.getId());
System.out.println(successComm.size() + " ==" + FormalTestManager.monitorIdListComm.size() + "FormalTestManager.realDataXiList:" + FormalTestManager.realDataXiList.size() + "当前步骤" + XiNumberManager.stepNumber); System.out.println(successComm.size() + " ==" + FormalTestManager.monitorIdListComm.size() + "FormalTestManager.realDataXiList:" + FormalTestManager.realDataXiList.size() + "当前步骤" + XiNumberManager.stepNumber);
if (successComm.size() == FormalTestManager.monitorIdListComm.size()) { if (successComm.size() == FormalTestManager.monitorIdListComm.size()) {
processData(param, xiSocket); processData(param, xiSocket);
} }
}else {
System.out.println("系数校准抛除数据"+devData);
}
break; break;
case UNPROCESSED_BUSINESS: case UNPROCESSED_BUSINESS:
WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
break; break;
case NORMAL_RESPONSE: case NORMAL_RESPONSE:
if (devData.getResult()) {
FormalTestManager.realDataXiList.add(devData); FormalTestManager.realDataXiList.add(devData);
}else {
System.out.println("系数校准抛除数据"+devData);
}
break; break;
default: default:
xiSocket.setRequestId(socketDataMsg.getRequestId()); xiSocket.setRequestId(socketDataMsg.getRequestId());
@@ -603,19 +610,19 @@ public class SocketDevResponseService {
} }
private void assemblyEntity(List<DevData> deList, DevXiNumData.F F, DevXiNumData.GF startF, CoefficientVO coefficientVO, CoefficientVO.DevParameter devParameter) { private void assemblyEntity(List<DevData> deList, DevXiNumData.F F, DevXiNumData.GF startF, CoefficientVO coefficientVO, CoefficientVO.DevParameter devParameter) {
//表示接收完成,必须保证10个数 //表示接收完成,必须保证3个数
if (deList.size() >= 10) { if (deList.size() >= 3) {
List<Double> aList = deList.stream().map(it -> it.getSqlData().get(0).getList().getA()).sorted().collect(Collectors.toList()); List<Double> aList = deList.stream().map(it -> it.getSqlData().get(0).getList().getA()).collect(Collectors.toList());
List<Double> bList = deList.stream().map(it -> it.getSqlData().get(0).getList().getB()).sorted().collect(Collectors.toList()); List<Double> bList = deList.stream().map(it -> it.getSqlData().get(0).getList().getB()).collect(Collectors.toList());
List<Double> cList = deList.stream().map(it -> it.getSqlData().get(0).getList().getC()).sorted().collect(Collectors.toList()); List<Double> cList = deList.stream().map(it -> it.getSqlData().get(0).getList().getC()).collect(Collectors.toList());
Double optionalA = reduceList(aList); Double optionalA = reduceList(aList);
Double optionalB = reduceList(bList); Double optionalB = reduceList(bList);
Double optionalC = reduceList(cList); Double optionalC = reduceList(cList);
List<Double> aIList = deList.stream().map(it -> it.getSqlData().get(1).getList().getA()).sorted().collect(Collectors.toList()); List<Double> aIList = deList.stream().map(it -> it.getSqlData().get(1).getList().getA()).collect(Collectors.toList());
List<Double> bIList = deList.stream().map(it -> it.getSqlData().get(1).getList().getB()).sorted().collect(Collectors.toList()); List<Double> bIList = deList.stream().map(it -> it.getSqlData().get(1).getList().getB()).collect(Collectors.toList());
List<Double> cIList = deList.stream().map(it -> it.getSqlData().get(1).getList().getC()).sorted().collect(Collectors.toList()); List<Double> cIList = deList.stream().map(it -> it.getSqlData().get(1).getList().getC()).collect(Collectors.toList());
Double optionalIA = reduceList(aIList); Double optionalIA = reduceList(aIList);
Double optionalIB = reduceList(bIList); Double optionalIB = reduceList(bIList);
@@ -678,8 +685,8 @@ public class SocketDevResponseService {
* 删除集合中前五个数以及最后两个数 * 删除集合中前五个数以及最后两个数
*/ */
private Double reduceList(List<Double> valList) { private Double reduceList(List<Double> valList) {
valList.subList(0, 5).clear(); // valList.subList(0, 5).clear();
valList.subList(valList.size() - 3, valList.size() - 1).clear(); // valList.subList(valList.size() - 3, valList.size() - 1).clear();
return valList.stream().mapToDouble(Double::doubleValue).average().getAsDouble(); return valList.stream().mapToDouble(Double::doubleValue).average().getAsDouble();
} }

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

@@ -196,8 +196,8 @@ public class SocketSourceResponseService {
DevPhaseSequenceParam phaseSequenceParam = new DevPhaseSequenceParam(); DevPhaseSequenceParam phaseSequenceParam = new DevPhaseSequenceParam();
phaseSequenceParam.setMoniterIdList(monitorIdList); phaseSequenceParam.setMoniterIdList(monitorIdList);
phaseSequenceParam.setDataType(Arrays.asList("real$VRMS", "real$IRMS")); phaseSequenceParam.setDataType(Arrays.asList("real$VRMS", "real$IRMS"));
phaseSequenceParam.setReadCount(10); phaseSequenceParam.setReadCount(3);
phaseSequenceParam.setIgnoreCount(0); phaseSequenceParam.setIgnoreCount(5);
socketMsg.setData(JSON.toJSONString(phaseSequenceParam)); socketMsg.setData(JSON.toJSONString(phaseSequenceParam));
SocketManager.sendMsg(s, JSON.toJSONString(socketMsg)); SocketManager.sendMsg(s, JSON.toJSONString(socketMsg));