修改分析适配

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

@@ -62,7 +62,7 @@
 			<if test="analysisType == '按天' or analysisType == null or analysisType == ''">
                 AND ANALYSIS_TYPE = '按天'
                 <!-- AND DATE_FORMAT(REC_DATE, '%Y-%m-%d') =  CURDATE() - INTERVAL 1 DAY -->
-                AND DATE_FORMAT(REC_DATE, '%Y-%m-%d') =  get_time_sub(1,'DAY') 
+              
             </if>
 			<if test="analysisType == '按小时'">
                 AND ANALYSIS_TYPE = '按小时'
@@ -257,7 +257,6 @@
               AND ANALYSIS_TYPE = '按10分钟'
               <!--AND DATE_FORMAT(REC_DATE, '%Y-%m-%d') = CURRENT_DATE - INTERVAL 1 DAY-->
               <!--AND DATE_FORMAT(REC_DATE, '%Y-%m-%d') = get_time_sub(1,'DAY')-->
-              AND REC_DATE >= get_time_sub(9,'MINUTE')
         GROUP BY ARAE
   )
 ) a
@@ -337,7 +336,6 @@ FROM (
             AND ANALYSIS_TYPE = '按10分钟'
             <!--AND DATE_FORMAT( REC_DATE, '%Y-%m-%d' ) = CURRENT_DATE - INTERVAL  1 DAY-->
             <!--AND DATE_FORMAT( REC_DATE, '%Y-%m-%d' ) = get_time_sub(1,'DAY')-->
-            AND REC_DATE >= get_time_sub(9,'MINUTE')
 			<if test="areaCode != null and areaCode != ''">
                 AND ARAE like concat('%', #{areaCode}, '%')
             </if>
@@ -494,7 +492,6 @@ FROM (
             AND ANALYSIS_TYPE = '按10分钟'
             <!--AND DATE_FORMAT( REC_DATE, '%Y-%m-%d' ) = CURRENT_DATE - INTERVAL  1  DAY-->
             <!--AND DATE_FORMAT( REC_DATE, '%Y-%m-%d' ) = get_time_sub(1,'DAY')-->
-            AND REC_DATE >= get_time_sub(9,'MINUTE')
 			<if test="equipmentName != null and equipmentName != ''">
                 AND EQUIPMENT_NAME like concat( '%', #{equipmentName} ,'风机')
             </if>
@@ -532,7 +529,6 @@ FROM (
 			ANALYSIS_OBJ_TYPE = '设备'
             AND ANALYSIS_TYPE = '按10分钟'
             <!--AND DATE_FORMAT( REC_DATE, '%Y-%m-%d' ) = CURRENT_DATE - INTERVAL  1  DAY-->
-            AND DATE_FORMAT( REC_DATE, '%Y-%m-%d' ) = get_time_sub(1,'DAY')
 			<if test="gatewayId != null and gatewayId != ''">
                 AND GATEWAY_ID = #{gatewayId}
             </if>
@@ -643,7 +639,7 @@ FROM (
 	</select>
 	<select id="getPvHealthInfoList" resultType="java.util.Map">
 		SELECT
-        IFNULL( round(AVG( HEALTH_INDEX ), 2), 0 ) AS avgHealthIndex,
+        IFNULL ( ROUND( MAX(HEALTH_INDEX), 2 ), 0 ) AS avgHealthIndex,
         SUBARRAY as subarray
         FROM
         pv_health_index_latest_data
@@ -651,7 +647,6 @@ FROM (
 			ANALYSIS_OBJ_TYPE = '子阵'
             AND ANALYSIS_TYPE = '按10分钟'
             <!--AND DATE_FORMAT( REC_DATE, '%Y-%m-%d' ) = CURRENT_DATE - INTERVAL 1 DAY-->
-            AND DATE_FORMAT( REC_DATE, '%Y-%m-%d' ) = get_time_sub(1,'DAY')
 			<if test="gatewayId != null and gatewayId != ''">
                 AND GATEWAY_ID = #{gatewayId}
             </if>
@@ -661,6 +656,8 @@ FROM (
 	</select>
 	<select id="getPvSubSystemInfo" resultType="java.util.Map">
 		SELECT
+        IFNULL ( ROUND( MAX(HEALTH_INDEX), 2 ), 100 ) AS avgHealthIndex
+
         round(IFNULL( AVG( HEALTH_INDEX ), 100 ), 1) AS avgHealthIndex,
         EQUIPMENT_NAME AS equipmentName
         FROM
@@ -670,7 +667,6 @@ FROM (
             AND ANALYSIS_TYPE = '按10分钟'
             <!--AND DATE_FORMAT( REC_DATE, '%Y-%m-%d' ) = CURRENT_DATE - INTERVAL 1 DAY-->
             <!--AND DATE_FORMAT( REC_DATE, '%Y-%m-%d' ) = get_time_sub(1,'DAY')-->
-            AND REC_DATE >= get_time_sub(9,'MINUTE')
         <if test="subarray != null and subarray != ''">
             AND SUBARRAY = concat('#', #{subarray})
         </if>
@@ -701,7 +697,7 @@ FROM (
 </select>
 <select id="getPvHealthInfoBySubSystem" resultType="java.util.Map">
     SELECT
-    IFNULL(HEALTH_INDEX, 100) AS healthIndex,
+    MAX(IFNULL(HEALTH_INDEX, 100)) AS healthIndex,
     POINT_NAME AS pointName
     FROM
     pv_health_index_latest_data
@@ -1692,7 +1688,6 @@ FROM (
             ANALYSIS_TYPE = '按10分钟'
             <!--AND DATE_FORMAT( REC_DATE, '%Y-%m-%d' ) = CURDATE() - INTERVAL 1 DAY-->
             <!--AND DATE_FORMAT( REC_DATE, '%Y-%m-%d' ) = get_time_sub(1,'DAY') -->
-            AND REC_DATE >= get_time_sub(9,'MINUTE')
 			<if test="areaCode != null and areaCode != ''">
                 AND ARAE like concat('%', #{areaCode}, '%')
                 AND ANALYSIS_OBJ_TYPE = '片区'
@@ -1715,7 +1710,6 @@ FROM (
             ANALYSIS_TYPE = '按10分钟'
             <!-- AND DATE_FORMAT( REC_DATE, '%Y-%m-%d' ) = CURDATE() - INTERVAL 1 DAY-->
             <!--AND DATE_FORMAT( REC_DATE, '%Y-%m-%d' ) = get_time_sub(1,'DAY')-->
-            AND REC_DATE >= get_time_sub(9,'MINUTE')
     <if test="areaCode != null and areaCode != ''">
         AND ARAE like concat('%', #{areaCode}, '%')
         AND ANALYSIS_OBJ_TYPE = '片区'