From 28cfc6eefc8771f9bf72faf78e0fb3d637001e5e Mon Sep 17 00:00:00 2001 From: You Yong Date: Tue, 17 Jul 2012 11:17:17 +0800 Subject: [PATCH] modify the matrix bug --- .../page/model/matrix/MatrixReportMerger.java | 1 - .../dianping/cat/report/page/sql/Handler.java | 19 +-- .../resources/META-INF/plexus/components.xml | 12 ++ cat-home/src/main/webapp/WEB-INF/webres.tld | 118 +----------------- 4 files changed, 25 insertions(+), 125 deletions(-) diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/model/matrix/MatrixReportMerger.java b/cat-home/src/main/java/com/dianping/cat/report/page/model/matrix/MatrixReportMerger.java index c6466ea46..2ddc13927 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/model/matrix/MatrixReportMerger.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/model/matrix/MatrixReportMerger.java @@ -22,7 +22,6 @@ public class MatrixReportMerger extends DefaultMerger { @Override protected void mergeRatio(Ratio old, Ratio ratio) { - old.setCount(old.getCount() + ratio.getCount()); old.setTotalCount(old.getTotalCount() + ratio.getTotalCount()); old.setTotalTime(old.getTotalTime() + ratio.getTotalTime()); if (old.getMin() == 0) { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/sql/Handler.java b/cat-home/src/main/java/com/dianping/cat/report/page/sql/Handler.java index 4258b464c..8536c9973 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/sql/Handler.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/sql/Handler.java @@ -53,10 +53,7 @@ public class Handler implements PageHandler { model.setPage(ReportPage.SQL); model.setDisplayDomain(payload.getDomain()); model.setAction(payload.getAction()); - // Last hour is default - if (payload.getPeriod().isCurrent()) { - payload.setStep(payload.getStep() - 1); - } + switch (payload.getAction()) { case VIEW: showReport(model, payload); @@ -82,10 +79,15 @@ public class Handler implements PageHandler { String durationOvertime = ""; String hitsovOvrtime = ""; String failureOvertime = ""; + // Last hour is default + long date = payload.getDate(); + if (payload.getPeriod().isCurrent()) { + date = date - 60 * 60 * 1000; + } // when id is 0, will analyze all the data under this domain if (id == 0) { - List allRecords = m_dao.findAllByDomainAndDate(payload.getDomain(), - new Date(payload.getDate()), SqlReportRecordEntity.READSET_FULL); + List allRecords = m_dao.findAllByDomainAndDate(payload.getDomain(), new Date(date), + SqlReportRecordEntity.READSET_FULL); List durationDistributions = new ArrayList(); List durationOvertimes = new ArrayList(); List hitsovOvrtimes = new ArrayList(); @@ -135,6 +137,9 @@ public class Handler implements PageHandler { String domain = payload.getDomain(); long startDate = payload.getDate(); model.setLongDate(startDate); + if (payload.getPeriod().isCurrent()) { + startDate = startDate - 60 * 60 * 1000; + } Date transactiondate = new Date(startDate); List domains = new ArrayList(); Readset domainSet = SqlReportRecordEntity.READSET_DOMAIN; @@ -220,7 +225,7 @@ public class Handler implements PageHandler { } } for (int m = 0; m <= 12; m++) { - average[m] = totalHit[m] == 0 ? 0 : sum[m] /(double) totalHit[m]; + average[m] = totalHit[m] == 0 ? 0 : sum[m] / (double) totalHit[m]; } StringBuilder sb = new StringBuilder(); for (int i = 0; i <= 12; i++) { diff --git a/cat-home/src/main/resources/META-INF/plexus/components.xml b/cat-home/src/main/resources/META-INF/plexus/components.xml index 4d40665a2..025ae3719 100755 --- a/cat-home/src/main/resources/META-INF/plexus/components.xml +++ b/cat-home/src/main/resources/META-INF/plexus/components.xml @@ -836,12 +836,24 @@ com.dianping.cat.report.page.task.JspViewer + + com.dianping.cat.hadoop.dal.TaskDao + com.dianping.cat.report.page.task.JspViewer com.dianping.cat.report.page.task.JspViewer + + com.dianping.cat.hadoop.dal.TaskDao + com.dianping.cat.hadoop.dal.TaskDao + + + com.site.dal.jdbc.QueryEngine + + + com.dianping.cat.report.page.matrix.Handler com.dianping.cat.report.page.matrix.Handler diff --git a/cat-home/src/main/webapp/WEB-INF/webres.tld b/cat-home/src/main/webapp/WEB-INF/webres.tld index 5da73fee1..10cbffaa9 100755 --- a/cat-home/src/main/webapp/WEB-INF/webres.tld +++ b/cat-home/src/main/webapp/WEB-INF/webres.tld @@ -42,8 +42,6 @@ true true java.lang.String -<<<<<<< HEAD -======= false @@ -58,15 +56,7 @@ false true java.lang.Object ->>>>>>> 241d65c954b0d5e7ca03a2c1cb32207603dceec9 -false - - - -useCss -org.unidal.webres.taglib.basic.UseCssTagHandler -JSP secure @@ -88,28 +78,6 @@ true java.lang.String -<<<<<<< HEAD - - -value -false -true -java.lang.Object - - - -target -false -true -java.lang.String - -true - - - -token -org.unidal.webres.taglib.basic.TokenTagHandler -======= target @@ -144,7 +112,6 @@ set org.unidal.webres.taglib.basic.SetTagHandler ->>>>>>> 241d65c954b0d5e7ca03a2c1cb32207603dceec9 JSP @@ -160,31 +127,6 @@ true java.lang.String -<<<<<<< HEAD - - -type -true -true -java.lang.String - -false - - - -set -org.unidal.webres.taglib.basic.SetTagHandler -JSP - - -id -true -true -java.lang.String - - - -======= false @@ -194,19 +136,11 @@ JSP ->>>>>>> 241d65c954b0d5e7ca03a2c1cb32207603dceec9 value false true java.lang.Object -false - - - -useJs -org.unidal.webres.taglib.basic.UseJsTagHandler -JSP secure @@ -228,10 +162,6 @@ true java.lang.String -<<<<<<< HEAD - - -======= target @@ -248,35 +178,12 @@ JSP ->>>>>>> 241d65c954b0d5e7ca03a2c1cb32207603dceec9 value -false +true true java.lang.Object -<<<<<<< HEAD - -target -======= - -secure ->>>>>>> 241d65c954b0d5e7ca03a2c1cb32207603dceec9 -false -true -boolean - -<<<<<<< HEAD -true - - - -link -org.unidal.webres.taglib.basic.LinkTagHandler -JSP -======= ->>>>>>> 241d65c954b0d5e7ca03a2c1cb32207603dceec9 - secure false @@ -290,16 +197,6 @@ true java.lang.String -<<<<<<< HEAD - - -value -true -true -java.lang.Object - -======= ->>>>>>> 241d65c954b0d5e7ca03a2c1cb32207603dceec9 true @@ -308,8 +205,6 @@ org.unidal.webres.taglib.basic.ImageTagHandler JSP -<<<<<<< HEAD -======= value true @@ -317,7 +212,6 @@ java.lang.Object ->>>>>>> 241d65c954b0d5e7ca03a2c1cb32207603dceec9 secure false @@ -338,16 +232,6 @@ true java.lang.String -<<<<<<< HEAD - - -value -true -true -java.lang.Object - -======= ->>>>>>> 241d65c954b0d5e7ca03a2c1cb32207603dceec9 true -- GitLab