Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
梦中观雨
cat
提交
1f288b94
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,发现更多精彩内容 >>
提交
1f288b94
编写于
8月 12, 2015
作者:
Y
youyong205
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #856 from chinaboard/master
fix
上级
3aeff297
d6b1aec2
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
5 addition
and
5 deletion
+5
-5
cat-home/src/main/java/com/dianping/cat/report/page/storage/task/StorageReportBuilder.java
...ng/cat/report/page/storage/task/StorageReportBuilder.java
+4
-4
script/Cat.sql
script/Cat.sql
+1
-1
未找到文件。
cat-home/src/main/java/com/dianping/cat/report/page/storage/task/StorageReportBuilder.java
浏览文件 @
1f288b94
...
...
@@ -65,7 +65,7 @@ public class StorageReportBuilder implements TaskBuilder {
end
=
TaskHelper
.
nextMonthStart
(
period
);
}
StorageReport
event
Report
=
queryDailyReportsByDuration
(
reportId
,
period
,
end
);
StorageReport
storage
Report
=
queryDailyReportsByDuration
(
reportId
,
period
,
end
);
MonthlyReport
report
=
new
MonthlyReport
();
report
.
setCreationDate
(
new
Date
());
...
...
@@ -74,7 +74,7 @@ public class StorageReportBuilder implements TaskBuilder {
report
.
setName
(
name
);
report
.
setPeriod
(
period
);
report
.
setType
(
1
);
byte
[]
binaryContent
=
DefaultNativeBuilder
.
build
(
event
Report
);
byte
[]
binaryContent
=
DefaultNativeBuilder
.
build
(
storage
Report
);
return
m_reportService
.
insertMonthlyReport
(
report
,
binaryContent
);
}
...
...
@@ -88,7 +88,7 @@ public class StorageReportBuilder implements TaskBuilder {
end
=
new
Date
(
period
.
getTime
()
+
TimeHelper
.
ONE_WEEK
);
}
StorageReport
event
Report
=
queryDailyReportsByDuration
(
reportId
,
period
,
end
);
StorageReport
storage
Report
=
queryDailyReportsByDuration
(
reportId
,
period
,
end
);
WeeklyReport
report
=
new
WeeklyReport
();
report
.
setCreationDate
(
new
Date
());
...
...
@@ -97,7 +97,7 @@ public class StorageReportBuilder implements TaskBuilder {
report
.
setName
(
name
);
report
.
setPeriod
(
period
);
report
.
setType
(
1
);
byte
[]
binaryContent
=
DefaultNativeBuilder
.
build
(
event
Report
);
byte
[]
binaryContent
=
DefaultNativeBuilder
.
build
(
storage
Report
);
return
m_reportService
.
insertWeeklyReport
(
report
,
binaryContent
);
}
...
...
script/Cat.sql
浏览文件 @
1f288b94
...
...
@@ -296,7 +296,7 @@ CREATE TABLE `web_api_data_1` (
PRIMARY
KEY
(
`id`
),
UNIQUE
KEY
`IX_condition`
(
`period`
,
`minute_order`
,
`city`
,
`operator`
,
`code`
),
KEY
`updatetime`
(
`updatetime`
)
)
ENGINE
=
InnoDB
DEFAULT
CHARSET
=
utf8
COMMENT
=
'web基本数据'
;
)
)
ENGINE
=
InnoDB
DEFAULT
CHARSET
=
utf8
COMMENT
=
'web基本数据'
;
CREATE
TABLE
`overload`
(
`id`
int
(
11
)
NOT
NULL
AUTO_INCREMENT
COMMENT
'自增长ID'
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录