Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

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

@@ -275,20 +275,35 @@ public class BigScreenAnalyseController extends BaseController {
             stationCode = stationBasic.getBoosterGatewayId();
         }
         List<Map<String, Object>> list = idxBizFanHealthIndexMapper.equipWarningRadarMap(stationCode);
-        HashMap<String, Object> resultMap = new HashMap<>();
-        List<List<String>> resultData = new ArrayList<>();
+        Map<String, Integer> warningNumMap = list.stream().collect(Collectors.toMap(t -> t.get("warningName").toString(), t -> Integer.parseInt(t.get("num").toString())));
+        List<String> warningList = Arrays.asList("危险", "注意", "警告");
+        List<Integer> data = new ArrayList<>();
+
+        List<List<Integer>> resultData = new ArrayList<>();
+
         List<Map<String, Object>> resultList = new ArrayList<>();
-        List<String> data = new ArrayList<>();
-        list.forEach(item -> {
+        warningList.forEach(item -> {
             HashMap<String, Object> map = new HashMap<>();
-            map.put("text", item.get("warningName"));
+            map.put("text", item);
             resultList.add(map);
-            data.add(item.get("num").toString());
+            data.add(warningNumMap.getOrDefault(item, 0));
         });
         resultData.add(data);
+
+        HashMap<String, Object> resultMap = new HashMap<>();
         resultMap.put("radar", resultList);
         resultMap.put("array", resultData);
         return ResponseHelper.buildResponse(resultMap);
+
+//        HashMap<String, Object> resultMap = new HashMap<>();
+//        List<String> data = new ArrayList<>();
+//        list.forEach(item -> {
+//            HashMap<String, Object> map = new HashMap<>();
+//            map.put("text", item.get("warningName"));
+//            resultList.add(map);
+//            data.add(item.get("num").toString());
+//        });
+//
     }