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 339bb5ec1..d3e1a4e5b 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 @@ -116,11 +116,11 @@ public class KwBoxServiceImpl implements KwBoxService { 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()); + if (kwMeterDataPage.getList().size() > 0) { + kwMeterData.setUsedPower( + kwMeterData.getTotalPower()-kwMeterDataPage.getList().get(0).getTotalPower()); + kwMeterData.setLastDeviceTime(kwMeterDataPage.getList().get(0).getDeviceTime()); + } } kwMeterDataService.save(kwMeterData); diff --git a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml index ee449b335..deb203b67 100644 --- a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml @@ -27,8 +27,8 @@ and `tenant_id` = #{tenantId} - - and `box_id` = #{meterId} + + and `box_id` = #{boxId}