bug修改

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

@@ -4,7 +4,7 @@
 
 <select id="getHealthScoreInfo" resultType="java.math.BigDecimal">
     SELECT
-    round(avg( a.avgHealthIndex ), 2) AS healthIndex
+    CEILING(avg( a.avgHealthIndex )) AS healthIndex
     FROM
     (
     SELECT
@@ -57,7 +57,7 @@
 
     <select id="getHealthScoreInfoByStation" resultType="java.math.BigDecimal">
         SELECT
-        round(IFNULL( HEALTH_INDEX , 100 ), 2) AS healthIndex
+        CEILING(IFNULL( HEALTH_INDEX , 100 )) AS healthIndex
         FROM
         ${tableName}
         <where>
@@ -74,7 +74,7 @@
 
 <select id="getHealthListInfo" resultType="java.util.Map">
     SELECT
-        IFNULL( AVG( HEALTH_INDEX ), 100 ) AS avgHealthIndex,
+        CEILING(IFNULL( AVG( HEALTH_INDEX ), 100 )) AS avgHealthIndex,
         DATE_ADD( a.date, INTERVAL - 1 DAY ) as date
     FROM
         (
@@ -141,7 +141,8 @@
         count(1) as num
     FROM
         ${tableName} a
-        where a.DISPOSOTION_STATE == '未处置'
+        where (a.DISPOSOTION_STATE = '未处置')
+           or (a.DISPOSOTION_STATE = '已处置' and a.DISPOSOTION_DATE > DATE_ADD( now(), INTERVAL - 3 DAY ) )
     group by ARAE,
              WARNING_NAME
     </select>
@@ -190,11 +191,16 @@
                 STATION AS station,
                 WARNING_NAME AS warningName,
                 count( 1 ) AS num,
-                ( SELECT count( 1 ) FROM idx_biz_fan_warning_record wr WHERE wr.DISPOSOTION_STATE = '未处置' AND wr.STATION = STATION ) AS allNum
+                ( SELECT count( 1 ) FROM idx_biz_fan_warning_record wr WHERE
+                ((wr.DISPOSOTION_STATE = '未处置')
+                    or (wr.DISPOSOTION_STATE = '已处置' and wr.DISPOSOTION_DATE > DATE_ADD( now(), INTERVAL - 3 DAY ) ))
+                    AND wr.STATION = STATION
+                ) AS allNum
             FROM
                 idx_biz_fan_warning_record
             WHERE
-                DISPOSOTION_STATE = '未处置'
+                ((DISPOSOTION_STATE = '未处置')
+        or (DISPOSOTION_STATE = '已处置' and DISPOSOTION_DATE > DATE_ADD( now(), INTERVAL - 3 DAY ) ))
             GROUP BY
                 STATION,
                 WARNING_NAME UNION ALL
@@ -202,11 +208,16 @@
                 STATION AS station,
                 WARNING_NAME AS warningName,
                 count( 1 ) AS num,
-                ( SELECT count( 1 ) FROM idx_biz_pv_warning_record wr WHERE wr.DISPOSOTION_STATE = '未处置' AND wr.STATION = STATION ) AS allNum
+                ( SELECT count( 1 ) FROM idx_biz_pv_warning_record wr WHERE
+                    ((wr.DISPOSOTION_STATE = '未处置')
+                        or (wr.DISPOSOTION_STATE = '已处置' and wr.DISPOSOTION_DATE > DATE_ADD( now(), INTERVAL - 3 DAY ) ))
+                    AND wr.STATION = STATION
+                ) AS allNum
             FROM
                 idx_biz_pv_warning_record
             WHERE
-                DISPOSOTION_STATE = '未处置'
+                ((DISPOSOTION_STATE = '未处置')
+                    or (DISPOSOTION_STATE = '已处置' and DISPOSOTION_DATE > DATE_ADD( now(), INTERVAL - 3 DAY ) ))
             GROUP BY
                 STATION,
                 WARNING_NAME
@@ -271,8 +282,10 @@
     FROM
     idx_biz_fan_warning_record
     <where>
+        ((DISPOSOTION_STATE = '未处置')
+        or (DISPOSOTION_STATE = '已处置' and DISPOSOTION_DATE > DATE_ADD( now(), INTERVAL - 3 DAY ) ))
         <if test="stationCode != null and stationCode != ''">
-            GATEWAY_ID = #{stationCode}
+            and GATEWAY_ID = #{stationCode}
         </if>
     </where>
     UNION ALL
@@ -281,8 +294,10 @@
     FROM
     idx_biz_pv_warning_record
     <where>
+        ((DISPOSOTION_STATE = '未处置')
+        or (DISPOSOTION_STATE = '已处置' and DISPOSOTION_DATE > DATE_ADD( now(), INTERVAL - 3 DAY ) ))
         <if test="stationCode != null and stationCode != ''">
-            GATEWAY_ID = #{stationCode}
+            and GATEWAY_ID = #{stationCode}
         </if>
     </where>
     ) a
@@ -307,7 +322,8 @@
     FROM
         ${tableName} a
         <where>
-            a.DISPOSOTION_STATE = '未处置'
+            ((a.DISPOSOTION_STATE = '未处置')
+            or (a.DISPOSOTION_STATE = '已处置' and a.DISPOSOTION_DATE > DATE_ADD( now(), INTERVAL - 3 DAY ) ))
             <if test="areaCode != null and areaCode != ''">
                 and a.ARAE like concat('%', #{areaCode}, '%')
             </if>
@@ -330,7 +346,9 @@
     count( 1 ) AS num,
     ( SELECT count( 1 ) FROM idx_biz_pv_warning_record
     <where>
-        DISPOSOTION_STATE = '未处置' AND wr.POINT_NAME = POINT_NAME
+        ((DISPOSOTION_STATE = '未处置')
+        or (DISPOSOTION_STATE = '已处置' and DISPOSOTION_DATE > DATE_ADD( now(), INTERVAL - 3 DAY ) ))
+        AND wr.POINT_NAME = POINT_NAME
     <if test="areaCode != null and areaCode != ''">
         and ARAE like concat('%', #{areaCode}, '%')
     </if>
@@ -340,7 +358,8 @@
     FROM
     idx_biz_pv_warning_record wr
     <where>
-        wr.DISPOSOTION_STATE = '未处置'
+        ((wr.DISPOSOTION_STATE = '未处置')
+        or (wr.DISPOSOTION_STATE = '已处置' and wr.DISPOSOTION_DATE > DATE_ADD( now(), INTERVAL - 3 DAY ) ))
         <if test="areaCode != null and areaCode != ''">
             and wr.ARAE like concat('%', #{areaCode}, '%')
         </if>
@@ -354,7 +373,9 @@
     count( 1 ) AS num,
     ( SELECT count( 1 ) FROM idx_biz_fan_warning_record
     <where>
-    DISPOSOTION_STATE = '未处置' AND wr.POINT_NAME = POINT_NAME
+        ((DISPOSOTION_STATE = '未处置')
+        or (DISPOSOTION_STATE = '已处置' and DISPOSOTION_DATE > DATE_ADD( now(), INTERVAL - 3 DAY ) ))
+        AND wr.POINT_NAME = POINT_NAME
     <if test="areaCode != null and areaCode != ''">
         and ARAE like concat('%', #{areaCode}, '%')
     </if>
@@ -364,7 +385,8 @@
     FROM
     idx_biz_fan_warning_record wr
     <where>
-        wr.DISPOSOTION_STATE = '未处置'
+        ((wr.DISPOSOTION_STATE = '未处置')
+        or (wr.DISPOSOTION_STATE = '已处置' and wr.DISPOSOTION_DATE > DATE_ADD( now(), INTERVAL - 3 DAY ) ))
         <if test="areaCode != null and areaCode != ''">
             and wr.ARAE like concat('%', #{areaCode}, '%')
         </if>

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

@@ -38,7 +38,7 @@
                 idx_biz_fan_warning_record
         ) a
     <where>
-        ((a.disposotionState = '未处置') or (a.disposotionState = '已处置' AND DATE_FORMAT( a.disposotionDate, '%Y-%m-%d' ) = CURRENT_DATE))
+        ((a.disposotionState = '未处置') or (a.disposotionState = '已处置' AND a.disposotionDate > DATE_ADD( now(), INTERVAL - 3 DAY )))
         <if test="arae != '' and arae != null">
             AND a.arae like concat('%', #{arae}, '%')
         </if>
@@ -99,7 +99,7 @@
     idx_biz_fan_warning_record
     ) a
     <where>
-        ((a.disposotionState = '未处置') or (a.disposotionState = '已处置' AND DATE_FORMAT( a.disposotionDate, '%Y-%m-%d' ) = CURRENT_DATE))
+        ((a.disposotionState = '未处置') or (a.disposotionState = '已处置' AND a.disposotionDate > DATE_ADD( now(), INTERVAL - 3 DAY )))
         <if test="arae != '' and arae != null">
             AND a.arae like concat('%', #{arae}, '%')
         </if>