diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java index a820427..ff74319 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java @@ -496,30 +496,35 @@ public class ResultAnalysisUtils { * @return */ public String addUnit2Value(String resValue, String algType, String unit) { - if (StringUtils.isNotEmpty(resValue) && StringUtils.isNotEmpty(unit) && AlgConstants.READABLE_ALG_LIST.contains(algType)) { - log.info("addUnit2Value resValue: {}, algType: {}, unit: {}", resValue, algType, unit); - String[] valueArr = resValue.split(","); - String values = IntStream.range(0, valueArr.length) - .mapToObj(i -> { - String val = valueArr[i]; - if (!NumberUtils.isCreatable(val)) { - return val; - } + if (StringUtils.isEmpty(resValue) || !AlgConstants.READABLE_ALG_LIST.contains(algType)) { + return resValue; + } + log.info("addUnit2Value resValue: {}, algType: {}, unit: {}", resValue, algType, unit); + String[] valueArr = resValue.split(","); + final boolean shouldAddUnit = StringUtils.isNotEmpty(unit); + String result = IntStream.range(0, valueArr.length) + .mapToObj(i -> { + String val = valueArr[i].trim(); + if (!NumberUtils.isCreatable(val)) { + return val; + } - if (AlgConstants.ALG_INFRARED_LIST.contains(algType)) { - return BigDecimalUtil.toOneDecimal(val, 1) + unit; - } + if (AlgConstants.ALG_INFRARED_LIST.contains(algType)) { + String formatted = BigDecimalUtil.toOneDecimal(val, 1); + return shouldAddUnit ? formatted + unit : formatted; + } - // 表计算法:避雷器只有第一个值带单位 - if (AlgConstants.METER.equals(algType)) { - return i == 0 ? val + unit : val; + // 表计算法:避雷器只有第一个值带单位 + if (AlgConstants.METER.equals(algType)) { + if (i == 0 && shouldAddUnit) { + return val + unit; } + return val; + } - return val + unit; - }) - .collect(Collectors.joining(",")); - return values; - } - return resValue; + return shouldAddUnit ? val + unit : val; + }) + .collect(Collectors.joining(",")); + return result; } }