奥体项目接口修改

@@ -38,6 +38,9 @@ public class WhatStructData {
 	/**点表ID*/
 	/**点表ID*/
 	@ApiModelProperty(value = "点表ID")
 	@ApiModelProperty(value = "点表ID")
 	private String monitorId;
 	private String monitorId;
+	/**点名称*/
+	@ApiModelProperty(value = "点名称")
+	private String monitorName;
 	/**点类型*/
 	/**点类型*/
 	@ApiModelProperty(value = "点类型")
 	@ApiModelProperty(value = "点类型")
 	private String monitorType;
 	private String monitorType;

@@ -1339,7 +1339,7 @@ public class OlympicCenterServiceImpl implements IOlympicCenterService {
             for (WhatStructData whatStructData:flowList) {
             for (WhatStructData whatStructData:flowList) {
                 Map<String, Object> map = new HashMap<>();
                 Map<String, Object> map = new HashMap<>();
                 map.put("id",whatStructData.getId());
                 map.put("id",whatStructData.getId());
-                map.put("name",whatStructData.getId());
+                map.put("name",whatStructData.getMonitorName());
                 map.put("time","");
                 map.put("time","");
                 map.put("flow","");
                 map.put("flow","");
                 map.put("flow_ljll","");
                 map.put("flow_ljll","");
@@ -1364,7 +1364,7 @@ public class OlympicCenterServiceImpl implements IOlympicCenterService {
             for (WhatStructData whatStructData:wList) {
             for (WhatStructData whatStructData:wList) {
                 Map<String, Object> map = new HashMap<>();
                 Map<String, Object> map = new HashMap<>();
                 map.put("id",whatStructData.getId());
                 map.put("id",whatStructData.getId());
-                map.put("name",whatStructData.getId());
+                map.put("name",whatStructData.getMonitorName());
                 map.put("time","");
                 map.put("time","");
                 map.put("value","");
                 map.put("value","");
                 for (Map<String, Object> mMap : monitorList ) {
                 for (Map<String, Object> mMap : monitorList ) {
@@ -1383,7 +1383,7 @@ public class OlympicCenterServiceImpl implements IOlympicCenterService {
             for (WhatStructData whatStructData:wList) {
             for (WhatStructData whatStructData:wList) {
                 Map<String, Object> map = new HashMap<>();
                 Map<String, Object> map = new HashMap<>();
                 map.put("id",whatStructData.getId());
                 map.put("id",whatStructData.getId());
-                map.put("name",whatStructData.getId());
+                map.put("name",whatStructData.getMonitorName());
                 map.put("time","");
                 map.put("time","");
                 map.put("value","");
                 map.put("value","");
                 list.add(map);
                 list.add(map);
@@ -1472,12 +1472,13 @@ public class OlympicCenterServiceImpl implements IOlympicCenterService {
             List<Map<String, Object>> list1 = new ArrayList<>();
             List<Map<String, Object>> list1 = new ArrayList<>();
             Map<String, Object> map = new HashMap<>();
             Map<String, Object> map = new HashMap<>();
             map.put("id",whatStructData.getEquipCode());
             map.put("id",whatStructData.getEquipCode());
-            map.put("name",whatStructData.getEquipCode());
+            map.put("name",whatStructData.getMonitorName());
             String equipCode = whatStructData.getEquipCode();
             String equipCode = whatStructData.getEquipCode();
             for (WhatStructData whatStructData1 : equipList) {
             for (WhatStructData whatStructData1 : equipList) {
                 if(equipCode.equals(whatStructData1.getEquipCode())){
                 if(equipCode.equals(whatStructData1.getEquipCode())){
                     Map<String, Object> statusMap = new HashMap<>();
                     Map<String, Object> statusMap = new HashMap<>();
-                    statusMap.put("name",whatStructData1.getId());
+                    statusMap.put("id",whatStructData1.getId());
+                    statusMap.put("name",whatStructData1.getMonitorName());
                     if(whatStructData1.getMonitorId()!=null){
                     if(whatStructData1.getMonitorId()!=null){
                         statusMap.put("monitorid",whatStructData1.getMonitorId());
                         statusMap.put("monitorid",whatStructData1.getMonitorId());
                     }else{
                     }else{
@@ -1876,12 +1877,12 @@ public class OlympicCenterServiceImpl implements IOlympicCenterService {
         String bpName = pumpId+"_BP";
         String bpName = pumpId+"_BP";
         String gpName = pumpId+"_GP";
         String gpName = pumpId+"_GP";
         for (Map<String, Object> bean : list) {
         for (Map<String, Object> bean : list) {
-            if(bpName.equals(bean.get("name"))){
+            if(bpName.equals(bean.get("id"))){
                 if("1".equals(map.get(bean.get("monitorid").toString()))){
                 if("1".equals(map.get(bean.get("monitorid").toString()))){
                     status = "变频运行";
                     status = "变频运行";
                 }
                 }
             }
             }
-            if(gpName.equals(bean.get("name"))){
+            if(gpName.equals(bean.get("id"))){
                 if("1".equals(map.get(bean.get("monitorid").toString()))){
                 if("1".equals(map.get(bean.get("monitorid").toString()))){
                     status = "工频运行";
                     status = "工频运行";
                 }
                 }