Skip to content

A
amos-boot-zx-biz
Commit 0cdd8d93 authored by hezhuozhi's avatar hezhuozhi
Browse files
Options

处理监控推送null问题

parent 217f26c0
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 17 deletions
amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java
View file @ 0cdd8d93
...@@ -5,22 +5,8 @@ import java.io.IOException; ...@@ -5,22 +5,8 @@ import java.io.IOException;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.text.Collator; import java.text.Collator;
import java.text.ParseException; import java.text.ParseException;
import java.util.ArrayList; import java.util.*;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Set;
import java.util.TreeMap;
import java.util.TreeSet;
import java.util.function.Function; import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -687,8 +673,12 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator { ...@@ -687,8 +673,12 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
time.add(DateUtil.format(indicatorData.getCreatedTime(), "HH:mm")); time.add(DateUtil.format(indicatorData.getCreatedTime(), "HH:mm"));
if ("FDZ".equals(stationBasic.getStationType())) { if ("FDZ".equals(stationBasic.getStationType())) {
values.add(String.format(CommonConstans.Twodecimalplaces, indicatorData.getValueF())); values.add(String.format(CommonConstans.Twodecimalplaces, indicatorData.getValueF()));
Double value = groupMap.get(indicatorData.getCreatedTime());
if (Objects.isNull(value)){
value= 0.0;
}
valueList.add( valueList.add(
String.format(CommonConstans.Twodecimalplaces, groupMap.get(indicatorData.getCreatedTime()))); String.format(CommonConstans.Twodecimalplaces,value));
} else { } else {
values.add(String.format(CommonConstans.Twodecimalplaces, values.add(String.format(CommonConstans.Twodecimalplaces,
indicatorData.getValueF() * CommonConstans.kwToMv)); indicatorData.getValueF() * CommonConstans.kwToMv));
...@@ -743,7 +733,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator { ...@@ -743,7 +733,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
JSON.toJSON(otherInfo).toString().getBytes("UTF-8"), 1, true); JSON.toJSON(otherInfo).toString().getBytes("UTF-8"), 1, true);
log.info("---------------------推送全站图表信息结束------------------------------"); log.info("---------------------推送全站图表信息结束------------------------------");
} catch (Exception exception) { } catch (Exception exception) {
log.info("---------------------推送全站图表信息失败------------------------------"); log.error("---------------------推送全站图表信息失败------------------------------");
} }
} }
......
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