From ad425e6da5932f08cdeaf4591782d23e9815fd58 Mon Sep 17 00:00:00 2001
From: youyong205 <youyong205@126.com>
Date: Thu, 2 Jan 2014 20:45:55 +0800
Subject: [PATCH] modify the ui

---
 cat-home/src/main/webapp/jsp/report/utilization/detail.jsp  | 4 +++-
 cat-home/src/test/java/com/dianping/cat/AllTests.java       | 2 +-
 .../{baseline => task/metric}/BaselineCreatorTest.java      | 3 ++-
 .../src/test/resources/com/dianping/cat/demo/client.xml     | 6 ------
 4 files changed, 6 insertions(+), 9 deletions(-)
 rename cat-home/src/test/java/com/dianping/cat/report/{baseline => task/metric}/BaselineCreatorTest.java (94%)
 delete mode 100755 cat-home/src/test/resources/com/dianping/cat/demo/client.xml

diff --git a/cat-home/src/main/webapp/jsp/report/utilization/detail.jsp b/cat-home/src/main/webapp/jsp/report/utilization/detail.jsp
index 7e0cee44c..f63d94e7b 100644
--- a/cat-home/src/main/webapp/jsp/report/utilization/detail.jsp
+++ b/cat-home/src/main/webapp/jsp/report/utilization/detail.jsp
@@ -19,7 +19,8 @@
 								<th>Web应用</th>
 								<th>机器数</th>
 								<th>访问量<i tips="" data-trigger="hover" class="icon-question-sign" data-toggle="popover" data-placement="left"  data-content="一段时间【小时、天、周、月】的URL访问总量"></i></th>
-								<th>QPS<i tips="" data-trigger="hover" class="icon-question-sign" data-toggle="popover" data-placement="left"  data-content="一段时间【小时、天、周、月】单台机器URL每秒的访问最大量"></i></th>
+								<th>集群QPS<i tips="" data-trigger="hover" class="icon-question-sign" data-toggle="popover" data-placement="left"  data-content="一段时间【小时、天、周、月】单台机器URL每秒的访问最大量"></i></th>
+								<th>单机QPS<i tips="" data-trigger="hover" class="icon-question-sign" data-toggle="popover" data-placement="left"  data-content="一段时间【小时、天、周、月】单台机器URL每秒的访问最大量"></i></th>
 								<th>错误量</th>
 								<th>错误量%</th>
 								<th>响应时间(ms)</th>
@@ -36,6 +37,7 @@
 									<td style="text-align:right">${item.machineNumber}</td>
 									<td style="text-align:right">${w:format(item.applicationStates.URL.count,'###0')}</td>
 									<td style="text-align:right">${w:format(item.applicationStates.URL.maxQps,'###0')}</td>
+									<td style="text-align:right">${w:format(item.applicationStates.URL.maxQps/item.machineNumber,'###0')}</td>
 									<td style="text-align:right">${w:format(item.applicationStates.URL.failureCount,'###0')}</td>
 									<td style="text-align:right">${w:format(item.applicationStates.URL.failurePercent,'###0%')}</td>
 									<td style="text-align:right">${w:format(item.applicationStates.URL.avg,'#0.0')}</td>
diff --git a/cat-home/src/test/java/com/dianping/cat/AllTests.java b/cat-home/src/test/java/com/dianping/cat/AllTests.java
index 1b8fd8af9..2f8b04efa 100755
--- a/cat-home/src/test/java/com/dianping/cat/AllTests.java
+++ b/cat-home/src/test/java/com/dianping/cat/AllTests.java
@@ -8,7 +8,6 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
-import com.dianping.cat.report.baseline.BaselineCreatorTest;
 import com.dianping.cat.report.graph.ValueTranslaterTest;
 import com.dianping.cat.report.page.cross.CMDBTest;
 import com.dianping.cat.report.page.cross.CrossReportMergerTest;
@@ -33,6 +32,7 @@ import com.dianping.cat.report.task.event.EventDailyGraphMergerTest;
 import com.dianping.cat.report.task.event.EventGraphCreatorTest;
 import com.dianping.cat.report.task.event.HistoryEventMergerTest;
 import com.dianping.cat.report.task.heavy.HeavyReportBuilderTest;
+import com.dianping.cat.report.task.metric.BaselineCreatorTest;
 import com.dianping.cat.report.task.problem.ProblemCreateGraphDataTest;
 import com.dianping.cat.report.task.problem.ProblemDailyGraphMergerTest;
 import com.dianping.cat.report.task.problem.ProblemDailyGraphTest;
diff --git a/cat-home/src/test/java/com/dianping/cat/report/baseline/BaselineCreatorTest.java b/cat-home/src/test/java/com/dianping/cat/report/task/metric/BaselineCreatorTest.java
similarity index 94%
rename from cat-home/src/test/java/com/dianping/cat/report/baseline/BaselineCreatorTest.java
rename to cat-home/src/test/java/com/dianping/cat/report/task/metric/BaselineCreatorTest.java
index cbd86e8fd..a48fcc58b 100644
--- a/cat-home/src/test/java/com/dianping/cat/report/baseline/BaselineCreatorTest.java
+++ b/cat-home/src/test/java/com/dianping/cat/report/task/metric/BaselineCreatorTest.java
@@ -1,4 +1,4 @@
-package com.dianping.cat.report.baseline;
+package com.dianping.cat.report.task.metric;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -9,6 +9,7 @@ import java.util.Set;
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.dianping.cat.report.baseline.BaselineCreator;
 import com.dianping.cat.report.baseline.impl.DefaultBaselineCreator;
 
 public class BaselineCreatorTest {
diff --git a/cat-home/src/test/resources/com/dianping/cat/demo/client.xml b/cat-home/src/test/resources/com/dianping/cat/demo/client.xml
deleted file mode 100755
index bf74bf9bf..000000000
--- a/cat-home/src/test/resources/com/dianping/cat/demo/client.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<config mode="client" xmlns:xsi="http://www.w3.org/2001/XMLSchema" xsi:noNamespaceSchemaLocation="config.xsd">
-	<domain id="Cat-demo" enabled="true"/>
-	<servers>
-		<server ip="192.168.7.43" port="2280" />
-	</servers>
-</config>
\ No newline at end of file
-- 
GitLab