Просмотр исходного кода

[电表][修改]:电量统计表增加字段

release_toaliyun_real
hupeng 7 лет назад
Родитель
Сommit
4cd6f89df2
4 измененных файлов: 12 добавлений и 2 удалений
  1. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/KwMeterDataVo.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java
  4. +5
    -1
      mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml

+ 3
- 0
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"),


+ 3
- 0
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;



+ 1
- 1
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());
}
}



+ 5
- 1
mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml Просмотреть файл

@@ -12,10 +12,11 @@
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="used_power" jdbcType="INTEGER" property="usedPower"/>
<result column="last_device_time" jdbcType="TIMESTAMP" property="lastDeviceTime"/>
<result column="last_total_power" jdbcType="INTEGER" property="lastTotalPower"/>
</resultMap>
<sql id="allColumns">
`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`
</sql>
<sql id="dynamicWhereConditions">
@@ -65,6 +66,7 @@
<resultMap id="VoResultMap" type="com.iformall.domain.vo.KwMeterDataVo">
<result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/>
<result column="totalPower" jdbcType="INTEGER" property="totalPower"/>
<result column="lastTotalPower" jdbcType="INTEGER" property="lastTotalPower"/>
<result column="usedPower" jdbcType="INTEGER" property="usedPower"/>
<result column="reportTime" jdbcType="VARCHAR" property="reportTime"/>
<result column="recordStartTime" jdbcType="TIMESTAMP" property="recordStartTime"/>
@@ -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,
</if>
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


Загрузка…
Отмена
Сохранить