Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
梦中观雨
cat
提交
e579481b
C
cat
项目概览
梦中观雨
/
cat
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
cat
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
e579481b
编写于
10月 21, 2013
作者:
Y
yong.you
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
modify the parameter
上级
25ddf239
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
13 addition
and
27 deletion
+13
-27
cat-home/src/main/java/com/dianping/cat/report/page/metric/chart/GraphCreator.java
...m/dianping/cat/report/page/metric/chart/GraphCreator.java
+4
-4
cat-home/src/main/resources/META-INF/plexus/components.xml
cat-home/src/main/resources/META-INF/plexus/components.xml
+9
-23
未找到文件。
cat-home/src/main/java/com/dianping/cat/report/page/metric/chart/GraphCreator.java
浏览文件 @
e579481b
...
@@ -44,7 +44,7 @@ public class GraphCreator {
...
@@ -44,7 +44,7 @@ public class GraphCreator {
private
ProductLineConfigManager
m_productLineConfigManager
;
private
ProductLineConfigManager
m_productLineConfigManager
;
public
Map
<
String
,
LineChart
>
buildChartsByProductLine
(
String
productLine
,
Date
startDate
,
Date
endDate
,
public
Map
<
String
,
LineChart
>
buildChartsByProductLine
(
String
productLine
,
Date
startDate
,
Date
endDate
,
String
abtestI
D
)
{
String
abtestI
d
)
{
long
start
=
startDate
.
getTime
();
long
start
=
startDate
.
getTime
();
long
end
=
endDate
.
getTime
();
long
end
=
endDate
.
getTime
();
int
totalSize
=
(
int
)
((
end
-
start
)
/
TimeUtil
.
ONE_MINUTE
);
int
totalSize
=
(
int
)
((
end
-
start
)
/
TimeUtil
.
ONE_MINUTE
);
...
@@ -60,11 +60,11 @@ public class GraphCreator {
...
@@ -60,11 +60,11 @@ public class GraphCreator {
MetricReport
oneDayReport
=
m_metricReportService
.
query
(
productLine
,
new
Date
(
start
-
TimeUtil
.
ONE_DAY
));
MetricReport
oneDayReport
=
m_metricReportService
.
query
(
productLine
,
new
Date
(
start
-
TimeUtil
.
ONE_DAY
));
MetricReport
sevenDayReport
=
m_metricReportService
.
query
(
productLine
,
new
Date
(
start
-
TimeUtil
.
ONE_DAY
*
7
));
MetricReport
sevenDayReport
=
m_metricReportService
.
query
(
productLine
,
new
Date
(
start
-
TimeUtil
.
ONE_DAY
*
7
));
Map
<
String
,
double
[]>
currentValues
=
m_pruductDataFetcher
.
buildGraphData
(
metricReport
,
metricConfigs
,
Map
<
String
,
double
[]>
currentValues
=
m_pruductDataFetcher
.
buildGraphData
(
metricReport
,
metricConfigs
,
abtestI
D
);
abtestI
d
);
Map
<
String
,
double
[]>
oneDayValues
=
m_pruductDataFetcher
Map
<
String
,
double
[]>
oneDayValues
=
m_pruductDataFetcher
.
buildGraphData
(
oneDayReport
,
metricConfigs
,
abtestI
D
);
.
buildGraphData
(
oneDayReport
,
metricConfigs
,
abtestI
d
);
Map
<
String
,
double
[]>
sevenDayValues
=
m_pruductDataFetcher
.
buildGraphData
(
sevenDayReport
,
metricConfigs
,
Map
<
String
,
double
[]>
sevenDayValues
=
m_pruductDataFetcher
.
buildGraphData
(
sevenDayReport
,
metricConfigs
,
abtestI
D
);
abtestI
d
);
mergeMap
(
allCurrentValues
,
currentValues
,
totalSize
,
index
);
mergeMap
(
allCurrentValues
,
currentValues
,
totalSize
,
index
);
mergeMap
(
allOneDayValues
,
oneDayValues
,
totalSize
,
index
);
mergeMap
(
allOneDayValues
,
oneDayValues
,
totalSize
,
index
);
...
...
cat-home/src/main/resources/META-INF/plexus/components.xml
浏览文件 @
e579481b
...
@@ -2842,26 +2842,12 @@
...
@@ -2842,26 +2842,12 @@
<requirement>
<requirement>
<role>
com.dianping.cat.report.page.metric.JspViewer
</role>
<role>
com.dianping.cat.report.page.metric.JspViewer
</role>
</requirement>
</requirement>
<requirement>
<role>
com.dianping.cat.report.page.model.spi.ModelService
</role>
<role-hint>
metric
</role-hint>
<field-name>
m_service
</field-name>
</requirement>
<requirement>
<requirement>
<role>
com.dianping.cat.report.page.PayloadNormalizer
</role>
<role>
com.dianping.cat.report.page.PayloadNormalizer
</role>
</requirement>
</requirement>
<requirement>
<role>
com.dianping.cat.consumer.advanced.MetricConfigManager
</role>
</requirement>
<requirement>
<requirement>
<role>
com.dianping.cat.consumer.advanced.ProductLineConfigManager
</role>
<role>
com.dianping.cat.consumer.advanced.ProductLineConfigManager
</role>
</requirement>
</requirement>
<requirement>
<role>
com.dianping.cat.report.service.ReportService
</role>
</requirement>
<requirement>
<role>
com.dianping.cat.report.baseline.BaselineService
</role>
</requirement>
<requirement>
<requirement>
<role>
com.dianping.cat.report.page.metric.chart.GraphCreator
</role>
<role>
com.dianping.cat.report.page.metric.chart.GraphCreator
</role>
</requirement>
</requirement>
...
@@ -2876,15 +2862,6 @@
...
@@ -2876,15 +2862,6 @@
</requirement>
</requirement>
</requirements>
</requirements>
</component>
</component>
<component>
<role>
com.dianping.cat.consumer.advanced.MetricConfigManager
</role>
<implementation>
com.dianping.cat.consumer.advanced.MetricConfigManager
</implementation>
<requirements>
<requirement>
<role>
com.dianping.cat.core.config.ConfigDao
</role>
</requirement>
</requirements>
</component>
<component>
<component>
<role>
com.dianping.cat.consumer.advanced.ProductLineConfigManager
</role>
<role>
com.dianping.cat.consumer.advanced.ProductLineConfigManager
</role>
<implementation>
com.dianping.cat.consumer.advanced.ProductLineConfigManager
</implementation>
<implementation>
com.dianping.cat.consumer.advanced.ProductLineConfigManager
</implementation>
...
@@ -2918,6 +2895,15 @@
...
@@ -2918,6 +2895,15 @@
</requirement>
</requirement>
</requirements>
</requirements>
</component>
</component>
<component>
<role>
com.dianping.cat.consumer.advanced.MetricConfigManager
</role>
<implementation>
com.dianping.cat.consumer.advanced.MetricConfigManager
</implementation>
<requirements>
<requirement>
<role>
com.dianping.cat.core.config.ConfigDao
</role>
</requirement>
</requirements>
</component>
<component>
<component>
<role>
com.dianping.cat.report.page.jsError.Handler
</role>
<role>
com.dianping.cat.report.page.jsError.Handler
</role>
<implementation>
com.dianping.cat.report.page.jsError.Handler
</implementation>
<implementation>
com.dianping.cat.report.page.jsError.Handler
</implementation>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录