|
|
@@ -116,11 +116,11 @@ public class KwBoxServiceImpl implements KwBoxService { |
|
|
record.setSortColumns(KwMeterData.Field.DeviceTime_DESC); |
|
|
record.setSortColumns(KwMeterData.Field.DeviceTime_DESC); |
|
|
PageInfo<KwMeterData> kwMeterDataPage = kwMeterDataService.listAsPage(record,1,1); |
|
|
PageInfo<KwMeterData> kwMeterDataPage = kwMeterDataService.listAsPage(record,1,1); |
|
|
|
|
|
|
|
|
if (kwMeterDataPage.getList().size() > 0 |
|
|
|
|
|
&& kwMeterDataPage.getList().get(0).getTotalPower() != null) |
|
|
|
|
|
kwMeterData.setUsedPower( |
|
|
|
|
|
kwMeterData.getTotalPower()-kwMeterDataPage.getList().get(0).getTotalPower()); |
|
|
|
|
|
kwMeterData.setLastDeviceTime(kwMeterDataPage.getList().get(0).getDeviceTime()); |
|
|
|
|
|
|
|
|
if (kwMeterDataPage.getList().size() > 0) { |
|
|
|
|
|
kwMeterData.setUsedPower( |
|
|
|
|
|
kwMeterData.getTotalPower()-kwMeterDataPage.getList().get(0).getTotalPower()); |
|
|
|
|
|
kwMeterData.setLastDeviceTime(kwMeterDataPage.getList().get(0).getDeviceTime()); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
kwMeterDataService.save(kwMeterData); |
|
|
kwMeterDataService.save(kwMeterData); |
|
|
|