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

1、切换误差体系后报告生成bug

Browse Source 
2、正式检测时，内外数据结果不一致
This commit is contained in:
caozehui
2025-05-23 10:04:35 +08:00
parent fb97e421bb
commit 21dcd87be2
3 changed files with 36 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1299,12 +1299,11 @@ public class SocketDevResponseService {
if (targetTestMap.containsKey(sourceIssue.getType())) { if (targetTestMap.containsKey(sourceIssue.getType())) {
List<DevLineTestResult> devLineTestResultList = targetTestMap.get(sourceIssue.getType()); List<DevLineTestResult> devLineTestResultList = targetTestMap.get(sourceIssue.getType());
devListRes.forEach(it1 -> { // devListRes.forEach(it1 -> {
devLineTestResultList.stream().filter(it2 -> it2.getDeviceId().equals(it1.getDeviceId())).findFirst().ifPresent(it2 -> { // devLineTestResultList.stream().filter(it2 -> it2.getDeviceId().equals(it1.getDeviceId())).findFirst().ifPresent(it2 -> {
setNewChnResult(it2.getChnResult(), it1.getChnResult()); // setNewChnResult(it2.getChnResult(), it1.getChnResult());
}); // });
}); // });
devLineTestResultList.addAll(devListRes); devLineTestResultList.addAll(devListRes);
} else { } else {
targetTestMap.put(sourceIssue.getType(), devListRes); targetTestMap.put(sourceIssue.getType(), devListRes);
@@ -1317,25 +1316,25 @@ public class SocketDevResponseService {
WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(webSocketVO)); WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(webSocketVO));
} }
private void setNewChnResult(Integer[] oldChnResult, Integer[] newChnResult) { // private void setNewChnResult(Integer[] oldChnResult, Integer[] newChnResult) {
for (int i = 0; i < oldChnResult.length; i++) { // for (int i = 0; i < oldChnResult.length; i++) {
if (newChnResult[i] == 2) { // if (newChnResult[i] == 2) {
oldChnResult[i] = 2; // oldChnResult[i] = 2;
continue; // continue;
} // }
if (newChnResult[i] == 3 && oldChnResult[i] != 2) { // if (newChnResult[i] == 3 && oldChnResult[i] != 2) {
oldChnResult[i] = 3; // oldChnResult[i] = 3;
continue; // continue;
} // }
if (newChnResult[i] == 4 && oldChnResult[i] != 2) { // if (newChnResult[i] == 4 && oldChnResult[i] != 2) {
oldChnResult[i] = 4; // oldChnResult[i] = 4;
continue; // continue;
} // }
if (newChnResult[i] == 5 && oldChnResult[i] != 2 && oldChnResult[i] != 3 && oldChnResult[i] != 4) { // if (newChnResult[i] == 5 && oldChnResult[i] != 2 && oldChnResult[i] != 3 && oldChnResult[i] != 4) {
oldChnResult[i] = 5; // oldChnResult[i] = 5;
} // }
} // }
} // }
/** /**
* 返回大项检测结果，默认遇到 4，5时认为不参与计算 * 返回大项检测结果，默认遇到 4，5时认为不参与计算

8
detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java
View File

@@ -969,7 +969,7 @@ public class ResultServiceImpl implements IResultService {
// 暂态的valueType通常只有2个，一个特征幅值，一个持续时间 // 暂态的valueType通常只有2个，一个特征幅值，一个持续时间
List<Map<String, String>> keyFillMapList = new ArrayList<>(); List<Map<String, String>> keyFillMapList = new ArrayList<>();
for (Integer sort : indexList) { for (Integer sort : indexList) {
SingleNonHarmParam param = new SingleNonHarmParam(Integer.parseInt(planCode), devId, lineNo, valueTypeList, Collections.singletonList(sort)); SingleNonHarmParam param = new SingleNonHarmParam(planCode, devId, lineNo, valueTypeList, Collections.singletonList(sort));
List<AdNonHarmonicResult> nonHarmList = adNonHarmonicService.queryByCondition(param); List<AdNonHarmonicResult> nonHarmList = adNonHarmonicService.queryByCondition(param);
if (CollUtil.isNotEmpty(nonHarmList)) { if (CollUtil.isNotEmpty(nonHarmList)) {
Map<String, String> keyFillMap = new HashMap<>(16); Map<String, String> keyFillMap = new HashMap<>(16);
@@ -994,7 +994,7 @@ public class ResultServiceImpl implements IResultService {
// 查询结果数据，经过上层处理谐波类此处的scriptIndex确保只有一个 // 查询结果数据，经过上层处理谐波类此处的scriptIndex确保只有一个
if (indexList.size() == 1) { if (indexList.size() == 1) {
// 获取谐波数据 // 获取谐波数据
SingleNonHarmParam param = new SingleNonHarmParam(Integer.parseInt(planCode), devId, lineNo, valueType, indexList.get(0)); SingleNonHarmParam param = new SingleNonHarmParam(planCode, devId, lineNo, valueType, indexList.get(0));
AdHarmonicResult singleResult = adHarmonicService.getSingleResult(param); AdHarmonicResult singleResult = adHarmonicService.getSingleResult(param);
// 注：如果ABC的标准值一致，则同步到standard中 // 注：如果ABC的标准值一致，则同步到standard中
Map<Double, List<PqScriptCheckData>> checkDataHarmNumMap = scriptCheckDataList.stream().collect(Collectors.groupingBy(PqScriptCheckData::getHarmNum)); Map<Double, List<PqScriptCheckData>> checkDataHarmNumMap = scriptCheckDataList.stream().collect(Collectors.groupingBy(PqScriptCheckData::getHarmNum));
@@ -1039,7 +1039,7 @@ public class ResultServiceImpl implements IResultService {
// 非谐波的需要区分是否为ABC相还是T相 // 非谐波的需要区分是否为ABC相还是T相
if (PowerConstant.THREE_PHASE.contains(scriptCode)) { if (PowerConstant.THREE_PHASE.contains(scriptCode)) {
// 获取该三相的数据 // 获取该三相的数据
SingleNonHarmParam param = new SingleNonHarmParam(Integer.parseInt(planCode), devId, lineNo, Collections.singletonList(valueType), indexList); SingleNonHarmParam param = new SingleNonHarmParam(planCode, devId, lineNo, Collections.singletonList(valueType), indexList);
List<AdNonHarmonicResult> nonHarmList = adNonHarmonicService.queryByCondition(param); List<AdNonHarmonicResult> nonHarmList = adNonHarmonicService.queryByCondition(param);
if (CollUtil.isNotEmpty(nonHarmList)) { if (CollUtil.isNotEmpty(nonHarmList)) {
List<Map<String, String>> keyFillMapList = new ArrayList<>(); List<Map<String, String>> keyFillMapList = new ArrayList<>();
@@ -1069,7 +1069,7 @@ public class ResultServiceImpl implements IResultService {
} else { } else {
// 非三相且非暂态，通常只有一个数据，所以直接赋值即可 // 非三相且非暂态，通常只有一个数据，所以直接赋值即可
List<Map<String, String>> keyFillMapList = new ArrayList<>(); List<Map<String, String>> keyFillMapList = new ArrayList<>();
SingleNonHarmParam param = new SingleNonHarmParam(Integer.parseInt(planCode), devId, lineNo, Collections.singletonList(valueType), indexList); SingleNonHarmParam param = new SingleNonHarmParam(planCode, devId, lineNo, Collections.singletonList(valueType), indexList);
List<AdNonHarmonicResult> nonHarmList = adNonHarmonicService.queryByCondition(param); List<AdNonHarmonicResult> nonHarmList = adNonHarmonicService.queryByCondition(param);
if (CollUtil.isNotEmpty(nonHarmList)) { if (CollUtil.isNotEmpty(nonHarmList)) {
for (AdNonHarmonicResult adNonHarmonicResult : nonHarmList) { for (AdNonHarmonicResult adNonHarmonicResult : nonHarmList) {

16
storage/src/main/java/com/njcn/gather/storage/pojo/param/SingleNonHarmParam.java
View File

@@ -52,32 +52,32 @@ public class SingleNonHarmParam implements Serializable {
private List<Integer> sortList; private List<Integer> sortList;
public SingleNonHarmParam(Integer planCode, String devId, Integer channelNo, String adType, Integer sort) { public SingleNonHarmParam(String planCode, String devId, Integer channelNo, String adType, Integer sort) {
this.planCode = String.valueOf(planCode); this.planCode = planCode;
this.devId = devId; this.devId = devId;
this.channelNo = channelNo; this.channelNo = channelNo;
this.adType = adType; this.adType = adType;
this.sort = sort; this.sort = sort;
} }
public SingleNonHarmParam(Integer planCode, String devId, Integer channelNo, String adType, List<Integer> sortList) { public SingleNonHarmParam(String planCode, String devId, Integer channelNo, String adType, List<Integer> sortList) {
this.planCode = String.valueOf(planCode); this.planCode = planCode;
this.devId = devId; this.devId = devId;
this.channelNo = channelNo; this.channelNo = channelNo;
this.adType = adType; this.adType = adType;
this.sortList = sortList; this.sortList = sortList;
} }
public SingleNonHarmParam(Integer planCode, String devId, Integer channelNo, List<String> valueTypeList, Integer sort) { public SingleNonHarmParam(String planCode, String devId, Integer channelNo, List<String> valueTypeList, Integer sort) {
this.planCode = String.valueOf(planCode); this.planCode = planCode;
this.devId = devId; this.devId = devId;
this.channelNo = channelNo; this.channelNo = channelNo;
this.valueTypeList = valueTypeList; this.valueTypeList = valueTypeList;
this.sort = sort; this.sort = sort;
} }
public SingleNonHarmParam(Integer planCode, String devId, Integer channelNo, List<String> valueTypeList, List<Integer> sortList) { public SingleNonHarmParam(String planCode, String devId, Integer channelNo, List<String> valueTypeList, List<Integer> sortList) {
this.planCode = String.valueOf(planCode); this.planCode = planCode;
this.devId = devId; this.devId = devId;
this.channelNo = channelNo; this.channelNo = channelNo;
this.valueTypeList = valueTypeList; this.valueTypeList = valueTypeList;