新增单位展示

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/model/vo/ThresholdLogDetailVO.java

@@ -69,7 +69,7 @@ public class ThresholdLogDetailVO implements Serializable {
     /**
      * 当前偏移量
      */
-    private BigDecimal currentOffset;
+    private String currentOffset;
     /**
      * 原始基准值
      */
@@ -78,7 +78,7 @@ public class ThresholdLogDetailVO implements Serializable {
     /**
      * 原始偏移量
      */
-    private BigDecimal originalOffset;
+    private String originalOffset;
     /**
      * 上次基准值
      */

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/service/KwsAlarmService.java

@@ -524,12 +524,16 @@ public class KwsAlarmService {
                 String val = devices.getVal();
                 if (list.contains(kwsThreshold.getItemName())) {
                     if (deviceReference != null) {
+                        String unit = kwsThreshold.getItemName() == null ? null :
+                                (dictByDictCode == null ?
+                                        kwsThreshold.getItemName() : (dictByDictCode.get(kwsThreshold.getItemName()) == null ?
+                                        kwsThreshold.getItemName() : dictByDictCode.get(itemName).getUrl()));
                         BigDecimal computeOffset = commonService.computeOffset(val, kwsThreshold.getItemName(), deviceReference);
                         BigDecimal computeOriginalOffset = commonService.computeOriginalOffset(val, kwsThreshold.getItemName(), deviceReference);
                         vo.setCurrentValue(deviceReference.getCurrentValue());
-                        vo.setCurrentOffset(computeOffset);
+                        vo.setCurrentOffset(computeOffset + unit);
                         vo.setOriginalValue(deviceReference.getOriginalValue());
-                        vo.setOriginalOffset(computeOriginalOffset);
+                        vo.setOriginalOffset(computeOriginalOffset + unit);
                     }
                 } else {
                     vo.setCurrentValue(deviceReference == null ? null : deviceReference.getCurrentValue());