jichaobo преди 3 години
родител
ревизия
2660db1941
променени са 1 файла, в които са добавени 25 реда и са изтрити 1 реда
  1. 25 1
      fiveep-service/src/main/java/com/bizmatics/service/impl/RtAnalogDataServiceImpl.java

+ 25 - 1
fiveep-service/src/main/java/com/bizmatics/service/impl/RtAnalogDataServiceImpl.java

@@ -94,6 +94,30 @@ public class RtAnalogDataServiceImpl extends AbstractCrudService<RtAnalogDataMap
         return Optional.of(count).filter(total -> total != 0).map(sub -> Arith.div(typeCount, sub)).orElse(0.00);
     }
 
+
+    public String addUnitOne(String name) {
+        if (name.endsWith("电压")) {
+            return "V";
+        } else if (name.endsWith("电流")) {
+            return "A";
+        } else if (name.endsWith("温度")) {
+            return "C";
+        } else if (name.endsWith("频率")) {
+            return "Hz";
+        } else if (name.endsWith("有功功率") || name.endsWith("需量")) {
+            return "KW";
+        } else if (name.endsWith("无功功率")) {
+            return "KVar";
+        } else if (name.endsWith("不平衡度") || name.endsWith("电压畸变率")) {
+            return "%";
+        } else if (name.endsWith("次数")) {
+            return "次";
+        } else if (name.endsWith("电度") || name.endsWith("有功")) {
+            return "KWh";
+        }
+        return "";
+    }
+
     @Override
     public List<Map<String, Object>> getOne(Integer siteId) {
         List<Map<String, Object>> list = new ArrayList<>();
@@ -102,7 +126,7 @@ public class RtAnalogDataServiceImpl extends AbstractCrudService<RtAnalogDataMap
             for (String name : rad.keySet()) {
                 Map<String, Object> map = new HashMap<>();
                 map.put("name", name);
-                map.put("value", addUnit(name, (String) rad.get(name)));
+                map.put("value",rad.get(name)+""+addUnitOne(name));
                 list.add(map);
             }
         });