This commit is contained in:
caozehui
2025-12-01 19:14:29 +08:00
parent 7abcaefeb1
commit 9ab5d42439

View File

@@ -2400,7 +2400,7 @@ public class DetectionServiceImpl {
} }
} }
} }
devMap.forEach((typeKey, typeValue) -> { standardDevMap.forEach((typeKey, typeValue) -> {
typeValue.forEach((key, value) -> { typeValue.forEach((key, value) -> {
if (CollUtil.isNotEmpty(value)) { if (CollUtil.isNotEmpty(value)) {
List<Integer> idx = DetectionUtil.sort(value, false); List<Integer> idx = DetectionUtil.sort(value, false);
@@ -2409,9 +2409,9 @@ public class DetectionServiceImpl {
if (value.size() > 2) { if (value.size() > 2) {
value.remove(idx.get(0)); value.remove(idx.get(0));
value.remove(idx.get(idx.size() - 1)); value.remove(idx.get(idx.size() - 1));
List<Double> newArray = DetectionUtil.getNewArray(standardDevMap.get(typeKey).get(key), idx.subList(1, idx.size() - 1)); List<Double> newArray = DetectionUtil.getNewArray(devMap.get(typeKey).get(key), idx.subList(1, idx.size() - 1));
standardDevMap.get(typeKey).get(key).clear(); devMap.get(typeKey).get(key).clear();
standardDevMap.get(typeKey).get(key).addAll(newArray); devMap.get(typeKey).get(key).addAll(newArray);
} }
break; break;
case CP95_VALUE: case CP95_VALUE:
@@ -2420,18 +2420,18 @@ public class DetectionServiceImpl {
List<Double> newValue = Collections.singletonList(value.get(cp95Idx)); List<Double> newValue = Collections.singletonList(value.get(cp95Idx));
value.clear(); value.clear();
value.addAll(newValue); value.addAll(newValue);
Double standardCP95Data = standardDevMap.get(typeKey).get(key).get(cp95Idx); Double devCP95Data = devMap.get(typeKey).get(key).get(idx.get(cp95Idx));
standardDevMap.get(typeKey).get(key).clear(); devMap.get(typeKey).get(key).clear();
standardDevMap.get(typeKey).get(key).add(standardCP95Data); devMap.get(typeKey).get(key).add(devCP95Data);
} }
break; break;
case AVG_VALUE: case AVG_VALUE:
List<Double> avgDoubles = DetectionUtil.getAvgDoubles(value); List<Double> avgDoubles = DetectionUtil.getAvgDoubles(value);
value.clear(); value.clear();
value.addAll(avgDoubles); value.addAll(avgDoubles);
List<Double> standardAvgData = DetectionUtil.getAvgDoubles(standardDevMap.get(typeKey).get(key)); List<Double> devAvgData = DetectionUtil.getAvgDoubles(devMap.get(typeKey).get(key));
standardDevMap.get(typeKey).get(key).clear(); devMap.get(typeKey).get(key).clear();
standardDevMap.get(typeKey).get(key).addAll(standardAvgData); devMap.get(typeKey).get(key).addAll(devAvgData);
break; break;
} }
} }