拼装完毕

eladmin-system/src/main/java/me/zhengjie/gemho/service/web/impl/WebMonitorChartServiceImpl.java

@@ -195,6 +195,7 @@ public class WebMonitorChartServiceImpl extends ServiceImpl<WebMonitorChartMappe
 		for (WebMonitorPointsVo point : points) {
 			List<HashMap<String, Object>> items = point.getItems();
 			for (HashMap<String, Object> item : items) {
+				String string = item.get("name").toString();
 				StringBuffer stringBuffer1 = new StringBuffer();
 				stringBuffer1.append("( ");
 				String id1 = (String) item.get("id");
@@ -227,17 +228,27 @@ public class WebMonitorChartServiceImpl extends ServiceImpl<WebMonitorChartMappe
 							//
 							HashMap<String, Object> map = new HashMap<>();
 							//遍历键值
-							for (Map keyMap : keys) {
+							for (int i = 0; i < keys.size(); i++) {
+								Map keyMap = keys.get(i);
 								String name = keyMap.get("name").toString();
 								String key = keyMap.get("key").toString();
+								System.out.println("key = " + key);
 								String value = data.get(key).toString();
+								System.out.println("value = " + value);
 								StringBuffer stringBuffer = new StringBuffer();
 								stringBuffer.append(name).append(": ").append(value).append(" ").append(item.get("unit"));
-								String string = stringBuffer.toString();
-								data.put(key, string);
-								stringBuffer.append(string).append(",");
+								String string1 = stringBuffer.toString();
+								System.out.println("string1 = " + string1);
+								if (i < keys.size()-1) {
+									stringBuffer1.append(string1).append(",");
+								} else {
+									stringBuffer1.append(string1);
+								}
+
 							}
 							stringBuffer1.append(" )");
+
+							item.put("name", string + stringBuffer1.toString());
 							item.put("realdata", data);
 						}
 					}