奥体项目接口修改
正在显示
1 个修改的文件
包含
35 行增加
和
6 行删除
| ... | @@ -1165,12 +1165,20 @@ public class OlympicCenterServiceImpl implements IOlympicCenterService { | ... | @@ -1165,12 +1165,20 @@ public class OlympicCenterServiceImpl implements IOlympicCenterService { |
| 1165 | if(alarmMap.get(bean.getMonitorId())==null){ | 1165 | if(alarmMap.get(bean.getMonitorId())==null){ |
| 1166 | dataMap.put("status","normal"); | 1166 | dataMap.put("status","normal"); |
| 1167 | }else{ | 1167 | }else{ |
| 1168 | dataMap.put("status","abnormal"); | 1168 | if(whatStructData.getDelFlag()==1){ |
| 1169 | dataMap.put("status","normal"); | ||
| 1170 | }else{ | ||
| 1171 | dataMap.put("status","abnormal"); | ||
| 1172 | } | ||
| 1169 | } | 1173 | } |
| 1170 | beanMap.put(bean.getEquipType(), dataMap); | 1174 | beanMap.put(bean.getEquipType(), dataMap); |
| 1171 | }else{ | 1175 | }else{ |
| 1172 | dataMap.put("value","--"); | 1176 | dataMap.put("value","--"); |
| 1173 | dataMap.put("status","abnormal"); | 1177 | if(whatStructData.getDelFlag()==1){ |
| 1178 | dataMap.put("status","normal"); | ||
| 1179 | }else{ | ||
| 1180 | dataMap.put("status","abnormal"); | ||
| 1181 | } | ||
| 1174 | beanMap.put(bean.getEquipType(), dataMap); | 1182 | beanMap.put(bean.getEquipType(), dataMap); |
| 1175 | } | 1183 | } |
| 1176 | } | 1184 | } |
| ... | @@ -1180,7 +1188,11 @@ public class OlympicCenterServiceImpl implements IOlympicCenterService { | ... | @@ -1180,7 +1188,11 @@ public class OlympicCenterServiceImpl implements IOlympicCenterService { |
| 1180 | Map<String, Object> kMap = new HashMap<>(); | 1188 | Map<String, Object> kMap = new HashMap<>(); |
| 1181 | Map<String, Object> dataMap = new HashMap<>(); | 1189 | Map<String, Object> dataMap = new HashMap<>(); |
| 1182 | dataMap.put("value","--"); | 1190 | dataMap.put("value","--"); |
| 1183 | dataMap.put("status","abnormal"); | 1191 | if(whatStructData.getDelFlag()==1){ |
| 1192 | dataMap.put("status","normal"); | ||
| 1193 | }else{ | ||
| 1194 | dataMap.put("status","abnormal"); | ||
| 1195 | } | ||
| 1184 | if("F0001".equals(whatStructData.getId())){ | 1196 | if("F0001".equals(whatStructData.getId())){ |
| 1185 | dataMap.put("status","normal"); | 1197 | dataMap.put("status","normal"); |
| 1186 | } | 1198 | } |
| ... | @@ -1197,6 +1209,11 @@ public class OlympicCenterServiceImpl implements IOlympicCenterService { | ... | @@ -1197,6 +1209,11 @@ public class OlympicCenterServiceImpl implements IOlympicCenterService { |
| 1197 | dataMap.put("status","abnormal"); | 1209 | dataMap.put("status","abnormal"); |
| 1198 | if("pressure".equals(whatStructData.getEquipType())){ | 1210 | if("pressure".equals(whatStructData.getEquipType())){ |
| 1199 | if(monitorMap.get(whatStructData.getMonitorId())==null){ | 1211 | if(monitorMap.get(whatStructData.getMonitorId())==null){ |
| 1212 | if(whatStructData.getDelFlag()==1){ | ||
| 1213 | dataMap.put("status","normal"); | ||
| 1214 | }else{ | ||
| 1215 | dataMap.put("status","abnormal"); | ||
| 1216 | } | ||
| 1200 | map.put(whatStructData.getId(),dataMap); | 1217 | map.put(whatStructData.getId(),dataMap); |
| 1201 | }else{ | 1218 | }else{ |
| 1202 | double pResult = formatDouble(Double.parseDouble(monitorMap.get(whatStructData.getMonitorId()).toString())*Double.parseDouble(whatStructData.getMonitorZoom())); | 1219 | double pResult = formatDouble(Double.parseDouble(monitorMap.get(whatStructData.getMonitorId()).toString())*Double.parseDouble(whatStructData.getMonitorZoom())); |
| ... | @@ -1204,7 +1221,11 @@ public class OlympicCenterServiceImpl implements IOlympicCenterService { | ... | @@ -1204,7 +1221,11 @@ public class OlympicCenterServiceImpl implements IOlympicCenterService { |
| 1204 | if(alarmMap.get(whatStructData.getMonitorId())==null){ | 1221 | if(alarmMap.get(whatStructData.getMonitorId())==null){ |
| 1205 | dataMap.put("status","normal"); | 1222 | dataMap.put("status","normal"); |
| 1206 | }else{ | 1223 | }else{ |
| 1207 | dataMap.put("status","abnormal"); | 1224 | if(whatStructData.getDelFlag()==1){ |
| 1225 | dataMap.put("status","normal"); | ||
| 1226 | }else{ | ||
| 1227 | dataMap.put("status","abnormal"); | ||
| 1228 | } | ||
| 1208 | } | 1229 | } |
| 1209 | map.put(whatStructData.getId(),dataMap); | 1230 | map.put(whatStructData.getId(),dataMap); |
| 1210 | } | 1231 | } |
| ... | @@ -1213,14 +1234,22 @@ public class OlympicCenterServiceImpl implements IOlympicCenterService { | ... | @@ -1213,14 +1234,22 @@ public class OlympicCenterServiceImpl implements IOlympicCenterService { |
| 1213 | if(alarmMap.get(whatStructData.getMonitorId())==null){ | 1234 | if(alarmMap.get(whatStructData.getMonitorId())==null){ |
| 1214 | dataMap.put("status","normal"); | 1235 | dataMap.put("status","normal"); |
| 1215 | }else{ | 1236 | }else{ |
| 1216 | dataMap.put("status","abnormal"); | 1237 | if(whatStructData.getDelFlag()==1){ |
| 1238 | dataMap.put("status","normal"); | ||
| 1239 | }else{ | ||
| 1240 | dataMap.put("status","abnormal"); | ||
| 1241 | } | ||
| 1217 | } | 1242 | } |
| 1218 | map.put(whatStructData.getId(),dataMap); | 1243 | map.put(whatStructData.getId(),dataMap); |
| 1219 | } | 1244 | } |
| 1220 | }else{ | 1245 | }else{ |
| 1221 | Map<String, Object> dataMap = new HashMap<>(); | 1246 | Map<String, Object> dataMap = new HashMap<>(); |
| 1222 | dataMap.put("value","--"); | 1247 | dataMap.put("value","--"); |
| 1223 | dataMap.put("status","abnormal"); | 1248 | if(whatStructData.getDelFlag()==1){ |
| 1249 | dataMap.put("status","normal"); | ||
| 1250 | }else{ | ||
| 1251 | dataMap.put("status","abnormal"); | ||
| 1252 | } | ||
| 1224 | if("P0001".equals(whatStructData.getId())){ | 1253 | if("P0001".equals(whatStructData.getId())){ |
| 1225 | dataMap.put("status","normal"); | 1254 | dataMap.put("status","normal"); |
| 1226 | } | 1255 | } | ... | ... |
-
请 注册 或 登录 后发表评论