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