Преглед изворни кода

[电表][修改]:报表接口完善

release_toaliyun_real
hupeng пре 7 година
родитељ
комит
529c04f665
3 измењених фајлова са 28 додато и 15 уклоњено
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/dto/KwMeterDataDto.java
  2. +6
    -6
      mallinkService/src/main/java/com/iformall/domain/vo/KwMeterDataVo.java
  3. +21
    -8
      mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml

+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/dto/KwMeterDataDto.java Прегледај датотеку

@@ -46,7 +46,7 @@ public class KwMeterDataDto extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value = "结束时间", name = "endTime")
private Date endTime;

private Integer type;
private Integer reportType;

public static enum Field {
Id_ASC("`id` ASC"),


+ 6
- 6
mallinkService/src/main/java/com/iformall/domain/vo/KwMeterDataVo.java Прегледај датотеку

@@ -22,19 +22,19 @@ public class KwMeterDataVo extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value = "电表编号", name = "address")
private String address;

@io.swagger.annotations.ApiModelProperty(value = "使用的电量", name = "startTime")
@io.swagger.annotations.ApiModelProperty(value = "使用的电量", name = "usedPower")
private Integer usedPower;

@io.swagger.annotations.ApiModelProperty(value = "总电量", name = "startTime")
@io.swagger.annotations.ApiModelProperty(value = "总电量", name = "totalPower")
private Integer totalPower;

@io.swagger.annotations.ApiModelProperty(value = "记录时间", name = "createTime")
private Date reportTime;
@io.swagger.annotations.ApiModelProperty(value = "记录时间", name = "reportTime")
private String reportTime;

@io.swagger.annotations.ApiModelProperty(value = "统计开始时间", name = "startTime")
@io.swagger.annotations.ApiModelProperty(value = "统计开始时间", name = "recordStartTime")
private Date recordStartTime;

@io.swagger.annotations.ApiModelProperty(value = "统计结束时间", name = "endTime")
@io.swagger.annotations.ApiModelProperty(value = "统计结束时间", name = "recordEndTime")
private Date recordEndTime;

}

+ 21
- 8
mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml Прегледај датотеку

@@ -66,7 +66,7 @@
<result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/>
<result column="totalPower" jdbcType="INTEGER" property="totalPower"/>
<result column="usedPower" jdbcType="INTEGER" property="usedPower"/>
<result column="reportTime" jdbcType="TIMESTAMP" property="reportTime"/>
<result column="reportTime" jdbcType="VARCHAR" property="reportTime"/>
<result column="recordStartTime" jdbcType="TIMESTAMP" property="recordStartTime"/>
<result column="recordEndTime" jdbcType="TIMESTAMP" property="recordEndTime"/>
</resultMap>
@@ -100,17 +100,30 @@
<select id="findVoList" parameterType="com.iformall.domain.dto.KwMeterDataDto" resultMap="VoResultMap">
select
temp.tenant_id,
date_format(temp.create_time, '%Y-%m-%d %H:00:00') as reportTime,
max(temp.create_time) as recordStartTime,
max(temp.sumPower) as totalPower
<if test=" null == reportType">
temp.create_time as reportTime,
</if>
<if test=" null != reportType and 1 != reportType ">
date_format(temp.create_time, '%Y-%m-%d %H:00') as reportTime,
</if>
<if test=" null != reportType and 2 != reportType ">
date_format(temp.create_time, '%Y-%m-%d') as reportTime,
</if>
<if test=" null != reportType and 3 != reportType ">
date_format(temp.create_time, '%Y-%m') as reportTime,
</if>

min(temp.last_device_time) as recordStartTime,
max(temp.device_time) as recordEndTime,
max(temp.total_power) as totalPower,
sum(temp.used_power) as usedPower
from
(SELECT tenant_id,
sum(total_power) as sumPower,
create_time, device_time
(SELECT
<include refid="allColumns"/>
FROM kw_meter_data
where
<include refid="dynamicWhereConditions"/>
group by device_time) as temp
) as temp
group by reportTime
order by reportTime desc
</select>


Loading…
Откажи
Сачувај