|
|
|
@@ -120,9 +120,10 @@ public class KwBoxServiceImpl implements KwBoxService { |
|
|
|
} |
|
|
|
}); |
|
|
|
|
|
|
|
KwMeter kwMeter = new KwMeter(); |
|
|
|
|
|
|
|
List<Long> onlines = kwMeterDataList.stream().filter(md->md.getTotalPower()!=null).map(KwMeterData::getMeterId).collect(Collectors.toList()); |
|
|
|
if (onlines.size() > 0) { |
|
|
|
KwMeter kwMeter = new KwMeter(); |
|
|
|
kwMeter.setIds(onlines); |
|
|
|
kwMeter.setOnlineStatus(EnumMeterOnlineStatus.ONLINE.getCode()); |
|
|
|
kwMeter.setUpdateTime(new Date()); |
|
|
|
@@ -132,7 +133,7 @@ public class KwBoxServiceImpl implements KwBoxService { |
|
|
|
param.setIds(onlines); |
|
|
|
List<KwMeterData> lastRecordList = kwMeterDataService.findLastRecordList(param); |
|
|
|
kwMeterDataList.stream().forEach(md->{ |
|
|
|
Optional<KwMeterData> data = lastRecordList.stream().filter(lr->lr.getMeterId() == md.getMeterId()).findAny(); |
|
|
|
Optional<KwMeterData> data = lastRecordList.stream().filter(lr->lr.getMeterId().equals(md.getMeterId())).findAny(); |
|
|
|
if (data.isPresent()) { |
|
|
|
md.setUsedPower( |
|
|
|
md.getTotalPower()-data.get().getTotalPower()); |
|
|
|
@@ -144,6 +145,7 @@ public class KwBoxServiceImpl implements KwBoxService { |
|
|
|
|
|
|
|
List<Long> offlines = kwMeterDataList.stream().filter(md->md.getTotalPower()==null).map(KwMeterData::getMeterId).collect(Collectors.toList()); |
|
|
|
if (offlines.size() > 0) { |
|
|
|
KwMeter kwMeter = new KwMeter(); |
|
|
|
kwMeter.setIds(onlines); |
|
|
|
kwMeter.setOnlineStatus(EnumMeterOnlineStatus.OFFLINE.getCode()); |
|
|
|
kwMeter.setUpdateTime(new Date()); |
|
|
|
|