奥体项目接口修改

张雷
fm-product/src/main/java/com/skua/modules/business/service/impl/OlympicCenterServiceImpl.java
--- a/fm-product/src/main/java/com/skua/modules/business/service/impl/OlympicCenterServiceImpl.java
查看文件 @b3aadc7
+++ b/fm-product/src/main/java/com/skua/modules/business/service/impl/OlympicCenterServiceImpl.java
查看文件 @b3aadc7
@@ -1165,12 +1165,20 @@ public class OlympicCenterServiceImpl implements IOlympicCenterService {
                                if(alarmMap.get(bean.getMonitorId())==null){
                                    dataMap.put("status","normal");
                                }else{
+                                    if(whatStructData.getDelFlag()==1){
+                                        dataMap.put("status","normal");
+                                    }else{
                                        dataMap.put("status","abnormal");
                                    }
+                                }
                                beanMap.put(bean.getEquipType(), dataMap);
                            }else{
                                dataMap.put("value","--");
+                                if(whatStructData.getDelFlag()==1){
+                                    dataMap.put("status","normal");
+                                }else{
                                    dataMap.put("status","abnormal");
+                                }
                                beanMap.put(bean.getEquipType(), dataMap);
                            }
                        }
@@ -1180,7 +1188,11 @@ public class OlympicCenterServiceImpl implements IOlympicCenterService {
                    Map<String, Object> kMap = new HashMap<>();
                    Map<String, Object> dataMap = new HashMap<>();
                    dataMap.put("value","--");
+                    if(whatStructData.getDelFlag()==1){
+                        dataMap.put("status","normal");
+                    }else{
                        dataMap.put("status","abnormal");
+                    }
                    if("F0001".equals(whatStructData.getId())){
                        dataMap.put("status","normal");
                    }
@@ -1197,6 +1209,11 @@ public class OlympicCenterServiceImpl implements IOlympicCenterService {
                    dataMap.put("status","abnormal");
                    if("pressure".equals(whatStructData.getEquipType())){
                        if(monitorMap.get(whatStructData.getMonitorId())==null){
+                            if(whatStructData.getDelFlag()==1){
+                                dataMap.put("status","normal");
+                            }else{
+                                dataMap.put("status","abnormal");
+                            }
                            map.put(whatStructData.getId(),dataMap);
                        }else{
                            double pResult = formatDouble(Double.parseDouble(monitorMap.get(whatStructData.getMonitorId()).toString())*Double.parseDouble(whatStructData.getMonitorZoom()));
@@ -1204,8 +1221,12 @@ public class OlympicCenterServiceImpl implements IOlympicCenterService {
                            if(alarmMap.get(whatStructData.getMonitorId())==null){
                                dataMap.put("status","normal");
                            }else{
+                                if(whatStructData.getDelFlag()==1){
+                                    dataMap.put("status","normal");
+                                }else{
                                    dataMap.put("status","abnormal");
                                }
+                            }
                            map.put(whatStructData.getId(),dataMap);
                        }
                    }else{
@@ -1213,14 +1234,22 @@ public class OlympicCenterServiceImpl implements IOlympicCenterService {
                        if(alarmMap.get(whatStructData.getMonitorId())==null){
                            dataMap.put("status","normal");
                        }else{
+                            if(whatStructData.getDelFlag()==1){
+                                dataMap.put("status","normal");
+                            }else{
                                dataMap.put("status","abnormal");
                            }
+                        }
                        map.put(whatStructData.getId(),dataMap);
                    }
                }else{
                    Map<String, Object> dataMap = new HashMap<>();
                    dataMap.put("value","--");
+                    if(whatStructData.getDelFlag()==1){
+                        dataMap.put("status","normal");
+                    }else{
                        dataMap.put("status","abnormal");
+                    }
                    if("P0001".equals(whatStructData.getId())){
                        dataMap.put("status","normal");
                    }