解决冲突

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/BigScreenAnalyseController.java

@@ -506,11 +506,11 @@ public class BigScreenAnalyseController extends BaseController {
             item.put("warningName", warningName);
             item.put("status", warningName);
             if ("注意".equals(warningName)) {
-                sort = 1;
+                sort = 3;
             } else if ("警告".equals(warningName)) {
                 sort = 2;
             } else if ("危险".equals(warningName)) {
-                sort = 3;
+                sort = 1;
             }
             item.put("sort", sort);
         });
@@ -606,11 +606,11 @@ public class BigScreenAnalyseController extends BaseController {
             String equipmentHealthScore = equipmentHealthIndexMap.getOrDefault(item.get("pointName"), "安全");
             int sort = 4;
             if ("注意".equals(equipmentHealthScore)) {
-                sort = 1;
+                sort = 3;
             } else if ("警告".equals(equipmentHealthScore)) {
                 sort = 2;
             } else if ("危险".equals(equipmentHealthScore)) {
-                sort = 3;
+                sort = 1;
             }
             item.put("sort", sort);
             item.put("warningName", equipmentHealthScore);

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

@@ -836,7 +836,7 @@
     <select id="queryForLeftTableList" resultType="map">
         SELECT
         b.*,
-        IFNULL( ibfhi.HEALTH_INDEX, 100 ) as HEALTH_INDEX ,
+        IFNULL(CAST(HEALTH_INDEX AS UNSIGNED), 100 ) as HEALTH_INDEX ,
         IFNULL( ibfhi.HEALTH_LEVEL, '安全' ) as HEALTH_LEVEL,
         (case ibfhi.HEALTH_LEVEL
         WHEN '危险' THEN 3
@@ -910,7 +910,8 @@
 
     <select id="queryForLeftTableListNum" resultType="map">
         SELECT
-        ibfhi.HEALTH_INDEX as value
+
+        CAST(ibfhi.HEALTH_INDEX AS UNSIGNED) as value
         FROM
         (
         SELECT
@@ -950,8 +951,8 @@
         SELECT
         POINT_NAME ,
         STATION,
-        HEALTH_INDEX,
-        HEALTH_INDEX as value,
+        CAST(HEALTH_INDEX AS UNSIGNED) as HEALTH_INDEX,
+        CAST(HEALTH_INDEX AS UNSIGNED) as value,
         HEALTH_LEVEL,
         ( CASE HEALTH_LEVEL WHEN '危险' THEN 3 WHEN '警告' THEN 2 WHEN '注意' THEN 1 ELSE 0 END ) AS status,
         SUB_SYSTEM,
@@ -1044,8 +1045,8 @@
         SELECT
         POINT_NAME ,
         STATION,
-        HEALTH_INDEX,
-        HEALTH_INDEX as value,
+        CAST(HEALTH_INDEX AS UNSIGNED) as HEALTH_INDEX,
+        CAST(HEALTH_INDEX AS UNSIGNED) as value,
         HEALTH_LEVEL,
         ( CASE HEALTH_LEVEL WHEN '危险' THEN 3 WHEN '告警' THEN 2 WHEN '注意' THEN 1 ELSE 0 END ) AS status,
         SUB_SYSTEM,
@@ -1126,8 +1127,8 @@
         SELECT
         POINT_NAME ,
         STATION,
-        HEALTH_INDEX,
-        HEALTH_INDEX as value,
+        CAST(HEALTH_INDEX AS UNSIGNED) as HEALTH_INDEX,
+        CAST(HEALTH_INDEX AS UNSIGNED) as value,
         HEALTH_LEVEL,
         ( CASE HEALTH_LEVEL WHEN '危险' THEN 3 WHEN '警告' THEN 2 WHEN '注意' THEN 1 ELSE 0 END ) AS status,
         SUB_SYSTEM,

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

@@ -9,8 +9,8 @@
         b.ARAE,
         b.STATION,
         b.EQUIPMENT_NAME,
-        b.HEALTH_INDEX,
-        b.HEALTH_INDEX as value,
+        CAST(HEALTH_INDEX AS UNSIGNED) as HEALTH_INDEX,
+        CAST(HEALTH_INDEX AS UNSIGNED) as value,
         b.HEALTH_LEVEL,
         CONCAT( '子阵 ', b.SUBARRAY ) AS 子阵,
         ( CASE b.HEALTH_LEVEL WHEN '危险' THEN 3 WHEN '警告' THEN 2 WHEN '注意' THEN 1 ELSE 0 END ) AS status,
@@ -41,7 +41,7 @@
     <select id="queryForLeftTableListByEquipNum"
             resultType="map">
         SELECT
-        b.HEALTH_INDEX as value
+        CAST(  b.HEALTH_INDEX AS UNSIGNED) as value
         FROM
         `idx_biz_pv_health_index` b
         WHERE
@@ -96,8 +96,8 @@
         SELECT
         POINT_NAME ,
         STATION,
-        HEALTH_INDEX,
-        HEALTH_INDEX as value,
+        CAST(HEALTH_INDEX AS UNSIGNED) as HEALTH_INDEX,
+        CAST(HEALTH_INDEX AS UNSIGNED) as value,
         HEALTH_LEVEL,
         ( CASE HEALTH_LEVEL WHEN '危险' THEN 3 WHEN '警告' THEN 2 WHEN '注意' THEN 1 ELSE 0 END ) AS status,
         SUBARRAY,
@@ -191,14 +191,14 @@
     <select id="queryForLeftTableListByPointNum"
             resultType="map">
         SELECT
-        HEALTH_INDEX as value
+        CAST(HEALTH_INDEX AS UNSIGNED) as value
         FROM
         (
         SELECT
         POINT_NAME ,
         STATION,
-        HEALTH_INDEX,
-        HEALTH_INDEX as value,
+        CAST(HEALTH_INDEX AS UNSIGNED) as HEALTH_INDEX,
+        CAST(HEALTH_INDEX AS UNSIGNED) as value
         HEALTH_LEVEL,
         SUBARRAY,
         REC_DATE,
@@ -284,8 +284,8 @@
         SELECT
         POINT_NAME,
         STATION,
-        HEALTH_INDEX,
-        HEALTH_INDEX AS VALUE,
+        CAST(HEALTH_INDEX AS UNSIGNED) as HEALTH_INDEX,
+        CAST(HEALTH_INDEX AS UNSIGNED) as value,
         HEALTH_LEVEL,
         ( CASE HEALTH_LEVEL WHEN '危险' THEN 3 WHEN '警告' THEN 2 WHEN '注意' THEN 1 ELSE 0 END ) AS STATUS,
         SUBARRAY,