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-01-13 21:09:13 +08:00
parent 9b6543bbb6
commit f9c8c812ee
4 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java
View File

@@ -213,12 +213,13 @@ public class DetectionServiceImpl {
result.setSort(sourceIssue.getIndex()); result.setSort(sourceIssue.getIndex());
List<PqErrSysDtls> pqErrSysDtls = new ArrayList<>(); List<PqErrSysDtls> pqErrSysDtls = new ArrayList<>();
if (CollUtil.isNotEmpty(errDtlsCheckData)) { if (CollUtil.isNotEmpty(errDtlsCheckData)) {
result.setAdType(errDtlsCheckData.get(0).getValueType()); List<ErrDtlsCheckDataVO> dtlsCheckData = errDtlsCheckData.stream().filter(x -> x.getValueTypeCode().equals(s.split("\\$")[1])).collect(Collectors.toList());
if (CollUtil.isNotEmpty(errDtlsCheckData.get(0).getErrSysDtls())) { if (CollUtil.isNotEmpty(dtlsCheckData)) {
pqErrSysDtls = errDtlsCheckData.get(0).getErrSysDtls(); result.setAdType(dtlsCheckData.get(0).getValueType());
if (CollUtil.isNotEmpty(dtlsCheckData.get(0).getErrSysDtls())) {
pqErrSysDtls = dtlsCheckData.get(0).getErrSysDtls();
}
} }
}else{
return 4;
} }
result.setDataType("avg"); result.setDataType("avg");
if (map.containsKey(TYPE_T)) { if (map.containsKey(TYPE_T)) {
@@ -511,16 +512,14 @@ public class DetectionServiceImpl {
private Integer setResultFlag(List<DetectionData> numbers) { private Integer setResultFlag(List<DetectionData> numbers) {
List<Integer> isData = numbers.stream().filter(x -> ObjectUtil.isNotNull(x.getData())).map(DetectionData::getIsData).distinct().collect(Collectors.toList()); List<Integer> isData = numbers.stream().filter(x -> 4 != x.getIsData()).filter(x -> ObjectUtil.isNotNull(x.getData())).map(DetectionData::getIsData).distinct().collect(Collectors.toList());
return getInteger(isData); return getInteger(isData);
} }
private static Integer getInteger(List<Integer> isData) { private static Integer getInteger(List<Integer> isData) {
if (CollUtil.isNotEmpty(isData)) { if (CollUtil.isNotEmpty(isData)) {
if (isData.size() > 1) { if (isData.size() > 1) {
if (isData.contains(4)) { if (isData.contains(2)) {
return 4;
} else if (isData.contains(2)) {
return 2; return 2;
} }
} }

2
storage/src/main/java/com/njcn/gather/storage/pojo/po/AdHarmonicResult.java
View File

@@ -55,7 +55,7 @@ public class AdHarmonicResult {
private String dataType; private String dataType;
/** /**
* 0.不合格 1.合格 * 1.合格 2.合格 4.无法处理
*/ */
private Integer resultFlag; private Integer resultFlag;

3
storage/src/main/java/com/njcn/gather/storage/pojo/po/AdNonHarmonicResult.java
View File

@@ -1,6 +1,5 @@
package com.njcn.gather.storage.pojo.po; package com.njcn.gather.storage.pojo.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@@ -53,7 +52,7 @@ public class AdNonHarmonicResult {
private String dataType; private String dataType;
/** /**
* 0.不合格 1.合格 * 1.合格 2.合格 4.无法处理
*/ */
private Integer resultFlag; private Integer resultFlag;

24
storage/src/main/java/com/njcn/gather/storage/service/impl/DetectionDataServiceImpl.java
View File

@@ -133,18 +133,20 @@ public class DetectionDataServiceImpl extends ReplenishMybatisServiceImpl<Detect
private static Integer isResultFlag(List<Integer> resultFlags) { private static Integer isResultFlag(List<Integer> resultFlags) {
// 检测结果（0:不符合 1:符合 2:/[未检测无结果]) // 检测结果（0:不符合 1:符合 2:/[未检测无结果])
resultFlags = resultFlags.stream().distinct().collect(Collectors.toList()); resultFlags = resultFlags.stream().filter(x->4!=x).distinct().collect(Collectors.toList());
if (CollUtil.isNotEmpty(resultFlags)) { if (CollUtil.isNotEmpty(resultFlags)) {
if (resultFlags.size() > 1) { if (resultFlags.contains(2)) {
if (resultFlags.contains(4)) { return 0;
return 2; }else{
} else if (resultFlags.contains(2)) { switch (resultFlags.get(0)){
return 0; case 1:
} return 1;
} case 2:
return resultFlags.get(0); return 0;
} else {
return 2; }
}
} }
return 1;
} }
} }