大屏定时

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/BscEnterpriseScreenServiceImpl.java

@@ -414,60 +414,57 @@ public class BscEnterpriseScreenServiceImpl extends AbstractCrudService<BscEnter
         Map<String, Object> map1 = new HashMap<>();
         map1.put("value", count);
         List<Object> data1 = new ArrayList<>();
-        for (int i = 0; i < 3; i++) {
-            List<Object> data = new ArrayList<>();
+        for (int i = 0; i < 6; i++) {
             Map<String, Object> map3 = new HashMap<>();
-            String find = "count";
-            if (i == 0) {
-                map3.put("seriesName", "总数");
-                map3.put("type", "bar");
-            } else if (i == 1) {
-                map3.put("seriesName", "已处理");
-                map3.put("type", "bar");
-                find = "processed";
-            } else if (i == 2) {
-                map3.put("seriesName", "待处理");
-                map3.put("type", "line");
-                find = "untreated";
-            }
-            for (int j = 0; j < 6; j++) {
-                Map<String, Object> map2 = new HashMap<>();
-                switch (j) {
-                    case 0:
-                        map2.put("name", "火灾");
-                        map2.put("value", Integer.parseInt(fireData.get(find).toString()));
-                        break;
-                    case 1:
-                        map2.put("name", "电器火灾");
-                        map2.put("value", Integer.parseInt(electricalFireData.get(find).toString()));
-                        break;
-                    case 2:
-                        map2.put("name", "视频监控");
-                        map2.put("value", Integer.parseInt(videoData.get(find).toString()));
-                        break;
-                    case 3:
-                        map2.put("name", "自动喷水灭火");
-                        map2.put("value", Integer.parseInt(sprayWaterData.get(find).toString()));
-                        break;
-                    case 4:
-                        map2.put("name", "消防给水及消火栓");
-                        map2.put("value", Integer.parseInt(hydrantWaterData.get(find).toString()));
-                        break;
-                    case 5:
-                        map2.put("name", "防排烟");
-                        map2.put("value", Integer.parseInt(smokeControlData.get(find).toString()));
-                        break;
-                }
-                data.add(map2);
+            Map<String, Object> map4 = new HashMap<>();
+            switch (i) {
+                case 0:
+                    map3.put("name", "火灾");
+                    map3.put("value", Integer.parseInt(fireData.get("processed").toString()));
+                    map4.put("name", "火灾");
+                    map4.put("value", Integer.parseInt(fireData.get("untreated").toString()));
+                    break;
+                case 1:
+                    map3.put("name", "电器火灾");
+                    map3.put("value", Integer.parseInt(electricalFireData.get("processed").toString()));
+                    map4.put("name", "电器火灾");
+                    map4.put("value", Integer.parseInt(electricalFireData.get("untreated").toString()));
+                    break;
+                case 2:
+                    map3.put("name", "视频监控");
+                    map3.put("value", Integer.parseInt(videoData.get("processed").toString()));
+                    map4.put("name", "视频监控");
+                    map4.put("value", Integer.parseInt(videoData.get("untreated").toString()));
+                    break;
+                case 3:
+                    map3.put("name", "自动喷水灭火");
+                    map3.put("value", Integer.parseInt(sprayWaterData.get("processed").toString()));
+                    map4.put("name", "自动喷水灭火");
+                    map4.put("value", Integer.parseInt(sprayWaterData.get("untreated").toString()));
+                    break;
+                case 4:
+                    map3.put("name", "消防给水及消火栓");
+                    map3.put("value", Integer.parseInt(hydrantWaterData.get("processed").toString()));
+                    map4.put("name", "消防给水及消火栓");
+                    map4.put("value", Integer.parseInt(hydrantWaterData.get("untreated").toString()));
+                    break;
+                case 5:
+                    map3.put("name", "防排烟");
+                    map3.put("value", Integer.parseInt(smokeControlData.get("processed").toString()));
+                    map4.put("name", "防排烟");
+                    map4.put("value", Integer.parseInt(smokeControlData.get("untreated").toString()));
+                    break;
             }
-            map3.put("data", data);
+            map3.put("series","已处置");
+            map3.put("type","bar");
+            map4.put("series","未处置");
+            map4.put("type","bar");
             data1.add(map3);
+            data1.add(map4);
         }
-        Map<String, Object> map4 = new HashMap<>();
-        map4.put("data", data1);
         Map<String, Object> map = new HashMap<>();
         map.put("data1", map1);
-        map.put("data2", map4);
+        map.put("data2", data1);
         return map;
     }