Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
fuyue82
o2oa
提交
13a252b2
o2oa
项目概览
fuyue82
/
o2oa
与 Fork 源项目一致
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
o2oa
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
13a252b2
编写于
8月 10, 2020
作者:
Z
zhourui
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修改日志处理
上级
93911135
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
89 addition
and
70 deletion
+89
-70
o2server/x_program_center/src/main/java/com/x/program/center/LogQueue.java
...m_center/src/main/java/com/x/program/center/LogQueue.java
+1
-1
o2server/x_program_center/src/main/java/com/x/program/center/schedule/CollectLog.java
...c/main/java/com/x/program/center/schedule/CollectLog.java
+88
-69
未找到文件。
o2server/x_program_center/src/main/java/com/x/program/center/LogQueue.java
浏览文件 @
13a252b2
...
...
@@ -68,7 +68,7 @@ public class LogQueue extends AbstractQueue<NameValuePair> {
do
{
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
Calendar
threshold
=
Calendar
.
getInstance
();
threshold
.
add
(
Calendar
.
DATE
,
-
5
);
threshold
.
add
(
Calendar
.
DATE
,
-
7
);
ids
=
emc
.
idsLessThanMax
(
cls
,
JpaObject
.
createTime_FIELDNAME
,
threshold
.
getTime
(),
500
);
if
(!
ids
.
isEmpty
())
{
emc
.
beginTransaction
(
cls
);
...
...
o2server/x_program_center/src/main/java/com/x/program/center/schedule/CollectLog.java
浏览文件 @
13a252b2
...
...
@@ -16,6 +16,7 @@ import org.quartz.JobExecutionException;
import
com.x.base.core.container.EntityManagerContainer
;
import
com.x.base.core.container.factory.EntityManagerContainerFactory
;
import
com.x.base.core.entity.JpaObject_
;
import
com.x.base.core.project.config.Config
;
import
com.x.base.core.project.connection.ActionResponse
;
import
com.x.base.core.project.connection.ConnectionAction
;
...
...
@@ -38,58 +39,16 @@ public class CollectLog extends BaseAction {
@Override
public
void
execute
(
JobExecutionContext
jobExecutionContext
)
throws
JobExecutionException
{
try
{
if
(
pirmaryCenter
())
{
if
(
pirmaryCenter
()
&&
BooleanUtils
.
isTrue
(
Config
.
collect
().
getEnable
())
)
{
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
if
(
BooleanUtils
.
isTrue
(
Config
.
collect
().
getEnable
()))
{
Business
business
=
new
Business
(
emc
);
if
(
business
.
validateCollect
())
{
List
<
PromptErrorLog
>
os_promptErrorLog
=
this
.
list_promptErrorLog
(
emc
);
List
<
UnexpectedErrorLog
>
os_unexpectedErrorLog
=
this
.
list_unexpectedErrorLog
(
emc
);
List
<
WarnLog
>
os_warnLog
=
this
.
list_warnLog
(
emc
);
if
(!
os_promptErrorLog
.
isEmpty
())
{
Req
req
=
new
Req
();
req
.
setName
(
Config
.
collect
().
getName
());
req
.
setPassword
(
Config
.
collect
().
getPassword
());
req
.
setPromptErrorLogList
(
os_promptErrorLog
);
try
{
ActionResponse
response
=
ConnectionAction
.
put
(
Config
.
collect
().
url
(
ADDRESS_COLLECT_PROMPTERRORLOG
),
null
,
req
);
response
.
getData
(
WrapOutBoolean
.
class
);
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
}
if
(!
os_unexpectedErrorLog
.
isEmpty
())
{
Req
req
=
new
Req
();
req
.
setName
(
Config
.
collect
().
getName
());
req
.
setPassword
(
Config
.
collect
().
getPassword
());
req
.
setUnexceptedErrorLog
(
os_unexpectedErrorLog
);
try
{
ActionResponse
response
=
ConnectionAction
.
put
(
Config
.
collect
().
url
(
ADDRESS_COLLECT_UNEXPECTEDERRORLOG
),
null
,
req
);
response
.
getData
(
WrapOutBoolean
.
class
);
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
}
if
(!
os_warnLog
.
isEmpty
())
{
Req
req
=
new
Req
();
req
.
setName
(
Config
.
collect
().
getName
());
req
.
setPassword
(
Config
.
collect
().
getPassword
());
req
.
setWarnLogList
(
os_warnLog
);
try
{
ActionResponse
response
=
ConnectionAction
.
put
(
Config
.
collect
().
url
(
ADDRESS_COLLECT_WARNLOG
),
null
,
req
);
response
.
getData
(
WrapOutBoolean
.
class
);
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
}
}
else
{
logger
.
info
(
"无法登录到云服务器."
);
}
Business
business
=
new
Business
(
emc
);
if
(
BooleanUtils
.
isNotTrue
(
business
.
validateCollect
()))
{
logger
.
warn
(
"login cloud server failure."
);
}
}
this
.
collectPromptErrorLog
();
this
.
collectUnexpectedErrorLog
();
this
.
collectWarnLog
();
}
}
catch
(
Exception
e
)
{
logger
.
error
(
e
);
...
...
@@ -97,12 +56,70 @@ public class CollectLog extends BaseAction {
}
}
private
void
collectPromptErrorLog
()
throws
Exception
{
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
List
<
PromptErrorLog
>
list
=
this
.
listPromptErrorLog
(
emc
);
if
(!
list
.
isEmpty
())
{
Req
req
=
new
Req
();
req
.
setName
(
Config
.
collect
().
getName
());
req
.
setPassword
(
Config
.
collect
().
getPassword
());
req
.
setPromptErrorLogList
(
list
);
try
{
ActionResponse
response
=
ConnectionAction
.
put
(
Config
.
collect
().
url
(
ADDRESS_COLLECT_PROMPTERRORLOG
),
null
,
req
);
response
.
getData
(
WrapOutBoolean
.
class
);
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
}
}
}
private
void
collectUnexpectedErrorLog
()
throws
Exception
{
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
List
<
UnexpectedErrorLog
>
list
=
this
.
listUnexpectedErrorLog
(
emc
);
if
(!
list
.
isEmpty
())
{
Req
req
=
new
Req
();
req
.
setName
(
Config
.
collect
().
getName
());
req
.
setPassword
(
Config
.
collect
().
getPassword
());
req
.
setUnexpectedErrorLogList
(
list
);
try
{
ActionResponse
response
=
ConnectionAction
.
put
(
Config
.
collect
().
url
(
ADDRESS_COLLECT_UNEXPECTEDERRORLOG
),
null
,
req
);
response
.
getData
(
WrapOutBoolean
.
class
);
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
}
}
}
private
void
collectWarnLog
()
throws
Exception
{
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
List
<
WarnLog
>
list
=
this
.
listWarnLog
(
emc
);
if
(!
list
.
isEmpty
())
{
Req
req
=
new
Req
();
req
.
setName
(
Config
.
collect
().
getName
());
req
.
setPassword
(
Config
.
collect
().
getPassword
());
req
.
setWarnLogList
(
list
);
try
{
ActionResponse
response
=
ConnectionAction
.
put
(
Config
.
collect
().
url
(
ADDRESS_COLLECT_WARNLOG
),
null
,
req
);
response
.
getData
(
WrapOutBoolean
.
class
);
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
}
}
}
public
static
class
Req
extends
GsonPropertyObject
{
private
static
final
long
serialVersionUID
=
2018703062822498687L
;
private
String
name
;
private
String
password
;
private
List
<
PromptErrorLog
>
promptErrorLogList
=
new
ArrayList
<>();
private
List
<
UnexpectedErrorLog
>
unex
ceptedErrorLog
=
new
ArrayList
<>();
private
List
<
UnexpectedErrorLog
>
unex
pectedErrorLogList
=
new
ArrayList
<>();
private
List
<
WarnLog
>
warnLogList
=
new
ArrayList
<>();
public
String
getName
()
{
...
...
@@ -137,27 +154,28 @@ public class CollectLog extends BaseAction {
this
.
warnLogList
=
warnLogList
;
}
public
List
<
UnexpectedErrorLog
>
getUnex
ceptedErrorLog
()
{
return
unex
ceptedErrorLog
;
public
List
<
UnexpectedErrorLog
>
getUnex
pectedErrorLogList
()
{
return
unex
pectedErrorLogList
;
}
public
void
setUnex
ceptedErrorLog
(
List
<
UnexpectedErrorLog
>
unexceptedErrorLog
)
{
this
.
unex
ceptedErrorLog
=
unexceptedErrorLog
;
public
void
setUnex
pectedErrorLogList
(
List
<
UnexpectedErrorLog
>
unexpectedErrorLogList
)
{
this
.
unex
pectedErrorLogList
=
unexpectedErrorLogList
;
}
}
private
List
<
PromptErrorLog
>
list
_p
romptErrorLog
(
EntityManagerContainer
emc
)
throws
Exception
{
private
List
<
PromptErrorLog
>
list
P
romptErrorLog
(
EntityManagerContainer
emc
)
throws
Exception
{
EntityManager
em
=
emc
.
get
(
PromptErrorLog
.
class
);
CriteriaBuilder
cb
=
em
.
getCriteriaBuilder
();
CriteriaQuery
<
PromptErrorLog
>
cq
=
cb
.
createQuery
(
PromptErrorLog
.
class
);
Root
<
PromptErrorLog
>
root
=
cq
.
from
(
PromptErrorLog
.
class
);
Calendar
cal
=
Calendar
.
getInstance
();
cal
.
add
(
Calendar
.
DAY_OF_MONTH
,
-
1
);
Predicate
p
=
cb
.
greaterThan
(
root
.
get
(
PromptErrorLog_
.
createTime
),
cal
.
getTime
());
p
=
cb
.
and
(
p
,
cb
.
notEqual
(
root
.
get
(
PromptErrorLog_
.
collected
),
true
));
cq
.
select
(
root
).
where
(
p
).
orderBy
(
cb
.
desc
(
root
.
get
(
PromptErrorLog_
.
createTime
)));
List
<
PromptErrorLog
>
list
=
em
.
createQuery
(
cq
).
setMaxResults
(
10
).
getResultList
();
Predicate
p
=
cb
.
greaterThan
(
root
.
get
(
JpaObject_
.
createTime
),
cal
.
getTime
());
p
=
cb
.
and
(
p
,
cb
.
or
(
cb
.
notEqual
(
root
.
get
(
PromptErrorLog_
.
collected
),
true
),
cb
.
isNull
(
root
.
get
(
PromptErrorLog_
.
collected
))));
cq
.
select
(
root
).
where
(
p
).
orderBy
(
cb
.
desc
(
root
.
get
(
JpaObject_
.
createTime
)));
List
<
PromptErrorLog
>
list
=
em
.
createQuery
(
cq
).
setMaxResults
(
20
).
getResultList
();
if
(!
list
.
isEmpty
())
{
emc
.
beginTransaction
(
PromptErrorLog
.
class
);
for
(
PromptErrorLog
o
:
list
)
{
...
...
@@ -168,17 +186,18 @@ public class CollectLog extends BaseAction {
return
list
;
}
private
List
<
UnexpectedErrorLog
>
list
_u
nexpectedErrorLog
(
EntityManagerContainer
emc
)
throws
Exception
{
private
List
<
UnexpectedErrorLog
>
list
U
nexpectedErrorLog
(
EntityManagerContainer
emc
)
throws
Exception
{
EntityManager
em
=
emc
.
get
(
UnexpectedErrorLog
.
class
);
CriteriaBuilder
cb
=
em
.
getCriteriaBuilder
();
CriteriaQuery
<
UnexpectedErrorLog
>
cq
=
cb
.
createQuery
(
UnexpectedErrorLog
.
class
);
Root
<
UnexpectedErrorLog
>
root
=
cq
.
from
(
UnexpectedErrorLog
.
class
);
Calendar
cal
=
Calendar
.
getInstance
();
cal
.
add
(
Calendar
.
DAY_OF_MONTH
,
-
1
);
Predicate
p
=
cb
.
greaterThan
(
root
.
get
(
UnexpectedErrorLog_
.
createTime
),
cal
.
getTime
());
p
=
cb
.
and
(
p
,
cb
.
notEqual
(
root
.
get
(
UnexpectedErrorLog_
.
collected
),
true
));
cq
.
select
(
root
).
where
(
p
).
orderBy
(
cb
.
desc
(
root
.
get
(
UnexpectedErrorLog_
.
createTime
)));
List
<
UnexpectedErrorLog
>
list
=
em
.
createQuery
(
cq
).
setMaxResults
(
10
).
getResultList
();
Predicate
p
=
cb
.
greaterThan
(
root
.
get
(
JpaObject_
.
createTime
),
cal
.
getTime
());
p
=
cb
.
and
(
p
,
cb
.
or
(
cb
.
notEqual
(
root
.
get
(
UnexpectedErrorLog_
.
collected
),
true
),
cb
.
isNull
(
root
.
get
(
UnexpectedErrorLog_
.
collected
))));
cq
.
select
(
root
).
where
(
p
).
orderBy
(
cb
.
desc
(
root
.
get
(
JpaObject_
.
createTime
)));
List
<
UnexpectedErrorLog
>
list
=
em
.
createQuery
(
cq
).
setMaxResults
(
20
).
getResultList
();
if
(!
list
.
isEmpty
())
{
emc
.
beginTransaction
(
UnexpectedErrorLog
.
class
);
for
(
UnexpectedErrorLog
o
:
list
)
{
...
...
@@ -189,17 +208,17 @@ public class CollectLog extends BaseAction {
return
list
;
}
private
List
<
WarnLog
>
list
_w
arnLog
(
EntityManagerContainer
emc
)
throws
Exception
{
private
List
<
WarnLog
>
list
W
arnLog
(
EntityManagerContainer
emc
)
throws
Exception
{
EntityManager
em
=
emc
.
get
(
WarnLog
.
class
);
CriteriaBuilder
cb
=
em
.
getCriteriaBuilder
();
CriteriaQuery
<
WarnLog
>
cq
=
cb
.
createQuery
(
WarnLog
.
class
);
Root
<
WarnLog
>
root
=
cq
.
from
(
WarnLog
.
class
);
Calendar
cal
=
Calendar
.
getInstance
();
cal
.
add
(
Calendar
.
DAY_OF_MONTH
,
-
1
);
Predicate
p
=
cb
.
greaterThan
(
root
.
get
(
WarnLog
_
.
createTime
),
cal
.
getTime
());
p
=
cb
.
and
(
p
,
cb
.
notEqual
(
root
.
get
(
WarnLog_
.
collected
),
true
));
cq
.
select
(
root
).
where
(
p
).
orderBy
(
cb
.
desc
(
root
.
get
(
WarnLog
_
.
createTime
)));
List
<
WarnLog
>
list
=
em
.
createQuery
(
cq
).
setMaxResults
(
1
0
).
getResultList
();
Predicate
p
=
cb
.
greaterThan
(
root
.
get
(
JpaObject
_
.
createTime
),
cal
.
getTime
());
p
=
cb
.
and
(
p
,
cb
.
or
(
cb
.
notEqual
(
root
.
get
(
WarnLog_
.
collected
),
true
),
cb
.
isNull
(
root
.
get
(
WarnLog_
.
collected
))
));
cq
.
select
(
root
).
where
(
p
).
orderBy
(
cb
.
desc
(
root
.
get
(
JpaObject
_
.
createTime
)));
List
<
WarnLog
>
list
=
em
.
createQuery
(
cq
).
setMaxResults
(
2
0
).
getResultList
();
if
(!
list
.
isEmpty
())
{
emc
.
beginTransaction
(
WarnLog
.
class
);
for
(
WarnLog
o
:
list
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录