Commit 1c56d123 authored by caotao's avatar caotao

修改预警生成报错问题

parent d420197d
...@@ -68,7 +68,8 @@ ...@@ -68,7 +68,8 @@
number, number,
equipment_name, equipment_name,
point_name, point_name,
kks kks,
org_code
</select> </select>
<select id="getInfoListByGroupByZxtFan" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanHealthIndex"> <select id="getInfoListByGroupByZxtFan" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanHealthIndex">
...@@ -95,7 +96,8 @@ ...@@ -95,7 +96,8 @@
area, area,
sub_system, sub_system,
equipment_name, equipment_name,
number number,
org_code
</select> </select>
<select id="getInfoListByGroupBySbFan" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanHealthIndex"> <select id="getInfoListByGroupBySbFan" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanHealthIndex">
...@@ -120,7 +122,8 @@ ...@@ -120,7 +122,8 @@
analysis_obj_type, analysis_obj_type,
area, area,
number, number,
equipment_name equipment_name,
org_code
</select> </select>
<select id="getInfoListByGroupByCzFan" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanHealthIndex"> <select id="getInfoListByGroupByCzFan" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanHealthIndex">
...@@ -141,7 +144,8 @@ ...@@ -141,7 +144,8 @@
gateway_id, gateway_id,
station, station,
analysis_obj_type, analysis_obj_type,
area area,
org_code
</select> </select>
<select id="getInfoListByGroupByQyFan" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanHealthIndex"> <select id="getInfoListByGroupByQyFan" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanHealthIndex">
...@@ -158,7 +162,8 @@ ...@@ -158,7 +162,8 @@
and ts > #{startTime} and ts > #{startTime}
group by group by
analysis_obj_type, analysis_obj_type,
area area,
org_code
</select> </select>
<select id="getInfoByPage" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanHealthIndex"> <select id="getInfoByPage" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanHealthIndex">
...@@ -519,6 +524,7 @@ ...@@ -519,6 +524,7 @@
analysis_obj_type = #{analysisObjectType} analysis_obj_type = #{analysisObjectType}
and ts > #{startTime} and ts > #{startTime}
group by group by
analysis_obj_type analysis_obj_type,
org_code
</select> </select>
</mapper> </mapper>
...@@ -84,6 +84,7 @@ ...@@ -84,6 +84,7 @@
point_name, point_name,
device_type, device_type,
kks, kks,
org_code,
AVG(health_index) as health_index AVG(health_index) as health_index
from from
#{tableName} #{tableName}
...@@ -103,7 +104,8 @@ ...@@ -103,7 +104,8 @@
equipment_name, equipment_name,
point_name, point_name,
device_type, device_type,
kks kks,
org_code
</select> </select>
<select id="getInfoListByGroupBySbPv" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.PvHealthIndex"> <select id="getInfoListByGroupBySbPv" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.PvHealthIndex">
...@@ -128,6 +130,7 @@ ...@@ -128,6 +130,7 @@
analysis_obj_type, analysis_obj_type,
area, area,
subarray, subarray,
org_code,
equipment_name equipment_name
</select> </select>
...@@ -151,7 +154,8 @@ ...@@ -151,7 +154,8 @@
station, station,
analysis_obj_type, analysis_obj_type,
area, area,
subarray subarray,
org_code
</select> </select>
<select id="getInfoListByGroupByCzPv" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.PvHealthIndex"> <select id="getInfoListByGroupByCzPv" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.PvHealthIndex">
...@@ -172,7 +176,8 @@ ...@@ -172,7 +176,8 @@
gateway_id, gateway_id,
station, station,
analysis_obj_type, analysis_obj_type,
area area,
org_code
</select> </select>
<select id="getInfoListByGroupByQyPv" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.PvHealthIndex"> <select id="getInfoListByGroupByQyPv" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.PvHealthIndex">
...@@ -189,7 +194,8 @@ ...@@ -189,7 +194,8 @@
and ts > #{startTime} and ts > #{startTime}
group by group by
analysis_obj_type, analysis_obj_type,
area area,
org_code
</select> </select>
<select id="getInfoByPage" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.PvHealthIndex"> <select id="getInfoByPage" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.PvHealthIndex">
...@@ -274,6 +280,7 @@ ...@@ -274,6 +280,7 @@
select select
'全域' as analysis_obj_type, '全域' as analysis_obj_type,
avg(anomaly) as anomaly, avg(anomaly) as anomaly,
org_code,
AVG(health_index) as health_index AVG(health_index) as health_index
from from
#{tableName} #{tableName}
...@@ -281,6 +288,7 @@ ...@@ -281,6 +288,7 @@
analysis_obj_type = #{analysisObjectType} analysis_obj_type = #{analysisObjectType}
and ts > #{startTime} and ts > #{startTime}
group by group by
analysis_obj_type analysis_obj_type,
org_code
</select> </select>
</mapper> </mapper>
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