bug修改

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizFanHealthIndexMapper.xml

@@ -339,7 +339,7 @@
     FROM
         idx_biz_fan_health_index
     <where>
-        ANALYSIS_OBJ_TYPE = '场站'
+        ANALYSIS_OBJ_TYPE = '子系统'
         AND ANALYSIS_TYPE = '按天'
         AND DATE_FORMAT( REC_DATE, "%Y-%m-%d" ) = CURRENT_DATE
         <if test="equipmentName != null and equipmentName != ''">
@@ -378,7 +378,7 @@
     FROM
         idx_biz_fan_health_index
     <where>
-        ANALYSIS_OBJ_TYPE = '场站'
+        ANALYSIS_OBJ_TYPE = '设备'
         AND ANALYSIS_TYPE = '按天'
         AND DATE_FORMAT( REC_DATE, "%Y-%m-%d" ) = CURRENT_DATE
         <if test="gatewayId != null and gatewayId != ''">
@@ -490,8 +490,7 @@
     FROM
     idx_biz_pv_health_index
     <where>
-        STATION IS NOT NULL
-        AND STATION != ''
+        ANALYSIS_OBJ_TYPE = '子阵'
         AND ANALYSIS_TYPE = '按天'
         AND DATE_FORMAT( REC_DATE, "%Y-%m-%d" ) = CURRENT_DATE
         <if test="gatewayId != null and gatewayId != ''">
@@ -509,8 +508,7 @@
     FROM
     idx_biz_pv_health_index
     <where>
-        STATION IS NOT NULL
-        AND STATION != ''
+        ANALYSIS_OBJ_TYPE = '设备'
         AND ANALYSIS_TYPE = '按天'
         AND DATE_FORMAT( REC_DATE, "%Y-%m-%d" ) = CURRENT_DATE
         <if test="subarray != null and subarray != ''">
@@ -555,8 +553,7 @@
     FROM
     idx_biz_pv_health_index
     <where>
-        STATION IS NOT NULL
-        AND STATION != ''
+        ANALYSIS_OBJ_TYPE = '测点'
         AND ANALYSIS_TYPE = '按天'
         AND DATE_FORMAT( REC_DATE, "%Y-%m-%d" ) = CURRENT_DATE
         AND POINT_NAME IS NOT NULL
@@ -616,7 +613,14 @@
             FROM
                 idx_biz_fan_point_process_variable_classification
             WHERE
-                TAG_CODE = '分析变量' UNION ALL
+                TAG_CODE = '分析变量'
+                AND ARAE is not null
+                AND STATION is not null
+                AND EQUIPMENT_NAME is not null
+                AND SUB_SYSTEM is not null
+                AND POINT_NAME is not null
+                AND INDEX_ADDRESS is not null
+            UNION ALL
             SELECT
                 ARAE AS area,
                 STATION AS station,
@@ -628,6 +632,12 @@
                 idx_biz_pv_point_process_variable_classification
             WHERE
                 TAG_CODE = '分析变量'
+              AND ARAE is not null
+              AND STATION is not null
+              AND SUBARRAY is not null
+              AND EQUIPMENT_NAME is not null
+              AND POINT_NAME is not null
+              AND INDEX_ADDRESS is not null
         ) a
     </select>
 
@@ -643,8 +653,7 @@
             FROM
                 idx_biz_fan_health_index
             WHERE
-                STATION IS NOT NULL
-              AND STATION != ''
+                ANALYSIS_OBJ_TYPE = '场站'
 		AND ANALYSIS_TYPE = '按天'
 		AND DATE_FORMAT( REC_DATE, "%Y-%m-%d" ) = CURRENT_DATE
             GROUP BY
@@ -656,8 +665,7 @@
             FROM
                 idx_biz_pv_health_index
             WHERE
-                STATION IS NOT NULL
-              AND STATION != ''
+                ANALYSIS_OBJ_TYPE = '场站'
               AND ANALYSIS_TYPE = '按天'
               AND DATE_FORMAT( REC_DATE, "%Y-%m-%d" ) = CURRENT_DATE
             GROUP BY
@@ -680,8 +688,7 @@
             FROM
                 idx_biz_fan_health_index
             WHERE
-                STATION IS NOT NULL
-              AND STATION != ''
+                ANALYSIS_OBJ_TYPE = '设备'
 		AND ANALYSIS_TYPE = '按天'
 		AND DATE_FORMAT( REC_DATE, "%Y-%m-%d" ) = CURRENT_DATE
             GROUP BY
@@ -693,8 +700,7 @@
             FROM
                 idx_biz_pv_health_index
             WHERE
-                STATION IS NOT NULL
-              AND STATION != ''
+                ANALYSIS_OBJ_TYPE = '子阵'
               AND ANALYSIS_TYPE = '按天'
               AND DATE_FORMAT( REC_DATE, "%Y-%m-%d" ) = CURRENT_DATE
             GROUP BY
@@ -718,8 +724,7 @@
             FROM
                 idx_biz_fan_health_index
             WHERE
-                STATION IS NOT NULL
-              AND STATION != ''
+                ANALYSIS_OBJ_TYPE = '子系统'
 		AND ANALYSIS_TYPE = '按天'
 		AND DATE_FORMAT( REC_DATE, "%Y-%m-%d" ) = CURRENT_DATE
             GROUP BY
@@ -731,8 +736,7 @@
             FROM
                 idx_biz_pv_health_index
             WHERE
-                STATION IS NOT NULL
-              AND STATION != ''
+                ANALYSIS_OBJ_TYPE = '设备'
               AND ANALYSIS_TYPE = '按天'
               AND DATE_FORMAT( REC_DATE, "%Y-%m-%d" ) = CURRENT_DATE
             GROUP BY
@@ -752,8 +756,7 @@
     FROM
         idx_biz_fan_health_index
     WHERE
-        STATION IS NOT NULL
-      AND STATION != ''
+        ANALYSIS_OBJ_TYPE = '测点'
 	AND ANALYSIS_TYPE = '按天'
 	AND DATE_FORMAT( REC_DATE, "%Y-%m-%d" ) = CURRENT_DATE
     GROUP BY
@@ -765,8 +768,7 @@
     FROM
         idx_biz_pv_health_index
     WHERE
-        STATION IS NOT NULL
-      AND STATION != ''
+        ANALYSIS_OBJ_TYPE = '测点'
       AND ANALYSIS_TYPE = '按天'
       AND DATE_FORMAT( REC_DATE, "%Y-%m-%d" ) = CURRENT_DATE
     GROUP BY