大屏定时任务

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

@@ -552,30 +552,30 @@ public class BscEnterpriseScreenServiceImpl extends AbstractCrudService<BscEnter
         List<Object> data1 = new ArrayList<>();
         for (int i = 0; i < 6; i++) {
             Map<String, Object> map1 = new HashMap<>();
-            map1.put("text", "DataA");
+            map1.put("name", "DataA");
             switch (i) {
                 case 0:
-                    map1.put("name", "设备状况指数");
+                    map1.put("text", "设备状况指数");
                     map1.put("value", deviceDamageRieo);
                     break;
                 case 1:
-                    map1.put("name", "执法监管安全指数");
+                    map1.put("text", "执法监管安全指数");
                     map1.put("value", rectificationRieo);
                     break;
                 case 2:
-                    map1.put("name", "历史火灾指数");
+                    map1.put("text", "历史火灾指数");
                     map1.put("value", fireRieo);
                     break;
                 case 3:
-                    map1.put("name", "隐患状况指数");
+                    map1.put("text", "隐患状况指数");
                     map1.put("value", highRiskRieo);
                     break;
                 case 4:
-                    map1.put("name", "建筑整体风险指");
+                    map1.put("text", "建筑整体风险指");
                     map1.put("value", buildTypeRieo);
                     break;
                 case 5:
-                    map1.put("name", "场所行业风险指数");
+                    map1.put("text", "场所行业风险指数");
                     map1.put("value", highRiskRieo);
                     break;
             }
@@ -661,47 +661,47 @@ public class BscEnterpriseScreenServiceImpl extends AbstractCrudService<BscEnter
                 seriesDataList3.add(undetectedCount);
             }
         }
-        List<String> categories = new ArrayList<>();
-        categories.add("合格数");
-        categories.add("漏检数");
 
-        List<Object> series = new ArrayList<>();
+        List<Object> data1 = new ArrayList<>();
         Map<String, Object> map1 = new HashMap<>();
-        map1.put("name", "数据");
-        map1.put("data", seriesDataList1);
-        series.add(map1);
-        Map<String, Object> data1Data = new HashMap<>();
-        data1Data.put("categories", categories);
-        data1Data.put("series", series);
-        Map<String, Object> map4 = new HashMap<>();
-        map4.put("data", data1Data);
-
-        List<Object> series1 = new ArrayList<>();
+        map1.put("name", "合格数");
+        map1.put("value", seriesDataList1.get(0));
+        map1.put("type", "巡检");
+        data1.add(map1);
+        Map<String, Object> map1A = new HashMap<>();
+        map1A.put("name", "漏检数");
+        map1A.put("value", seriesDataList1.get(1));
+        map1A.put("type", "巡检");
+        data1.add(map1A);
+
+        List<Object> data2 = new ArrayList<>();
         Map<String, Object> map2 = new HashMap<>();
-        map2.put("name", "数据");
-        map2.put("data", seriesDataList2);
-        series1.add(map2);
-        Map<String, Object> data2Data = new HashMap<>();
-        data2Data.put("categories", categories);
-        data2Data.put("series", series1);
-        Map<String, Object> map5 = new HashMap<>();
-        map5.put("data", data2Data);
-
-        List<Object> series2 = new ArrayList<>();
+        map2.put("name", "合格数");
+        map2.put("value", seriesDataList2.get(0));
+        map2.put("type", "巡检");
+        data2.add(map2);
+        Map<String, Object> map2A = new HashMap<>();
+        map2A.put("name", "漏检数");
+        map2A.put("value", seriesDataList2.get(1));
+        map2A.put("type", "巡检");
+        data2.add(map2A);
+
+        List<Object> data3 = new ArrayList<>();
         Map<String, Object> map3 = new HashMap<>();
-        map3.put("name", "数据");
-        map3.put("data", seriesDataList3);
-        series2.add(map3);
-        Map<String, Object> data3Data = new HashMap<>();
-        data3Data.put("categories", categories);
-        data3Data.put("series", series2);
-        Map<String, Object> map6 = new HashMap<>();
-        map6.put("data", data3Data);
+        map3.put("name", "合格数");
+        map3.put("value", seriesDataList3.get(0));
+        map3.put("type", "巡检");
+        data3.add(map3);
+        Map<String, Object> map3A = new HashMap<>();
+        map3A.put("name", "漏检数");
+        map3A.put("value", seriesDataList3.get(1));
+        map3A.put("type", "巡检");
+        data3.add(map3A);
 
         Map<String, Object> map = new HashMap<>();
-        map.put("data1", map4);
-        map.put("data2", map5);
-        map.put("data3", map6);
+        map.put("data1", data1);
+        map.put("data2", data2);
+        map.put("data3", data3);
         return map;
     }