From cc4a9f358b9eb57bc122499ecf4a0c8a0f630c94 Mon Sep 17 00:00:00 2001
From: yinhuaiwei <yinhuaiwei@ht-atia.com>
Date: Wed, 22 Jul 2026 18:01:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=89=80=E6=9C=89=E7=BA=A2=E5=A4=96?=
 =?UTF-8?q?=E7=AE=97=E6=B3=95=E6=B8=A9=E5=BA=A6=E5=80=BC=E9=83=BD=E5=8F=AA?=
 =?UTF-8?q?=E4=BF=9D=E7=95=99=E4=B8=80=E4=BD=8D=E5=B0=8F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../analysis/utils/ResultAnalysisUtils.java   | 47 ++++++++++---------
 1 file changed, 26 insertions(+), 21 deletions(-)

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;
     }
 }