Yangwl
/
LanJu_Mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update - 水电实时数据

Browse Source
master
yinq 9 months ago
parent 6ad5ed5fdd
commit 951f2e3161
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File

8
op-modules/op-energy/src/main/resources/mapper/record/RecordDnbInstantMapper.xml
Unescape Escape View File

@ -44,7 +44,7 @@
</if>
<if test="monitorSubset != null and monitorSubset != ''">
and (record_dnb_instant.monitor_id = #{monitorSubset} OR record_dnb_instant.monitor_id IN
(SELECT t.monitor_id FROM base_monitor_info t WHERE FIND_IN_SET(#{monitorSubset}, ancestors)))
(SELECT t.monitor_id FROM base_monitor_info t WHERE dbo.FIND_IN_SET(#{monitorSubset}, ancestors) > 0))
</if>
<if test="vA != null ">and vA = #{vA}</if>
<if test="vB != null ">and vB = #{vB}</if>
@ -82,7 +82,7 @@
<if test="monitorId != null and monitorId != ''">and rdi.monitor_id = #{monitorId}</if>
<if test="monitorSubset != null and monitorSubset != ''">
and (rdi.monitor_id = #{monitorSubset} OR rdi.monitor_id IN
(SELECT t.monitor_id FROM base_monitor_info t WHERE FIND_IN_SET(#{monitorSubset}, ancestors)))
(SELECT t.monitor_id FROM base_monitor_info t WHERE dbo.FIND_IN_SET(#{monitorSubset}, ancestors) > 0))
</if>
<if test="params.monitorIdList != null and params.monitorIdList.size > 0">
and rdi.monitor_id IN
@ -93,7 +93,7 @@
</where>
group by rdi.monitor_id) md on md.monitor_id = d.monitor_id and md.collect_time = d.collect_time
left join base_monitor_info m on m.monitor_id = d.monitor_id
left join (select rpd.monitor_id, ifnull(sum(rpd.expend), 0) consumption
left join (select rpd.monitor_id, isnull(sum(rpd.expend), 0) consumption
from report_point_dnb rpd
<if test="params.beginCollectTime != null and params.beginCollectTime != '' and params.endCollectTime != null and params.endCollectTime != ''">
where rpd.begin_time between #{params.beginCollectTime} and #{params.endCollectTime}
@ -116,7 +116,7 @@
<if test="monitorId != null and monitorId != ''">and bmi.monitor_id = #{monitorId}</if>
<if test="monitorSubset != null and monitorSubset != ''">
and (bmi.monitor_id = #{monitorSubset} OR bmi.monitor_id IN
(SELECT t.monitor_id FROM base_monitor_info t WHERE FIND_IN_SET(#{monitorSubset}, ancestors)))
(SELECT t.monitor_id FROM base_monitor_info t WHERE dbo.FIND_IN_SET(#{monitorSubset}, ancestors) > 0))
</if>
</where>
</select>

8
op-modules/op-energy/src/main/resources/mapper/record/RecordWaterInstantMapper.xml
Unescape Escape View File

@ -35,7 +35,7 @@
</if>
<if test="monitorSubset != null and monitorSubset != ''">
and (record_water_instant.monitor_id = #{monitorSubset} OR record_water_instant.monitor_id IN
(SELECT t.monitor_id FROM base_monitor_info t WHERE FIND_IN_SET(#{monitorSubset}, ancestors)))
(SELECT t.monitor_id FROM base_monitor_info t WHERE dbo.FIND_IN_SET(#{monitorSubset}, ancestors) > 0))
</if>
<if test="fluxFlow != null ">and flux_flow = #{fluxFlow}</if>
<if test="waterFlow != null ">and water_flow = #{waterFlow}</if>
@ -63,7 +63,7 @@
<if test="monitorId != null and monitorId != ''">and rdi.monitor_id = #{monitorId}</if>
<if test="monitorSubset != null and monitorSubset != ''">
and (rdi.monitor_id = #{monitorSubset} OR rdi.monitor_id IN
(SELECT t.monitor_id FROM base_monitor_info t WHERE FIND_IN_SET(#{monitorSubset}, ancestors)))
(SELECT t.monitor_id FROM base_monitor_info t WHERE dbo.FIND_IN_SET(#{monitorSubset}, ancestors) > 0))
</if>
<if test="params.monitorIdList != null and params.monitorIdList.size > 0">
and rdi.monitor_id IN
@ -74,7 +74,7 @@
</where>
group by rdi.monitor_id) md on md.monitor_id = d.monitor_id and md.collect_time = d.collect_time
left join base_monitor_info m on m.monitor_id = d.monitor_id
left join (select rpd.monitor_id, ifnull(sum(rpd.expend), 0) consumption
left join (select rpd.monitor_id, isnull(sum(rpd.expend), 0) consumption
from report_point_dnb rpd
<if test="params.beginCollectTime != null and params.beginCollectTime != '' and params.endCollectTime != null and params.endCollectTime != ''">
where rpd.begin_time between #{params.beginCollectTime} and #{params.endCollectTime}
@ -94,7 +94,7 @@
<if test="monitorId != null and monitorId != ''">and bmi.monitor_id = #{monitorId}</if>
<if test="monitorSubset != null and monitorSubset != ''">
and (bmi.monitor_id = #{monitorSubset} OR bmi.monitor_id IN
(SELECT t.monitor_id FROM base_monitor_info t WHERE FIND_IN_SET(#{monitorSubset}, ancestors)))
(SELECT t.monitor_id FROM base_monitor_info t WHERE dbo.FIND_IN_SET(#{monitorSubset}, ancestors) > 0))
</if>
</where>
</select>

Write Preview
Loading…
Cancel
Save