修改代码

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

@@ -180,16 +180,17 @@ public class IdxBizFanHealthIndexController extends BaseController {
 		Map<String,Object> map =new HashMap<>();
 		Map<String,Object> map1 =new HashMap<>();
 		Map<String,Object> warningNum =new HashMap<>();
-		warningNum.put("name","注意");
-		warningNum.put("value",idxBizPvWarningRecordList.stream().filter(e->e.getWarningName().equals("注意")).count());
+		Map<String,Object> pointNum =new  HashMap<>();
+
+
 
-		map.put("name","警告");
-		map.put("value",idxBizPvWarningRecordList.stream().filter(e->e.getWarningName().equals("警告")).count());
 
 		map1.put("name","危险");
 		map1.put("value",idxBizPvWarningRecordList.stream().filter(e->e.getWarningName().equals("危险")).count());
-
-		Map<String,Object> pointNum =new  HashMap<>();
+		map.put("name","警告");
+		map.put("value",idxBizPvWarningRecordList.stream().filter(e->e.getWarningName().equals("警告")).count());
+		warningNum.put("name","注意");
+		warningNum.put("value",idxBizPvWarningRecordList.stream().filter(e->e.getWarningName().equals("注意")).count());
 		pointNum.put("name","正常");
 		pointNum.put("value",total  - idxBizPvWarningRecordList.size());
 

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

@@ -173,16 +173,14 @@ public class IdxBizPvHealthIndexController extends BaseController {
 		Map<String,Object> map =new HashMap<>();
 		Map<String,Object> map1 =new HashMap<>();
 		Map<String,Object> warningNum =new HashMap<>();
-		warningNum.put("name","注意");
-		warningNum.put("value",idxBizPvWarningRecordList.stream().filter(e->e.getWarningName().equals("注意")).count());
-
-		map.put("name","警告");
-		map.put("value",idxBizPvWarningRecordList.stream().filter(e->e.getWarningName().equals("警告")).count());
+		Map<String,Object> pointNum =new  HashMap<>();
 
 		map1.put("name","危险");
 		map1.put("value",idxBizPvWarningRecordList.stream().filter(e->e.getWarningName().equals("危险")).count());
-
-		Map<String,Object> pointNum =new  HashMap<>();
+		map.put("name","警告");
+		map.put("value",idxBizPvWarningRecordList.stream().filter(e->e.getWarningName().equals("警告")).count());
+		warningNum.put("name","注意");
+		warningNum.put("value",idxBizPvWarningRecordList.stream().filter(e->e.getWarningName().equals("注意")).count());
 		pointNum.put("name","正常");
 		pointNum.put("value",total  - idxBizPvWarningRecordList.size());
 

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

@@ -954,7 +954,7 @@
                 AND  b.EQUIPMENT_NAME = #{EQUIPMENTNAME}
             </if>
         </where>
-        order by HEALTH_INDEX DESC
+        order by HEALTH_INDEX ASC
         limit ${current},${size}
     </select>
 
@@ -1069,7 +1069,7 @@
                 AND b.POINT_NAME = #{POINTNAME}
             </if>
         </where>
-        order by b.HEALTH_INDEX DESC
+        order by b.HEALTH_INDEX ASC
         limit ${current},${size}
 </select>