diff --git a/mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java b/mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java index c39121510..4e0151bc6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java @@ -59,6 +59,9 @@ public class KwMeterData extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "时段用电量开始时间", name = "lastDeviceTime") private Date lastDeviceTime; + @io.swagger.annotations.ApiModelProperty(value = "时段用电量开始电量", name = "lastTotalPower") + private Integer lastTotalPower; + public static enum Field { Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/KwMeterDataVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/KwMeterDataVo.java index b35346f6a..0920d2614 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/KwMeterDataVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/KwMeterDataVo.java @@ -28,6 +28,9 @@ public class KwMeterDataVo extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "总电量", name = "totalPower") private Integer totalPower; + @io.swagger.annotations.ApiModelProperty(value = "最近一次总电量", name = "lastTotalPower") + private Integer lastTotalPower; + @io.swagger.annotations.ApiModelProperty(value = "记录时间", name = "reportTime") private String reportTime; 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 d3e1a4e5b..590a0c102 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,7 +95,6 @@ public class KwBoxServiceImpl implements KwBoxService { if (kwMeter==null) return null; - KwMeterData kwMeterData = new KwMeterData(); kwMeterData.setTenantId(kwBox.getTenantId()); kwMeterData.setAddress(addr); @@ -120,6 +119,7 @@ public class KwBoxServiceImpl implements KwBoxService { kwMeterData.setUsedPower( kwMeterData.getTotalPower()-kwMeterDataPage.getList().get(0).getTotalPower()); kwMeterData.setLastDeviceTime(kwMeterDataPage.getList().get(0).getDeviceTime()); + kwMeterData.setLastTotalPower(kwMeterDataPage.getList().get(0).getTotalPower()); } } diff --git a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml index 3b2134462..fd1948a25 100644 --- a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml @@ -12,10 +12,11 @@ + - `id`,`tenant_id`,`meter_id`,`box_id`,`address`,`total_power`,`device_time`,`create_time`,`used_power`,`last_device_time` + `id`,`tenant_id`,`meter_id`,`box_id`,`address`,`total_power`,`device_time`,`create_time`,`used_power`,`last_device_time`,`last_total_power` @@ -65,6 +66,7 @@ + @@ -104,6 +106,7 @@ min(temp.recordStartTime) as recordStartTime, max(temp.recordEndTime) as recordEndTime, sum(temp.totalPower) as totalPower, + sum(temp.lastTotalPower) as lastTotalPower, sum(temp.usedPower) as usedPower from (SELECT @@ -121,6 +124,7 @@ date_format(temp.create_time, '%Y-%m') as reportTime, min(last_device_time) as recordStartTime, + min(last_total_power) as lastTotalPower, max(device_time) as recordEndTime, max(total_power) as totalPower, sum(used_power) as usedPower