Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
梦中观雨
cat
提交
a0d92927
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,发现更多精彩内容 >>
提交
a0d92927
编写于
10月 20, 2014
作者:
Y
youyong205
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #566 from jialinsun/master
fix scheduledReport issue
上级
fdeea203
21e125e0
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
59 addition
and
18 deletion
+59
-18
cat-home/src/main/java/com/dianping/cat/system/page/alarm/ScheduledManager.java
.../com/dianping/cat/system/page/alarm/ScheduledManager.java
+59
-18
未找到文件。
cat-home/src/main/java/com/dianping/cat/system/page/alarm/ScheduledManager.java
浏览文件 @
a0d92927
...
...
@@ -83,21 +83,6 @@ public class ScheduledManager implements Initializable {
model
.
setUserReportSubStates
(
userRules
);
}
public
void
refreshScheduledReport
()
throws
Exception
{
Map
<
String
,
Project
>
projects
=
m_projectService
.
findAllProjects
();
for
(
Entry
<
String
,
Project
>
entry
:
projects
.
entrySet
())
{
String
domain
=
entry
.
getKey
();
String
cmdbDomain
=
entry
.
getValue
().
getCmdbDomain
();
if
(
StringUtils
.
isNotEmpty
(
cmdbDomain
)
&&
!
m_reports
.
containsKey
(
cmdbDomain
))
{
updateData
(
cmdbDomain
);
}
else
if
(
StringUtils
.
isEmpty
(
cmdbDomain
)
&&
!
m_reports
.
containsKey
(
domain
))
{
updateData
(
domain
);
}
}
}
public
void
scheduledReportDelete
(
Payload
payload
)
{
int
id
=
payload
.
getScheduledReportId
();
ScheduledReport
proto
=
m_scheduledReportDao
.
createLocal
();
...
...
@@ -168,6 +153,52 @@ public class ScheduledManager implements Initializable {
}
}
@Override
public
void
initialize
()
throws
InitializationException
{
try
{
List
<
ScheduledReport
>
reports
=
m_scheduledReportDao
.
findAll
(
ScheduledReportEntity
.
READSET_FULL
);
for
(
ScheduledReport
report
:
reports
)
{
String
domain
=
report
.
getDomain
();
Project
project
=
m_projectService
.
findByDomain
(
domain
);
if
(
project
==
null
)
{
project
=
m_projectService
.
findByCmdbDomain
(
domain
);
}
if
(
project
!=
null
)
{
String
cmdbDomain
=
project
.
getCmdbDomain
();
if
(
StringUtils
.
isNotEmpty
(
cmdbDomain
)
&&
!
report
.
getDomain
().
equals
(
cmdbDomain
)
&&
!
m_reports
.
containsKey
(
cmdbDomain
))
{
ScheduledReport
entity
=
m_scheduledReportDao
.
createLocal
();
entity
.
setKeyId
(
report
.
getKeyId
());
entity
.
setId
(
report
.
getId
());
entity
.
setNames
(
report
.
getNames
());
entity
.
setDomain
(
cmdbDomain
);
int
succ
=
m_scheduledReportDao
.
updateByPK
(
entity
,
ScheduledReportEntity
.
UPDATESET_FULL
);
if
(
succ
>
0
)
{
report
.
setDomain
(
cmdbDomain
);
m_reports
.
put
(
cmdbDomain
,
report
);
}
else
{
m_reports
.
put
(
domain
,
report
);
}
}
else
{
m_reports
.
put
(
domain
,
report
);
}
}
else
{
m_reports
.
put
(
domain
,
report
);
}
}
Threads
.
forGroup
(
"cat"
).
start
(
new
ScheduledReportUpdateTask
());
}
catch
(
Exception
e
)
{
Cat
.
logError
(
e
);
e
.
printStackTrace
();
}
}
private
void
updateData
(
String
domain
)
throws
Exception
{
ScheduledReport
entity
=
m_scheduledReportDao
.
createLocal
();
...
...
@@ -179,9 +210,19 @@ public class ScheduledManager implements Initializable {
m_reports
.
put
(
domain
,
report
);
}
@Override
public
void
initialize
()
throws
InitializationException
{
Threads
.
forGroup
(
"Cat"
).
start
(
new
ScheduledReportUpdateTask
());
public
void
refreshScheduledReport
()
throws
Exception
{
Map
<
String
,
Project
>
projects
=
m_projectService
.
findAllProjects
();
for
(
Entry
<
String
,
Project
>
entry
:
projects
.
entrySet
())
{
String
domain
=
entry
.
getKey
();
String
cmdbDomain
=
entry
.
getValue
().
getCmdbDomain
();
if
(
StringUtils
.
isNotEmpty
(
cmdbDomain
)
&&
!
m_reports
.
containsKey
(
cmdbDomain
))
{
updateData
(
cmdbDomain
);
}
else
if
(
StringUtils
.
isEmpty
(
cmdbDomain
)
&&
!
m_reports
.
containsKey
(
domain
))
{
updateData
(
domain
);
}
}
}
public
class
ScheduledReportUpdateTask
implements
Task
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录