|
|
|
@@ -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 |
|
|
|
|