tj

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/impl/AnalysisServiceImpl.java

@@ -50,6 +50,9 @@ public class AnalysisServiceImpl implements AnalysisService {
             List<Integer> timeList = new ArrayList<>();
             timeList.add(dayTime);
             timeList.add(hourTime);
+
+            //人工/节能模式
+            map.put("type",sysSystemParams.getType());
             //系统运行时间
             map.put("systemRunningTime",timeList);
             //报警总数

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/impl/EquipmentServiceImpl.java

@@ -34,6 +34,8 @@ public class EquipmentServiceImpl implements EquipmentService {
     private SnqxzInfoService snqxzInfoService;
     @Autowired
     private SwqxzInfoService swqxzInfoService;
+    @Autowired
+    private AnalysisService analysisService;
 
     @Override
     public Map<String, Object> getList() {
@@ -62,16 +64,29 @@ public class EquipmentServiceImpl implements EquipmentService {
         //室外气象站
         List<Map<String,Object>> swqxzList = swqxzInfoService.getList();
 
-        map.put("dlsnjList",dlsnjList);
-        map.put("dlswjList",dlswjList);
-        map.put("flrbList",flrbList);
-        map.put("jfktgList",jfktgList);
-        map.put("jfktpList",jfktpList);
-        map.put("pfjList",pfjList);
-        map.put("sbList",sbList);
-        map.put("sljfgList",sljfgList);
-        map.put("snqxzList",snqxzList);
-        map.put("swqxzList",swqxzList);
+        Map<String,Object> map1 = new HashMap<String,Object>(16);
+        map1.put("temperature",17);
+        map1.put("humidity",25);
+        map1.put("carbonDioxide",22);
+
+        Map<String,Object> map2 = new HashMap<String,Object>(16);
+        map2.put("temperature",23);
+        map2.put("humidity",21);
+        map2.put("carbonDioxide",17);
+
+        map.put("dlsnjList",dlsnjList);//多联室内机
+        map.put("dlswjList",dlswjList);//多联室外机
+        map.put("flrbList",flrbList);//风冷热泵机组
+        map.put("jfktgList",jfktgList);//机房空调(380V)
+        map.put("jfktpList",jfktpList); //机房空调(220V)
+        map.put("pfjList",pfjList);//排风机
+        map.put("sbList",sbList);//水泵
+        map.put("sljfgList",sljfgList);//室内机风柜
+        map.put("snqxzList",snqxzList);//室内气象站
+        map.put("swqxzList",swqxzList);//室外气象站
+        map.put("syBean",analysisService.getSyParam());//首页数据
+        map.put("bgqySnqx",map1);//办公区域室内
+        map.put("hcdtSnqx",map2);//候车大厅室内
 
 //        list.addAll(dlsnjList);
 //        list.addAll(flrbList);