bug修改

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

@@ -749,7 +749,7 @@
         SELECT a.*,
                row_number() over ( ORDER BY pointName ) AS id
         FROM (
-                 SELECT ARAE           AS area,
+                 (SELECT ARAE           AS area,
                         STATION        AS station,
                         EQUIPMENT_NAME AS equipmentName,
                         SUB_SYSTEM     AS subSystem,
@@ -763,8 +763,9 @@
                    AND SUB_SYSTEM is not null
                    AND POINT_NAME is not null
                    AND INDEX_ADDRESS is not null
+                     order by KKS ASC)
                  UNION ALL
-                 SELECT ARAE           AS area,
+                 (SELECT ARAE           AS area,
                         STATION        AS station,
                         SUBARRAY       AS equipmentName,
                         EQUIPMENT_NAME AS subSystem,
@@ -778,6 +779,7 @@
                    AND EQUIPMENT_NAME is not null
                    AND POINT_NAME is not null
                    AND INDEX_ADDRESS is not null
+                     order by KKS ASC)
              ) a
     </select>
 

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

@@ -9,7 +9,7 @@
     values
     <foreach collection="list" separator="," item="item" index="index">
         (
-        now + #{index},
+        now,
         #{item.recDate, jdbcType=VARCHAR},
         #{item.analysisObjType, jdbcType=VARCHAR},
         #{item.analysisObjSeq, jdbcType=VARCHAR},

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

@@ -42,7 +42,7 @@
         values
         <foreach collection="list" separator="," item="item" index="index">
             (
-            now + #{index},
+            now,
             #{item.recDate, jdbcType=VARCHAR},
             #{item.analysisObjType, jdbcType=VARCHAR},
             #{item.analysisObjSeq, jdbcType=VARCHAR},