diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/storage/Handler.java b/cat-home/src/main/java/com/dianping/cat/report/page/storage/Handler.java index a028f4ac394d7495de0af05f01b426fa24e8ffab..c90a1d902519ee31a9889d19c59a004695e941ef 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/storage/Handler.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/storage/Handler.java @@ -1,11 +1,11 @@ package com.dianping.cat.report.page.storage; import java.io.IOException; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.HashSet; import java.util.LinkedHashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -77,8 +77,6 @@ public class Handler implements PageHandler { @Inject private AlterationDao m_alterationDao; - private SimpleDateFormat m_sdf = new SimpleDateFormat("HH:mm"); - private Map>> buildAlertLinks(Map alertInfos, String type) { Map>> links = new LinkedHashMap>>(); String format = m_storageGroupConfigManager.queryLinkFormat(type); @@ -114,34 +112,25 @@ public class Handler implements PageHandler { return links; } - private Map> buildAlterations(Payload payload, Model model) { + private List buildAlterations(Payload payload, Model model) { int minuteCounts = payload.getMinuteCounts(); int minute = model.getMinute(); long end = payload.getDate() + (minute + 1) * TimeHelper.ONE_MINUTE - TimeHelper.ONE_SECOND; long start = payload.getDate() + (minute + 1 - minuteCounts) * TimeHelper.ONE_MINUTE; - Map> results = new LinkedHashMap>(); + List results = new LinkedList(); try { List alterations = m_alterationDao.findByTypeDruation(new Date(start), new Date(end), payload.getType(), AlterationEntity.READSET_FULL); for (Alteration alteration : alterations) { - String date = m_sdf.format(alteration.getDate()); - List alts = results.get(date); - - if (alts == null) { - alts = new ArrayList(); - - results.put(date, alts); - } - alts.add(alteration); + results.add(alteration); } } catch (DalNotFoundException e) { // ignore it } catch (Exception e) { Cat.logError(e); } - return results; } diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/storage/Model.java b/cat-home/src/main/java/com/dianping/cat/report/page/storage/Model.java index 5fee28ecfe038303f11dc0b59209de49e16440ad..2131f1782a5b29562a8f67e817d6c25399995d81 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/storage/Model.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/storage/Model.java @@ -54,7 +54,7 @@ public class Model extends AbstractReportModel { private Map>> m_links; - private Map> m_alterations; + private List m_alterations; private String m_distributionChart; @@ -74,7 +74,7 @@ public class Model extends AbstractReportModel { return m_alertInfos; } - public Map> getAlterations() { + public List getAlterations() { return m_alterations; } @@ -184,7 +184,7 @@ public class Model extends AbstractReportModel { m_alertInfos = alertInfos; } - public void setAlterations(Map> alterations) { + public void setAlterations(List alterations) { m_alterations = alterations; } diff --git a/cat-home/src/main/webapp/jsp/report/storage/dashboard.jsp b/cat-home/src/main/webapp/jsp/report/storage/dashboard.jsp index 3c43fdde4f89781bbdc1b0e48be958cafad0f099..c574dfa6ad4480772914959470e24388302bd8d5 100644 --- a/cat-home/src/main/webapp/jsp/report/storage/dashboard.jsp +++ b/cat-home/src/main/webapp/jsp/report/storage/dashboard.jsp @@ -5,6 +5,7 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <%@ taglib prefix="res" uri="http://www.unidal.org/webres"%> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> @@ -134,36 +135,29 @@ 主机名 IP 标题 - 内容 + 内容 状态 - - ${entry.key} - - - - - ${alt.domain} - ${alt.hostname} - ${alt.ip} - ${alt.title} - ${alt.content} - - - - - - - - - - - - + + + + ${alt.domain} + ${alt.hostname} + ${alt.ip} + ${alt.title} + ${alt.content} + + + + + + + +