diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/KwMeterDataDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/KwMeterDataDto.java index d12354a85..28e19e8dd 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/KwMeterDataDto.java +++ b/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"), 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 b28c3c124..b35346f6a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/KwMeterDataVo.java +++ b/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; } diff --git a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml index c43d24899..c42e8ca06 100644 --- a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml @@ -66,7 +66,7 @@ - + @@ -100,17 +100,30 @@