Commit 4686d111 authored by hezhuozhi's avatar hezhuozhi

修改电站监控问题

parent 9cfb0cfb
...@@ -1059,7 +1059,7 @@ public class SunlightServiceImpl implements SunlightService { ...@@ -1059,7 +1059,7 @@ public class SunlightServiceImpl implements SunlightService {
Map<String, HYGFJPInverterWarn> bodyparam = new HashMap<>(); Map<String, HYGFJPInverterWarn> bodyparam = new HashMap<>();
if (hygfjpInverterWarnlist != null && hygfjpInverterWarnlist.size() > 0) { if (hygfjpInverterWarnlist != null && hygfjpInverterWarnlist.size() > 0) {
bodyparam = hygfjpInverterWarnlist.stream() bodyparam = hygfjpInverterWarnlist.stream()
.collect(Collectors.toMap(HYGFJPInverterWarn::getWarnId, Function.identity())); .collect(Collectors.toMap(HYGFJPInverterWarn::getWarnId, Function.identity(),(value1, value2) -> value1));
} }
// 获取所有逆变器 // 获取所有逆变器
List<JpInverter> jpInverter = jpInverterMapper List<JpInverter> jpInverter = jpInverterMapper
...@@ -1067,7 +1067,7 @@ public class SunlightServiceImpl implements SunlightService { ...@@ -1067,7 +1067,7 @@ public class SunlightServiceImpl implements SunlightService {
Map<String, String> jpInverterbodyparam = new HashMap<>(); Map<String, String> jpInverterbodyparam = new HashMap<>();
if (jpInverter != null && jpInverter.size() > 0) { if (jpInverter != null && jpInverter.size() > 0) {
jpInverterbodyparam = jpInverter.stream() jpInverterbodyparam = jpInverter.stream()
.collect(Collectors.toMap(JpInverter::getId, JpInverter::getSnCode)); .collect(Collectors.toMap(JpInverter::getId, JpInverter::getSnCode,(value1, value2) -> value1));
} }
if (listd != null && !listd.isEmpty()) { if (listd != null && !listd.isEmpty()) {
for (SunlightWarm sunlightWarm : listd) { for (SunlightWarm sunlightWarm : listd) {
......
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