|
|
|
@@ -95,12 +95,6 @@ public class KwBoxServiceImpl implements KwBoxService { |
|
|
|
|
|
|
|
if (kwMeter==null) return null; |
|
|
|
|
|
|
|
KwMeterData record = new KwMeterData(); |
|
|
|
record.setBoxId(kwBox.getId()); |
|
|
|
record.setMeterId(kwMeter.getId()); |
|
|
|
record.setTotalPower(0); //set in sql not null |
|
|
|
record.setSortColumns(KwMeterData.Field.DeviceTime_DESC); |
|
|
|
PageInfo<KwMeterData> kwMeterDataPage = kwMeterDataService.listAsPage(record,1,1); |
|
|
|
|
|
|
|
KwMeterData kwMeterData = new KwMeterData(); |
|
|
|
kwMeterData.setTenantId(kwBox.getTenantId()); |
|
|
|
@@ -113,9 +107,17 @@ public class KwBoxServiceImpl implements KwBoxService { |
|
|
|
kwMeterData.setTotalPower(Integer.parseInt(activePower)); |
|
|
|
} |
|
|
|
|
|
|
|
if (kwMeterDataPage.getList().size() > 0 |
|
|
|
&& kwMeterDataPage.getList().get(0).getTotalPower() != null |
|
|
|
&& kwMeterData.getTotalPower() != null) { |
|
|
|
if (kwMeterData.getTotalPower() != null) { |
|
|
|
|
|
|
|
KwMeterData record = new KwMeterData(); |
|
|
|
record.setBoxId(kwBox.getId()); |
|
|
|
record.setMeterId(kwMeter.getId()); |
|
|
|
record.setTotalPower(0); //set in sql not null |
|
|
|
record.setSortColumns(KwMeterData.Field.DeviceTime_DESC); |
|
|
|
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()); |
|
|
|
|