Commit c466eefa authored by caotao's avatar caotao

新增代码保证健壮性

parent fba3ccad
...@@ -984,7 +984,9 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator { ...@@ -984,7 +984,9 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
windSqlList.add(item); windSqlList.add(item);
} }
if ("有功功率".equals(item.getEquipmentIndexName())) { if ("有功功率".equals(item.getEquipmentIndexName())) {
item.setValue(String.format("%.2f", Double.parseDouble(item.getValue()) / 1000)); if (!ObjectUtils.isEmpty(item.getValue())) {
item.setValue(String.format("%.2f", Double.parseDouble(item.getValue()) / 1000));
}
powerSqlList.add(item); powerSqlList.add(item);
} }
if ("瞬时风速".equals(item.getEquipmentIndexName())) { if ("瞬时风速".equals(item.getEquipmentIndexName())) {
...@@ -1001,10 +1003,11 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator { ...@@ -1001,10 +1003,11 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
windSqlList.forEach(item -> { windSqlList.forEach(item -> {
HashMap<String, String> stringStringHashMap = new HashMap<>(); HashMap<String, String> stringStringHashMap = new HashMap<>();
stringStringHashMap.put("equipmentNumber", item.getEquipmentNumber()); stringStringHashMap.put("equipmentNumber", item.getEquipmentNumber());
stringStringHashMap.put("wind", item.getValue()); stringStringHashMap.put("wind", ObjectUtils.isEmpty(item.getValue())?"0.0":item.getValue());
stringStringHashMap.put("power", powerSqlMap.get(item.getEquipmentNumber())); stringStringHashMap.put("power", powerSqlMap.get(item.getEquipmentNumber()));
stringStringHashMap.put("windSpeed", windSpeedSqlMap.get(item.getEquipmentNumber())); stringStringHashMap.put("windSpeed", windSpeedSqlMap.get(item.getEquipmentNumber()));
stringStringHashMap.put("electricity", String.format("%.4f", Double.valueOf(electricitySqlMap.get(item.getEquipmentNumber())))); stringStringHashMap.put("electricity", String.format("%.4f",ObjectUtils.isEmpty(item.getEquipmentNumber())?0.0000:Double.valueOf(electricitySqlMap.get(item.getEquipmentNumber() ))));
resultList.add(stringStringHashMap); resultList.add(stringStringHashMap);
}); });
//构建平台数据 //构建平台数据
......
...@@ -90,7 +90,7 @@ public class InfluxDButils { ...@@ -90,7 +90,7 @@ public class InfluxDButils {
for (int j = 0; j < columns.size(); ++j) { for (int j = 0; j < columns.size(); ++j) {
String k = columns.get(j); String k = columns.get(j);
Object v = values.get(i).get(j); Object v = values.get(i).get(j);
v = v.toString().equals("")?0.0:v;
bean.setPropertyValue(k, v); bean.setPropertyValue(k, v);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment