|
|
@@ -15,6 +15,7 @@
|
|
|
|
|
|
<resultMap id="MeterPage" type="com.template.model.tongji.MeterPage">
|
|
|
<result property="build" column="build"/>
|
|
|
+ <result property="meterName" column="meter_name"/>
|
|
|
<result property="meterId" column="meter_id"/>
|
|
|
<result property="num" column="num"/>
|
|
|
<result property="createTime" column="create_time"/>
|
|
|
@@ -76,10 +77,15 @@
|
|
|
|
|
|
<!--设备实时记录数据-->
|
|
|
<select id="getMeterDetail" resultMap="MeterPage">
|
|
|
- select c.meter_id,c.meter_power num,d.`name` build,c.create_time from (select a.`meter_id`,a.`meter_power`,a.`create_time`,
|
|
|
- b.`build_id` from `smart_meter_detail` a left join `smart_build_meter` b
|
|
|
- on a.`meter_id`=b.`meter_id` where a.meter_type=#{meterType}) c
|
|
|
- left join `smart_build` d on c.`build_id`=d.`id` order by create_time desc
|
|
|
+ select e.name meter_name,c.meter_power num,d.`name` build,c.create_time from
|
|
|
+ (select a.`meter_id`,a.`meter_power`,a.`create_time`,
|
|
|
+ b.`build_id` from `smart_meter_detail` a left join `smart_build_meter` b
|
|
|
+ on a.`meter_id`=b.`meter_id` where a.meter_type=#{meterType} and b.`meter_type`=#{meterType}
|
|
|
+ and a.`deleted`=0 and b.`deleted`=0) c
|
|
|
+ left join `smart_build` d on c.`build_id`=d.`id`
|
|
|
+ left join `smart_meter` e on c.meter_id=e.id
|
|
|
+ where d.deleted=0 and e.`deleted`=0 and e.`meter_type`=#{meterType}
|
|
|
+ order by create_time desc
|
|
|
</select>
|
|
|
|
|
|
<!--设备实时记录数据-->
|
