Sfoglia il codice sorgente

增加单位展示

lengfaqiang 2 anni fa
parent
commit
5aace32b04

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

@@ -534,7 +534,7 @@ public class KwsAlarmService {
                         unit = kwsThreshold.getItemName() == null ? null :
                                 (dictByDictCode == null ?
                                         kwsThreshold.getItemName() : (dictByDictCode.get(kwsThreshold.getItemName()) == null ?
-                                        kwsThreshold.getItemName() : dictByDictCode.get(kwsThreshold.getItemName()).getUrl()));
+                                        kwsThreshold.getItemName() : dictByDictCode.get(kwsThreshold.getItemName()).getRemark()));
                         BigDecimal computeOffset = commonService.computeOffset(val, kwsThreshold.getItemName(), deviceReference);
                         BigDecimal computeOriginalOffset = commonService.computeOriginalOffset(val, kwsThreshold.getItemName(), deviceReference);
                         vo.setCurrentValue(deviceReference.getCurrentValue() + unit);
@@ -883,7 +883,7 @@ public class KwsAlarmService {
                 String unit = kwsThreshold.getItemName() == null ? null :
                         (dictByDictCode == null ?
                                 kwsThreshold.getItemName() : (dictByDictCode.get(kwsThreshold.getItemName()) == null ?
-                                kwsThreshold.getItemName() : dictByDictCode.get(kwsThreshold.getItemName()).getUrl()));
+                                kwsThreshold.getItemName() : dictByDictCode.get(kwsThreshold.getItemName()).getRemark()));
                 vo.setCurrentValue(deviceReference.getCurrentValue() + unit);
                 vo.setCurrentOffset(deviceReference.getOffset().toString());
                 vo.setOriginalValue(deviceReference.getOriginalValue() + unit);