47c8d9f9 张雷

奥体项目接口修改

1 个父辈 d11999c3
...@@ -1398,8 +1398,9 @@ public class OlympicCenterServiceImpl implements IOlympicCenterService { ...@@ -1398,8 +1398,9 @@ public class OlympicCenterServiceImpl implements IOlympicCenterService {
1398 public Map<String, Object> getPumpRealTimeData(String sourceType, String pumpId) { 1398 public Map<String, Object> getPumpRealTimeData(String sourceType, String pumpId) {
1399 Map<String, Object> map = new HashMap<>(); 1399 Map<String, Object> map = new HashMap<>();
1400 map.put("status","变频运行"); 1400 map.put("status","变频运行");
1401 map.put("runtime","0.6563"); 1401 map.put("runtime","0");
1402 map.put("name",pumpId); 1402 map.put("name",pumpId);
1403 map.put("id",pumpId);
1403 String pgField = ""; 1404 String pgField = "";
1404 List<Map<String, Object>> statusList = new ArrayList<>(); 1405 List<Map<String, Object>> statusList = new ArrayList<>();
1405 List<WhatStructData> equipList = new ArrayList<>(); 1406 List<WhatStructData> equipList = new ArrayList<>();
...@@ -1412,7 +1413,8 @@ public class OlympicCenterServiceImpl implements IOlympicCenterService { ...@@ -1412,7 +1413,8 @@ public class OlympicCenterServiceImpl implements IOlympicCenterService {
1412 pgField = pgField +","+whatStructData.getMonitorId(); 1413 pgField = pgField +","+whatStructData.getMonitorId();
1413 if("equip_status".equals(whatStructData.getEquipType())){ 1414 if("equip_status".equals(whatStructData.getEquipType())){
1414 Map<String, Object> statusMap = new HashMap<>(); 1415 Map<String, Object> statusMap = new HashMap<>();
1415 statusMap.put("name",whatStructData.getId()); 1416 statusMap.put("name",whatStructData.getMonitorName());
1417 statusMap.put("id",whatStructData.getId());
1416 statusMap.put("monitorid",whatStructData.getMonitorId()); 1418 statusMap.put("monitorid",whatStructData.getMonitorId());
1417 statusList.add(statusMap); 1419 statusList.add(statusMap);
1418 if("0".equals(whatStructData.getMonitorZoom())){ 1420 if("0".equals(whatStructData.getMonitorZoom())){
...@@ -1420,6 +1422,7 @@ public class OlympicCenterServiceImpl implements IOlympicCenterService { ...@@ -1420,6 +1422,7 @@ public class OlympicCenterServiceImpl implements IOlympicCenterService {
1420 }else{ 1422 }else{
1421 equipMap.put("show_model", "1");//根据1个点判断状态 1423 equipMap.put("show_model", "1");//根据1个点判断状态
1422 } 1424 }
1425 map.put("name",whatStructData.getMonitorName());
1423 } 1426 }
1424 if("equip_time".equals(whatStructData.getEquipType())){ 1427 if("equip_time".equals(whatStructData.getEquipType())){
1425 equipMap.put("runtime",whatStructData.getMonitorId()); 1428 equipMap.put("runtime",whatStructData.getMonitorId());
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!