Commit 59230c94 authored by ZWT's avatar ZWT

feat(吉林演示): 松原

1.修改部分第三方数据处理定时任务,修改系统来源,将固定来源按环境区分改为动态获取;
2.修改统计分析-间开效果评价新页面累节电能接口,暂时无法获取电费信息,将电费信息默认做随机数处理;
3.修改统计分析-能耗分析新页面峰谷能耗对比分析接口,暂时无法获取电费信息,将电费信息默认做随机数处理;
4.吉林首页井场用能分析模块开放井场用能分析双坐标轴接口,备用;
5.修改首页光伏实时监控接口,解决选择查看部分采油厂接口报错提示异常问题;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 46ffba4a
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
LEFT JOIN sys_area a ON a.id = p.area_code LEFT JOIN sys_area a ON a.id = p.area_code
WHERE p.is_deleted = 1 WHERE p.is_deleted = 1
AND p.area_code IS NOT NULL AND p.area_code IS NOT NULL
<if test="ouIdNotIn != null"> <if test="ouIdNotIn != null and ouIdNotIn.size() > 0">
AND p.ou_id NOT IN AND p.ou_id NOT IN
<foreach collection="ouIdNotIn" open="(" close=")" separator="," item="item"> <foreach collection="ouIdNotIn" open="(" close=")" separator="," item="item">
#{item} #{item}
......
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="wellheadIds != null"> <if test="wellheadIds != null and wellheadIds.size() > 0">
AND l.wellhead_id NOT IN AND l.wellhead_id NOT IN
<foreach collection="wellheadIds" open="(" close=")" separator="," item="item"> <foreach collection="wellheadIds" open="(" close=")" separator="," item="item">
#{item} #{item}
......
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
station_name station_name
FROM third_active_power FROM third_active_power
WHERE ( WHERE (
<if test="stationNames != null"> <if test="stationNames != null and stationNames.size() > 0">
station_name IN station_name IN
<foreach collection="stationNames" item="item" open="(" separator="," close=")"> <foreach collection="stationNames" item="item" open="(" separator="," close=")">
#{item} #{item}
......
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
<if test="inputTime != null"> <if test="inputTime != null">
AND DATE ( input_time ) = #{inputTime} AND DATE ( input_time ) = #{inputTime}
</if> </if>
<if test="wellNumbers != null"> <if test="wellNumbers != null and wellNumbers.size() > 0">
AND well_number IN AND well_number IN
<foreach collection="wellNumbers" item="item" open="(" separator="," close=")"> <foreach collection="wellNumbers" item="item" open="(" separator="," close=")">
#{item} #{item}
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
third_well_avg_active_power third_well_avg_active_power
WHERE WHERE
( (
<if test="wellNumbers != null"> <if test="wellNumbers != null and wellNumbers.size() > 0">
well_number IN well_number IN
<foreach collection="wellNumbers" item="item" open="(" separator="," close=")"> <foreach collection="wellNumbers" item="item" open="(" separator="," close=")">
#{item} #{item}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment