diff --git a/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java b/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java index aa38294c..b1c38fe3 100644 --- a/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java @@ -580,7 +580,7 @@ public class DetectionServiceImpl { if (ObjectUtil.isNull(value.getIsData())) { idField.set(harmonicResult, value.getData()); } else { - idField.set(harmonicResult,JSON.toJSONString(value)); + idField.set(harmonicResult, JSON.toJSONString(value)); } } catch (IllegalAccessException e) { throw new RuntimeException(e); @@ -682,8 +682,8 @@ public class DetectionServiceImpl { .filter(x -> NumberUtil.isIn(devSubtractChannelData(x, v, errSysDtl.getErrorValueType()), BigDecimal.valueOf(-errSysDtl.getMaxErrorValue()), BigDecimal.valueOf(errSysDtl.getMaxErrorValue()))).collect(Collectors.toList()); + data.setRadius(-errSysDtl.getMaxErrorValue() + "~" + errSysDtl.getMaxErrorValue()); if (CollUtil.isNotEmpty(qualifiedList)) { - data.setRadius(-errSysDtl.getMaxErrorValue()+"~"+errSysDtl.getMaxErrorValue()); data.setData(qualifiedList.get(0)); switch (dataRule) { case AT_WILL_VALUE: @@ -791,10 +791,10 @@ public class DetectionServiceImpl { BigDecimal.valueOf(1.0 / data * (channelData + errSysDtl.getMaxErrorValue()))) ).collect(Collectors.toList()); detectionData.setResultData(BigDecimal.valueOf(1.0 / data).doubleValue() * channelData); + detectionData.setRadius(BigDecimal.valueOf(1.0 / data * (channelData - errSysDtl.getMaxErrorValue())) + + "~" + BigDecimal.valueOf(1.0 / data * (channelData + errSysDtl.getMaxErrorValue()))); if (CollUtil.isNotEmpty(qualifiedList)) { detectionData.setData(qualifiedList.get(0)); - detectionData.setRadius(BigDecimal.valueOf(1.0 / data * (channelData - errSysDtl.getMaxErrorValue())) - + "~" + BigDecimal.valueOf(1.0 / data * (channelData + errSysDtl.getMaxErrorValue()))); switch (dataRule) { case AT_WILL_VALUE: case CP95_VALUE: