Browse Source

[电表][修复]:电表数据查询语句问题

release_toaliyun_real
hupeng 7 years ago
parent
commit
12f6d9c294
2 changed files with 13 additions and 11 deletions
  1. +11
    -9
      mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java
  2. +2
    -2
      mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml

+ 11
- 9
mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java View File

@@ -95,12 +95,6 @@ public class KwBoxServiceImpl implements KwBoxService {


if (kwMeter==null) return null; 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 kwMeterData = new KwMeterData();
kwMeterData.setTenantId(kwBox.getTenantId()); kwMeterData.setTenantId(kwBox.getTenantId());
@@ -113,9 +107,17 @@ public class KwBoxServiceImpl implements KwBoxService {
kwMeterData.setTotalPower(Integer.parseInt(activePower)); 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.setUsedPower(
kwMeterData.getTotalPower()-kwMeterDataPage.getList().get(0).getTotalPower()); kwMeterData.getTotalPower()-kwMeterDataPage.getList().get(0).getTotalPower());
kwMeterData.setLastDeviceTime(kwMeterDataPage.getList().get(0).getDeviceTime()); kwMeterData.setLastDeviceTime(kwMeterDataPage.getList().get(0).getDeviceTime());


+ 2
- 2
mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml View File

@@ -76,8 +76,8 @@
and `tenant_id` = #{tenantId} and `tenant_id` = #{tenantId}
</if> </if>


<if test=" null != meterId ">
and `box_id` = #{meterId}
<if test=" null != boxId ">
and `box_id` = #{boxId}
</if> </if>


<if test=" null != meterId "> <if test=" null != meterId ">


Loading…
Cancel
Save