diff --git a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java index d2caa5fdb..339bb5ec1 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java @@ -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 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 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()); diff --git a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml index c213d78cc..ee449b335 100644 --- a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml @@ -76,8 +76,8 @@ and `tenant_id` = #{tenantId} - - and `box_id` = #{meterId} + + and `box_id` = #{boxId}