修改预警生成报错问题

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/tdengine2/FanHealthIndex.xml

@@ -68,7 +68,8 @@
         number,
         equipment_name,
         point_name,
-        kks
+        kks,
+        org_code
     </select>
 
 <select id="getInfoListByGroupByZxtFan" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanHealthIndex">
@@ -95,7 +96,8 @@
         area,
         sub_system,
         equipment_name,
-        number
+        number,
+        org_code
     </select>
 
 <select id="getInfoListByGroupBySbFan" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanHealthIndex">
@@ -120,7 +122,8 @@
         analysis_obj_type,
         area,
         number,
-        equipment_name
+        equipment_name,
+        org_code
     </select>
 
 <select id="getInfoListByGroupByCzFan" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanHealthIndex">
@@ -141,7 +144,8 @@
         gateway_id,
         station,
         analysis_obj_type,
-        area
+        area,
+        org_code
     </select>
 
 <select id="getInfoListByGroupByQyFan" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanHealthIndex">
@@ -158,7 +162,8 @@
       and ts > #{startTime}
     group by
         analysis_obj_type,
-        area
+        area,
+        org_code
     </select>
 
 <select id="getInfoByPage" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanHealthIndex">
@@ -519,6 +524,7 @@
         analysis_obj_type = #{analysisObjectType}
       and ts > #{startTime}
     group by
-        analysis_obj_type
+        analysis_obj_type,
+        org_code
 </select>
 </mapper>

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/tdengine2/PvHealthIndex.xml

@@ -84,6 +84,7 @@
             point_name,
             device_type,
             kks,
+            org_code,
             AVG(health_index) as health_index
         from
             #{tableName}
@@ -103,7 +104,8 @@
             equipment_name,
             point_name,
             device_type,
-            kks
+            kks,
+            org_code
     </select>
 
     <select id="getInfoListByGroupBySbPv" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.PvHealthIndex">
@@ -128,6 +130,7 @@
             analysis_obj_type,
             area,
             subarray,
+            org_code,
             equipment_name
     </select>
 
@@ -151,7 +154,8 @@
             station,
             analysis_obj_type,
             area,
-            subarray
+            subarray,
+            org_code
     </select>
 
     <select id="getInfoListByGroupByCzPv" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.PvHealthIndex">
@@ -172,7 +176,8 @@
             gateway_id,
             station,
             analysis_obj_type,
-            area
+            area,
+            org_code
     </select>
 
     <select id="getInfoListByGroupByQyPv" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.PvHealthIndex">
@@ -189,7 +194,8 @@
           and ts > #{startTime}
         group by
             analysis_obj_type,
-            area
+            area,
+            org_code
     </select>
 
     <select id="getInfoByPage" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.PvHealthIndex">
@@ -274,6 +280,7 @@
         select
             '全域' as analysis_obj_type,
             avg(anomaly) as anomaly,
+            org_code,
             AVG(health_index) as health_index
         from
             #{tableName}
@@ -281,6 +288,7 @@
             analysis_obj_type = #{analysisObjectType}
           and ts > #{startTime}
         group by
-            analysis_obj_type
+            analysis_obj_type,
+            org_code
     </select>
 </mapper>