接口调整

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/controller/EquipmentController.java

@@ -116,6 +116,9 @@ public class EquipmentController extends AbstractController {
 				this.timedTask(timedTask.getId(),timedTask.getStartTime(),timedTask.getEndTime(),Constants.INT_2,1,null,"");
 			}
 		}
+
+		Map<String,Object> list = equipmentService.getList();
+		webSocket.sendAllMessage(JSONObject.toJSONString(list));
 		return R.ok();
 	}
 
@@ -323,6 +326,9 @@ public class EquipmentController extends AbstractController {
 		}
 		sysSystemParamsService.update(sysSystemParams,new LambdaQueryWrapper<SysSystemParams>()
 				.eq(SysSystemParams::getId,sysSystemParams.getId()));
+
+		Map<String,Object> list = equipmentService.getList();
+		webSocket.sendAllMessage(JSONObject.toJSONString(list));
 		return R.ok();
 	}
 

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

@@ -62,6 +62,18 @@ public class AnalysisServiceImpl implements AnalysisService {
             map.put("fan",sysSystemParams.getFan());
             //自然通风模式
             map.put("nan",sysSystemParams.getNan());
+
+            Integer t = 0;
+            if(sysSystemParams.getSun() == Constants.INT_1){
+                t = 1;
+            }else if(sysSystemParams.getFan() == Constants.INT_1){
+                t = 2;
+            }else if(sysSystemParams.getNan() == Constants.INT_1){
+                t = 3;
+            }
+            //当前模式
+            map.put("currentModel",t);
+
             //能耗
             Map<String,Object> energy = new HashMap<>();
             //当天

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

@@ -67,22 +67,35 @@ public class EquipmentServiceImpl implements EquipmentService {
         List<Map<String,Object>> snqxMaps = snqxzInfoHourService.getParamGroupByRegion(null);
         for(Map<String,Object> temp : snqxMaps ){
             if(Constants.STRING_1.equals(temp.get("region").toString())){
-                map.put("hcdtSnqx",temp);//候车大厅室内
+                //候车大厅室内
+                map.put("hcdtSnqx",temp);
             }else if(Constants.STRING_2.equals(temp.get("region").toString())){
-                map.put("bgqySnqx",temp);//办公区域室内
+                //办公区域室内
+                map.put("bgqySnqx",temp);
             }
         }
-        map.put("dlsnjList",dlsnjList);//多联室内机
-        map.put("dlswjList",dlswjList);//多联室外机
-        map.put("flrbList",flrbList);//风冷热泵机组
-        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("dlxfsnjList",dlxfsnjList);//多联新风处理机室内机
-        map.put("syBean",analysisService.getSyParam());//首页数据
+        //多联室内机
+        map.put("dlsnjList",dlsnjList);
+        //多联室外机
+        map.put("dlswjList",dlswjList);
+        //风冷热泵机组
+        map.put("flrbList",flrbList);
+        //机房空调(220V)
+        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.put("dlxfsnjList",dlxfsnjList);
+        //首页数据
+        map.put("syBean",analysisService.getSyParam());
         return map;
     }
 }