This commit is contained in:
wr
2025-02-27 14:51:50 +08:00
parent a2ac240150
commit 06b13fdfe1

View File

@@ -278,7 +278,8 @@ public class DetectionServiceImpl {
} }
} }
if (devIndex.contains("I")) { if (devIndex.contains("I")) {
fundCode = DetectionCodeEnum.I1.getCode();; fundCode = DetectionCodeEnum.I1.getCode();
;
type = I; type = I;
fData = sourceIssue.getFIn(); fData = sourceIssue.getFIn();
if (devIndex.contains("50")) { if (devIndex.contains("50")) {
@@ -454,7 +455,8 @@ public class DetectionServiceImpl {
} }
if (I.equals(type)) { if (I.equals(type)) {
fData = sourceIssue.getFIn(); fData = sourceIssue.getFIn();
fundCode = DetectionCodeEnum.I1.getCode();; fundCode = DetectionCodeEnum.I1.getCode();
;
if (num == 1) { if (num == 1) {
harmCode = DetectionCodeEnum.SI_1_49.getCode(); harmCode = DetectionCodeEnum.SI_1_49.getCode();
} else { } else {
@@ -878,7 +880,10 @@ public class DetectionServiceImpl {
*/ */
private void setDetection(DictDataEnum dataRule, List<Double> harmDataList, PqErrSysDtls errSysDtl, DetectionData data, Double v) { private void setDetection(DictDataEnum dataRule, List<Double> harmDataList, PqErrSysDtls errSysDtl, DetectionData data, Double v) {
List<Double> qualifiedList = harmDataList.stream() List<Double> qualifiedList = harmDataList.stream()
.filter(x -> x > 0 && NumberUtil.isIn(devSubtractChannelData(x, v, errSysDtl.getErrorValueType()), .filter(x -> v == 0 ? NumberUtil.isIn(devSubtractChannelData(x, v, errSysDtl.getErrorValueType()),
BigDecimal.valueOf(-errSysDtl.getMaxErrorValue()),
BigDecimal.valueOf(errSysDtl.getMaxErrorValue())) :
x > 0 && NumberUtil.isIn(devSubtractChannelData(x, v, errSysDtl.getErrorValueType()),
BigDecimal.valueOf(-errSysDtl.getMaxErrorValue()), BigDecimal.valueOf(-errSysDtl.getMaxErrorValue()),
BigDecimal.valueOf(errSysDtl.getMaxErrorValue()))).collect(Collectors.toList()); BigDecimal.valueOf(errSysDtl.getMaxErrorValue()))).collect(Collectors.toList());
isData(dataRule, harmDataList, data, qualifiedList); isData(dataRule, harmDataList, data, qualifiedList);