|
@@ -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);
|
|
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
|
|
@Override
|
|
public List<Map<String, Object>> getOne(Integer siteId) {
|
|
public List<Map<String, Object>> getOne(Integer siteId) {
|
|
List<Map<String, Object>> list = new ArrayList<>();
|
|
List<Map<String, Object>> list = new ArrayList<>();
|
|
@@ -102,7 +126,7 @@ public class RtAnalogDataServiceImpl extends AbstractCrudService<RtAnalogDataMap
|
|
for (String name : rad.keySet()) {
|
|
for (String name : rad.keySet()) {
|
|
Map<String, Object> map = new HashMap<>();
|
|
Map<String, Object> map = new HashMap<>();
|
|
map.put("name", name);
|
|
map.put("name", name);
|
|
- map.put("value", addUnit(name, (String) rad.get(name)));
|
|
|
|
|
|
+ map.put("value",rad.get(name)+""+addUnitOne(name));
|
|
list.add(map);
|
|
list.add(map);
|
|
}
|
|
}
|
|
});
|
|
});
|