|
|
|
@@ -101,8 +101,8 @@ |
|
|
|
|
|
|
|
<select id="findVoList" parameterType="com.iformall.domain.dto.KwMeterDataDto" resultMap="VoResultMap"> |
|
|
|
select |
|
|
|
tenant_id, |
|
|
|
temp.reportTime as reportTime, |
|
|
|
temp.tenant_id, |
|
|
|
temp.reportTime, |
|
|
|
min(temp.recordStartTime) as recordStartTime, |
|
|
|
max(temp.recordEndTime) as recordEndTime, |
|
|
|
sum(temp.totalPower) as totalPower, |
|
|
|
@@ -112,16 +112,16 @@ |
|
|
|
(SELECT |
|
|
|
tenant_id,box_id,meter_id, |
|
|
|
<if test=" null == reportType"> |
|
|
|
temp.create_time as reportTime, |
|
|
|
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 test=" null != reportType and 1 == reportType "> |
|
|
|
date_format(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 test=" null != reportType and 2 == reportType "> |
|
|
|
date_format(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 test=" null != reportType and 3 == reportType "> |
|
|
|
date_format(create_time, '%Y-%m') as reportTime, |
|
|
|
</if> |
|
|
|
min(last_device_time) as recordStartTime, |
|
|
|
min(last_total_power) as lastTotalPower, |
|
|
|
@@ -129,20 +129,19 @@ |
|
|
|
max(total_power) as totalPower, |
|
|
|
sum(used_power) as usedPower |
|
|
|
FROM kw_meter_data |
|
|
|
where |
|
|
|
<include refid="dynamicWhereConditionsVo"/> |
|
|
|
group by reportTime,meter_id |
|
|
|
) as temp |
|
|
|
group by |
|
|
|
reportTime, |
|
|
|
tenant_id |
|
|
|
temp.reportTime, |
|
|
|
temp.tenant_id |
|
|
|
<if test=" null != boxId "> |
|
|
|
,box_id |
|
|
|
,temp.box_id |
|
|
|
</if> |
|
|
|
<if test=" null != meterId "> |
|
|
|
,meter_id |
|
|
|
,temp.meter_id |
|
|
|
</if> |
|
|
|
order by reportTime desc |
|
|
|
order by temp.reportTime asc |
|
|
|
</select> |
|
|
|
|
|
|
|
<select id="getPower" parameterType="com.iformall.domain.dto.KwMeterDataDto" resultMap="VoResultMap"> |
|
|
|
|