Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ghsby
o2oa
提交
10ba7bd1
o2oa
项目概览
ghsby
/
o2oa
落后 Fork 源项目 2880 个版本
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
1
Star
1
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,发现更多精彩内容 >>
提交
10ba7bd1
编写于
4月 15, 2022
作者:
R
Ray
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add archive hadoop
上级
f853f190
变更
29
隐藏空白更改
内联
并排
Showing
29 changed file
with
755 addition
and
242 deletion
+755
-242
o2server/pom.xml
o2server/pom.xml
+1
-1
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Message.java
...src/main/java/com/x/base/core/project/config/Message.java
+103
-7
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Messages.java
...rc/main/java/com/x/base/core/project/config/Messages.java
+43
-9
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/ProcessPlatform.java
.../java/com/x/base/core/project/config/ProcessPlatform.java
+58
-97
o2server/x_base_core_project/src/main/java/com/x/base/core/project/message/MessageConnector.java
...ava/com/x/base/core/project/message/MessageConnector.java
+2
-2
o2server/x_message_assemble_communicate/pom.xml
o2server/x_message_assemble_communicate/pom.xml
+2
-3
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/ActivemqConsumeQueue.java
.../x/message/assemble/communicate/ActivemqConsumeQueue.java
+9
-11
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/ApiConsumeQueue.java
...a/com/x/message/assemble/communicate/ApiConsumeQueue.java
+2
-4
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/HadoopConsumeQueue.java
...om/x/message/assemble/communicate/HadoopConsumeQueue.java
+14
-10
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/JdbcConsumeQueue.java
.../com/x/message/assemble/communicate/JdbcConsumeQueue.java
+2
-4
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/KafkaConsumeQueue.java
...com/x/message/assemble/communicate/KafkaConsumeQueue.java
+2
-4
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/MailConsumeQueue.java
.../com/x/message/assemble/communicate/MailConsumeQueue.java
+2
-4
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/MpweixinConsumeQueue.java
.../x/message/assemble/communicate/MpweixinConsumeQueue.java
+2
-2
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/PmsinnerConsumeQueue.java
.../x/message/assemble/communicate/PmsinnerConsumeQueue.java
+1
-1
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/RestfulConsumeQueue.java
...m/x/message/assemble/communicate/RestfulConsumeQueue.java
+2
-4
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/TableConsumeQueue.java
...com/x/message/assemble/communicate/TableConsumeQueue.java
+2
-5
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/ThisApplication.java
...a/com/x/message/assemble/communicate/ThisApplication.java
+10
-10
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/WelinkConsumeQueue.java
...om/x/message/assemble/communicate/WelinkConsumeQueue.java
+2
-2
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/ZhengwudingdingConsumeQueue.java
...age/assemble/communicate/ZhengwudingdingConsumeQueue.java
+2
-2
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/jaxrs/connector/ActionCreate.java
...ge/assemble/communicate/jaxrs/connector/ActionCreate.java
+16
-14
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/jaxrs/im/ActionMsgCreate.java
...essage/assemble/communicate/jaxrs/im/ActionMsgCreate.java
+1
-1
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/schedule/TriggerMessageConsumeQueue.java
...mble/communicate/schedule/TriggerMessageConsumeQueue.java
+1
-1
o2server/x_message_core_entity/src/main/java/com/x/message/core/entity/Message.java
...tity/src/main/java/com/x/message/core/entity/Message.java
+0
-17
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/message/Event.java
...java/com/x/processplatform/core/entity/message/Event.java
+2
-0
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/ArchiveHadoopQueue.java
...rocessplatform/service/processing/ArchiveHadoopQueue.java
+388
-0
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/ThisApplication.java
...x/processplatform/service/processing/ThisApplication.java
+6
-0
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/UpdateTableQueue.java
.../processplatform/service/processing/UpdateTableQueue.java
+11
-8
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/end/EndProcessor.java
...atform/service/processing/processor/end/EndProcessor.java
+44
-19
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/schedule/ArchiveHadoop.java
...ssplatform/service/processing/schedule/ArchiveHadoop.java
+25
-0
未找到文件。
o2server/pom.xml
浏览文件 @
10ba7bd1
...
@@ -1070,7 +1070,7 @@
...
@@ -1070,7 +1070,7 @@
<dependency>
<dependency>
<groupId>
org.apache.hadoop
</groupId>
<groupId>
org.apache.hadoop
</groupId>
<artifactId>
hadoop-client
</artifactId>
<artifactId>
hadoop-client
</artifactId>
<version>
3.3.
1
</version>
<version>
3.3.
2
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
com.sun.mail
</groupId>
<groupId>
com.sun.mail
</groupId>
...
...
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Message.java
浏览文件 @
10ba7bd1
...
@@ -131,11 +131,27 @@ public class Message extends GsonPropertyObject {
...
@@ -131,11 +131,27 @@ public class Message extends GsonPropertyObject {
}
}
public
static
Consumer
concreteConsumer
(
String
type
)
{
public
static
Consumer
concreteConsumer
(
String
type
)
{
switch
(
Objects
.
toString
(
type
,
""
))
{
switch
(
StringUtils
.
lowerCase
(
Objects
.
toString
(
type
,
""
)))
{
case
MessageConnector
.
CONSUME_WS
:
return
new
WsConsumer
();
case
MessageConnector
.
CONSUME_PMS_INNER
:
return
new
PmsinnerConsumer
();
case
MessageConnector
.
CONSUME_CALENDAR
:
return
new
CalendarConsumer
();
case
MessageConnector
.
CONSUME_DINGDING
:
return
new
DingdingConsumer
();
case
MessageConnector
.
CONSUME_WELINK
:
return
new
WelinkConsumer
();
case
MessageConnector
.
CONSUME_ZHENGWUDINGDING
:
return
new
ZhengwudingdingConsumer
();
case
MessageConnector
.
CONSUME_QIYEWEIXIN
:
return
new
QiyeweixinConsumer
();
case
MessageConnector
.
CONSUME_MPWEIXIN
:
return
new
MpweixinConsumer
();
case
MessageConnector
.
CONSUME_KAFKA
:
case
MessageConnector
.
CONSUME_KAFKA
:
return
new
KafkaConsumer
();
return
new
KafkaConsumer
();
case
MessageConnector
.
CONSUME_ACTIVEMQ
:
case
MessageConnector
.
CONSUME_ACTIVEMQ
:
return
new
Active
M
qConsumer
();
return
new
Active
m
qConsumer
();
case
MessageConnector
.
CONSUME_RESTFUL
:
case
MessageConnector
.
CONSUME_RESTFUL
:
return
new
RestfulConsumer
();
return
new
RestfulConsumer
();
case
MessageConnector
.
CONSUME_MAIL
:
case
MessageConnector
.
CONSUME_MAIL
:
...
@@ -153,6 +169,86 @@ public class Message extends GsonPropertyObject {
...
@@ -153,6 +169,86 @@ public class Message extends GsonPropertyObject {
}
}
}
}
public
static
class
WsConsumer
extends
Consumer
{
private
static
final
long
serialVersionUID
=
8702816982685612136L
;
public
WsConsumer
()
{
super
(
MessageConnector
.
CONSUME_WS
,
true
);
}
}
public
static
class
PmsinnerConsumer
extends
Consumer
{
private
static
final
long
serialVersionUID
=
-
1246633610717846231L
;
public
PmsinnerConsumer
()
{
super
(
MessageConnector
.
CONSUME_PMS_INNER
,
true
);
}
}
public
static
class
CalendarConsumer
extends
Consumer
{
private
static
final
long
serialVersionUID
=
-
1453591270935170682L
;
public
CalendarConsumer
()
{
super
(
MessageConnector
.
CONSUME_CALENDAR
,
false
);
}
}
public
static
class
DingdingConsumer
extends
Consumer
{
private
static
final
long
serialVersionUID
=
-
2273422698767839910L
;
public
DingdingConsumer
()
{
super
(
MessageConnector
.
CONSUME_DINGDING
,
true
);
}
}
public
static
class
WelinkConsumer
extends
Consumer
{
private
static
final
long
serialVersionUID
=
-
5796171639649346866L
;
public
WelinkConsumer
()
{
super
(
MessageConnector
.
CONSUME_WELINK
,
true
);
}
}
public
static
class
ZhengwudingdingConsumer
extends
Consumer
{
private
static
final
long
serialVersionUID
=
-
1805579720843025600L
;
public
ZhengwudingdingConsumer
()
{
super
(
MessageConnector
.
CONSUME_ZHENGWUDINGDING
,
true
);
}
}
public
static
class
QiyeweixinConsumer
extends
Consumer
{
private
static
final
long
serialVersionUID
=
-
3957612144231971034L
;
public
QiyeweixinConsumer
()
{
super
(
MessageConnector
.
CONSUME_QIYEWEIXIN
,
true
);
}
}
public
static
class
MpweixinConsumer
extends
Consumer
{
private
static
final
long
serialVersionUID
=
-
9116678126784563430L
;
public
MpweixinConsumer
()
{
super
(
MessageConnector
.
CONSUME_MPWEIXIN
,
true
);
}
}
public
static
class
ApiConsumer
extends
Consumer
{
public
static
class
ApiConsumer
extends
Consumer
{
private
static
final
long
serialVersionUID
=
-
4452633351300698272L
;
private
static
final
long
serialVersionUID
=
-
4452633351300698272L
;
...
@@ -270,7 +366,7 @@ public class Message extends GsonPropertyObject {
...
@@ -270,7 +366,7 @@ public class Message extends GsonPropertyObject {
}
}
private
static
final
String
DEFAULT_DRIVERCLASS
=
"com.mysql.cj.jdbc.Driver"
;
private
static
final
String
DEFAULT_DRIVERCLASS
=
"com.mysql.cj.jdbc.Driver"
;
private
static
final
String
DEFAULT_URL
=
"jdbc:mysql://
127.0.0.1:3306/TEST?autoReconnect=true&allowPublicKeyRetrieval=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
"
;
private
static
final
String
DEFAULT_URL
=
"jdbc:mysql://"
;
private
static
final
String
DEFAULT_USERNAME
=
"root"
;
private
static
final
String
DEFAULT_USERNAME
=
"root"
;
private
static
final
String
DEFAULT_PASSWORD
=
"password"
;
private
static
final
String
DEFAULT_PASSWORD
=
"password"
;
private
static
final
String
DEFAULT_CATALOG
=
""
;
private
static
final
String
DEFAULT_CATALOG
=
""
;
...
@@ -386,7 +482,7 @@ public class Message extends GsonPropertyObject {
...
@@ -386,7 +482,7 @@ public class Message extends GsonPropertyObject {
this
.
path
=
DEFAULT_PATH
;
this
.
path
=
DEFAULT_PATH
;
}
}
private
static
final
String
DEFAULT_FS_DEFAULTFS
=
"hdfs://
127.0.0.1:9000
"
;
private
static
final
String
DEFAULT_FS_DEFAULTFS
=
"hdfs://"
;
private
static
final
String
DEFAULT_USERNAME
=
""
;
private
static
final
String
DEFAULT_USERNAME
=
""
;
private
static
final
String
DEFAULT_PATH
=
""
;
private
static
final
String
DEFAULT_PATH
=
""
;
...
@@ -426,7 +522,7 @@ public class Message extends GsonPropertyObject {
...
@@ -426,7 +522,7 @@ public class Message extends GsonPropertyObject {
this
.
password
=
DEFAULT_PASSWORD
;
this
.
password
=
DEFAULT_PASSWORD
;
}
}
private
static
final
String
DEFAULT_BOOTSTRAPSERVERS
=
"
127.0.0.1:9092
"
;
private
static
final
String
DEFAULT_BOOTSTRAPSERVERS
=
""
;
private
static
final
String
DEFAULT_TOPIC
=
"o2oa"
;
private
static
final
String
DEFAULT_TOPIC
=
"o2oa"
;
private
static
final
String
DEFAULT_SECURITYPROTOCOL
=
"SASL_PLAINTEXT"
;
private
static
final
String
DEFAULT_SECURITYPROTOCOL
=
"SASL_PLAINTEXT"
;
private
static
final
String
DEFAULT_SASLMECHANISM
=
"PLAIN"
;
private
static
final
String
DEFAULT_SASLMECHANISM
=
"PLAIN"
;
...
@@ -477,11 +573,11 @@ public class Message extends GsonPropertyObject {
...
@@ -477,11 +573,11 @@ public class Message extends GsonPropertyObject {
}
}
public
static
class
Active
M
qConsumer
extends
Consumer
{
public
static
class
Active
m
qConsumer
extends
Consumer
{
private
static
final
long
serialVersionUID
=
-
7469816290407400176L
;
private
static
final
long
serialVersionUID
=
-
7469816290407400176L
;
public
Active
M
qConsumer
()
{
public
Active
m
qConsumer
()
{
super
(
MessageConnector
.
CONSUME_ACTIVEMQ
,
false
);
super
(
MessageConnector
.
CONSUME_ACTIVEMQ
,
false
);
this
.
username
=
DEFAULT_USERNAME
;
this
.
username
=
DEFAULT_USERNAME
;
this
.
password
=
DEFAULT_PASSWORD
;
this
.
password
=
DEFAULT_PASSWORD
;
...
...
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Messages.java
浏览文件 @
10ba7bd1
...
@@ -6,18 +6,28 @@ import java.util.List;
...
@@ -6,18 +6,28 @@ import java.util.List;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.concurrent.ConcurrentSkipListMap
;
import
java.util.concurrent.ConcurrentSkipListMap
;
import
org.apache.commons.lang3.StringUtils
;
import
com.google.gson.Gson
;
import
com.google.gson.Gson
;
import
com.google.gson.JsonElement
;
import
com.google.gson.JsonElement
;
import
com.google.gson.JsonObject
;
import
com.google.gson.JsonObject
;
import
com.x.base.core.project.config.Message.Active
M
qConsumer
;
import
com.x.base.core.project.config.Message.Active
m
qConsumer
;
import
com.x.base.core.project.config.Message.ApiConsumer
;
import
com.x.base.core.project.config.Message.ApiConsumer
;
import
com.x.base.core.project.config.Message.CalendarConsumer
;
import
com.x.base.core.project.config.Message.Consumer
;
import
com.x.base.core.project.config.Message.Consumer
;
import
com.x.base.core.project.config.Message.DingdingConsumer
;
import
com.x.base.core.project.config.Message.HadoopConsumer
;
import
com.x.base.core.project.config.Message.HadoopConsumer
;
import
com.x.base.core.project.config.Message.JdbcConsumer
;
import
com.x.base.core.project.config.Message.JdbcConsumer
;
import
com.x.base.core.project.config.Message.KafkaConsumer
;
import
com.x.base.core.project.config.Message.KafkaConsumer
;
import
com.x.base.core.project.config.Message.MailConsumer
;
import
com.x.base.core.project.config.Message.MailConsumer
;
import
com.x.base.core.project.config.Message.MpweixinConsumer
;
import
com.x.base.core.project.config.Message.PmsinnerConsumer
;
import
com.x.base.core.project.config.Message.QiyeweixinConsumer
;
import
com.x.base.core.project.config.Message.RestfulConsumer
;
import
com.x.base.core.project.config.Message.RestfulConsumer
;
import
com.x.base.core.project.config.Message.TableConsumer
;
import
com.x.base.core.project.config.Message.TableConsumer
;
import
com.x.base.core.project.config.Message.WelinkConsumer
;
import
com.x.base.core.project.config.Message.WsConsumer
;
import
com.x.base.core.project.config.Message.ZhengwudingdingConsumer
;
import
com.x.base.core.project.gson.XGsonBuilder
;
import
com.x.base.core.project.gson.XGsonBuilder
;
import
com.x.base.core.project.message.MessageConnector
;
import
com.x.base.core.project.message.MessageConnector
;
...
@@ -33,10 +43,10 @@ public class Messages extends ConcurrentSkipListMap<String, Message> {
...
@@ -33,10 +43,10 @@ public class Messages extends ConcurrentSkipListMap<String, Message> {
MessageConnector
.
CONSUME_API
,
MessageConnector
.
CONSUME_JDBC
,
MessageConnector
.
CONSUME_TABLE
,
MessageConnector
.
CONSUME_API
,
MessageConnector
.
CONSUME_JDBC
,
MessageConnector
.
CONSUME_TABLE
,
MessageConnector
.
CONSUME_HADOOP
);
MessageConnector
.
CONSUME_HADOOP
);
private
static
final
Message
MESSAGE_
INNER
=
new
Message
(
MessageConnector
.
CONSUME_WS
,
private
static
final
Message
MESSAGE_
NOTICE
=
new
Message
(
MessageConnector
.
CONSUME_WS
,
MessageConnector
.
CONSUME_PMS_INNER
,
MessageConnector
.
CONSUME_
CALENDAR
,
MessageConnector
.
CONSUME_DINGDING
,
MessageConnector
.
CONSUME_PMS_INNER
,
MessageConnector
.
CONSUME_
DINGDING
,
MessageConnector
.
CONSUME_WELINK
,
MessageConnector
.
CONSUME_
WELINK
,
MessageConnector
.
CONSUME_ZHENGWUDINGDING
,
MessageConnector
.
CONSUME_
ZHENGWUDINGDING
,
MessageConnector
.
CONSUME_QIYEWEIXIN
,
MessageConnector
.
CONSUME_
QIYEWEIXIN
,
MessageConnector
.
CONSUME_
MPWEIXIN
);
MessageConnector
.
CONSUME_MPWEIXIN
);
private
static
final
Message
MESSAGE_OUTER
=
new
Message
(
MessageConnector
.
CONSUME_KAFKA
,
private
static
final
Message
MESSAGE_OUTER
=
new
Message
(
MessageConnector
.
CONSUME_KAFKA
,
MessageConnector
.
CONSUME_ACTIVEMQ
,
MessageConnector
.
CONSUME_RESTFUL
,
MessageConnector
.
CONSUME_MAIL
,
MessageConnector
.
CONSUME_ACTIVEMQ
,
MessageConnector
.
CONSUME_RESTFUL
,
MessageConnector
.
CONSUME_MAIL
,
...
@@ -93,9 +103,9 @@ public class Messages extends ConcurrentSkipListMap<String, Message> {
...
@@ -93,9 +103,9 @@ public class Messages extends ConcurrentSkipListMap<String, Message> {
o
.
put
(
MessageConnector
.
TYPE_TEAMWORK_TASKUPDATE
,
MESSAGE_ALL
.
cloneThenSetDescription
(
"工作管理任务更新"
));
o
.
put
(
MessageConnector
.
TYPE_TEAMWORK_TASKUPDATE
,
MESSAGE_ALL
.
cloneThenSetDescription
(
"工作管理任务更新"
));
o
.
put
(
MessageConnector
.
TYPE_TEAMWORK_TASKDELETE
,
MESSAGE_ALL
.
cloneThenSetDescription
(
"工作管理任务删除"
));
o
.
put
(
MessageConnector
.
TYPE_TEAMWORK_TASKDELETE
,
MESSAGE_ALL
.
cloneThenSetDescription
(
"工作管理任务删除"
));
o
.
put
(
MessageConnector
.
TYPE_TEAMWORK_TASKOVERTIME
,
MESSAGE_ALL
.
cloneThenSetDescription
(
"工作管理任务超时"
));
o
.
put
(
MessageConnector
.
TYPE_TEAMWORK_TASKOVERTIME
,
MESSAGE_ALL
.
cloneThenSetDescription
(
"工作管理任务超时"
));
o
.
put
(
MessageConnector
.
TYPE_TEAMWORK_CHAT
,
MESSAGE_
INNER
.
cloneThenSetDescription
(
"工作管理聊天"
));
o
.
put
(
MessageConnector
.
TYPE_TEAMWORK_CHAT
,
MESSAGE_
NOTICE
.
cloneThenSetDescription
(
"工作管理聊天"
));
o
.
put
(
MessageConnector
.
TYPE_CMS_PUBLISH
,
MESSAGE_OUTER
.
cloneThenSetDescription
(
"内容管理发布"
));
o
.
put
(
MessageConnector
.
TYPE_CMS_PUBLISH
,
MESSAGE_OUTER
.
cloneThenSetDescription
(
"内容管理发布"
));
o
.
put
(
MessageConnector
.
TYPE_CMS_PUBLISH_TO_CREATOR
,
MESSAGE_
INNER
.
cloneThenSetDescription
(
"内容管理发布创建者通知"
));
o
.
put
(
MessageConnector
.
TYPE_CMS_PUBLISH_TO_CREATOR
,
MESSAGE_
NOTICE
.
cloneThenSetDescription
(
"内容管理发布创建者通知"
));
o
.
put
(
MessageConnector
.
TYPE_BBS_SUBJECTCREATE
,
MESSAGE_ALL
.
cloneThenSetDescription
(
"论坛创建贴子"
));
o
.
put
(
MessageConnector
.
TYPE_BBS_SUBJECTCREATE
,
MESSAGE_ALL
.
cloneThenSetDescription
(
"论坛创建贴子"
));
o
.
put
(
MessageConnector
.
TYPE_BBS_REPLYCREATE
,
MESSAGE_ALL
.
cloneThenSetDescription
(
"论坛创建回复"
));
o
.
put
(
MessageConnector
.
TYPE_BBS_REPLYCREATE
,
MESSAGE_ALL
.
cloneThenSetDescription
(
"论坛创建回复"
));
o
.
put
(
MessageConnector
.
TYPE_MIND_FILESEND
,
MESSAGE_ALL
.
cloneThenSetDescription
(
"脑图发送"
));
o
.
put
(
MessageConnector
.
TYPE_MIND_FILESEND
,
MESSAGE_ALL
.
cloneThenSetDescription
(
"脑图发送"
));
...
@@ -130,12 +140,36 @@ public class Messages extends ConcurrentSkipListMap<String, Message> {
...
@@ -130,12 +140,36 @@ public class Messages extends ConcurrentSkipListMap<String, Message> {
JsonObject
jsonObject
=
jsonElement
.
getAsJsonObject
();
JsonObject
jsonObject
=
jsonElement
.
getAsJsonObject
();
JsonElement
typeElement
=
jsonObject
.
get
(
Message
.
Consumer
.
FIELD_TYPE
);
JsonElement
typeElement
=
jsonObject
.
get
(
Message
.
Consumer
.
FIELD_TYPE
);
if
(
null
!=
typeElement
&&
typeElement
.
isJsonPrimitive
())
{
if
(
null
!=
typeElement
&&
typeElement
.
isJsonPrimitive
())
{
switch
(
typeElement
.
getAsString
())
{
switch
(
StringUtils
.
lowerCase
(
typeElement
.
getAsString
()))
{
case
MessageConnector
.
CONSUME_WS
:
list
.
add
(
gson
.
fromJson
(
jsonElement
,
WsConsumer
.
class
));
break
;
case
MessageConnector
.
CONSUME_PMS_INNER
:
list
.
add
(
gson
.
fromJson
(
jsonElement
,
PmsinnerConsumer
.
class
));
break
;
case
MessageConnector
.
CONSUME_CALENDAR
:
list
.
add
(
gson
.
fromJson
(
jsonElement
,
CalendarConsumer
.
class
));
break
;
case
MessageConnector
.
CONSUME_DINGDING
:
list
.
add
(
gson
.
fromJson
(
jsonElement
,
DingdingConsumer
.
class
));
break
;
case
MessageConnector
.
CONSUME_WELINK
:
list
.
add
(
gson
.
fromJson
(
jsonElement
,
WelinkConsumer
.
class
));
break
;
case
MessageConnector
.
CONSUME_ZHENGWUDINGDING
:
list
.
add
(
gson
.
fromJson
(
jsonElement
,
ZhengwudingdingConsumer
.
class
));
break
;
case
MessageConnector
.
CONSUME_QIYEWEIXIN
:
list
.
add
(
gson
.
fromJson
(
jsonElement
,
QiyeweixinConsumer
.
class
));
break
;
case
MessageConnector
.
CONSUME_MPWEIXIN
:
list
.
add
(
gson
.
fromJson
(
jsonElement
,
MpweixinConsumer
.
class
));
break
;
case
MessageConnector
.
CONSUME_KAFKA
:
case
MessageConnector
.
CONSUME_KAFKA
:
list
.
add
(
gson
.
fromJson
(
jsonElement
,
KafkaConsumer
.
class
));
list
.
add
(
gson
.
fromJson
(
jsonElement
,
KafkaConsumer
.
class
));
break
;
break
;
case
MessageConnector
.
CONSUME_ACTIVEMQ
:
case
MessageConnector
.
CONSUME_ACTIVEMQ
:
list
.
add
(
gson
.
fromJson
(
jsonElement
,
Active
M
qConsumer
.
class
));
list
.
add
(
gson
.
fromJson
(
jsonElement
,
Active
m
qConsumer
.
class
));
break
;
break
;
case
MessageConnector
.
CONSUME_RESTFUL
:
case
MessageConnector
.
CONSUME_RESTFUL
:
list
.
add
(
gson
.
fromJson
(
jsonElement
,
RestfulConsumer
.
class
));
list
.
add
(
gson
.
fromJson
(
jsonElement
,
RestfulConsumer
.
class
));
...
...
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/ProcessPlatform.java
浏览文件 @
10ba7bd1
...
@@ -186,6 +186,9 @@ public class ProcessPlatform extends ConfigObject {
...
@@ -186,6 +186,9 @@ public class ProcessPlatform extends ConfigObject {
@FieldDescribe
(
"同步到自建表设置."
)
@FieldDescribe
(
"同步到自建表设置."
)
private
UpdateTable
updateTable
;
private
UpdateTable
updateTable
;
@FieldDescribe
(
"归档到Hadoop."
)
private
ArchiveHadoop
archiveHadoop
;
@FieldDescribe
(
"事件扩充."
)
@FieldDescribe
(
"事件扩充."
)
private
ExtensionEvents
extensionEvents
;
private
ExtensionEvents
extensionEvents
;
...
@@ -223,8 +226,8 @@ public class ProcessPlatform extends ConfigObject {
...
@@ -223,8 +226,8 @@ public class ProcessPlatform extends ConfigObject {
return
this
.
attachmentConfig
==
null
?
new
AttachmentConfig
()
:
attachmentConfig
;
return
this
.
attachmentConfig
==
null
?
new
AttachmentConfig
()
:
attachmentConfig
;
}
}
public
void
setAttachmentConfig
(
AttachmentConfig
attachmentConfig
)
{
public
ArchiveHadoop
getArchiveHadoop
(
)
{
this
.
attachmentConfig
=
attachmentConfig
;
return
this
.
archiveHadoop
==
null
?
new
ArchiveHadoop
()
:
this
.
archiveHadoop
;
}
}
public
Urge
getUrge
()
{
public
Urge
getUrge
()
{
...
@@ -306,13 +309,6 @@ public class ProcessPlatform extends ConfigObject {
...
@@ -306,13 +309,6 @@ public class ProcessPlatform extends ConfigObject {
return
BooleanUtils
.
isTrue
(
this
.
enable
);
return
BooleanUtils
.
isTrue
(
this
.
enable
);
}
}
public
void
setCron
(
String
cron
)
{
this
.
cron
=
cron
;
}
public
void
setEnable
(
Boolean
enable
)
{
this
.
enable
=
enable
;
}
}
}
public
static
class
Expire
extends
ConfigObject
{
public
static
class
Expire
extends
ConfigObject
{
...
@@ -637,14 +633,6 @@ public class ProcessPlatform extends ConfigObject {
...
@@ -637,14 +633,6 @@ public class ProcessPlatform extends ConfigObject {
return
(
count
==
null
||
count
<
0
)
?
DEFAULT_COUNT
:
this
.
count
;
return
(
count
==
null
||
count
<
0
)
?
DEFAULT_COUNT
:
this
.
count
;
}
}
public
void
setIntervalMinutes
(
Integer
intervalMinutes
)
{
this
.
intervalMinutes
=
intervalMinutes
;
}
public
void
setCount
(
Integer
count
)
{
this
.
count
=
count
;
}
}
}
public
static
class
AttachmentConfig
extends
ConfigObject
{
public
static
class
AttachmentConfig
extends
ConfigObject
{
...
@@ -670,25 +658,14 @@ public class ProcessPlatform extends ConfigObject {
...
@@ -670,25 +658,14 @@ public class ProcessPlatform extends ConfigObject {
return
fileSize
;
return
fileSize
;
}
}
public
void
setFileSize
(
Integer
fileSize
)
{
this
.
fileSize
=
fileSize
;
}
public
List
<
String
>
getFileTypeIncludes
()
{
public
List
<
String
>
getFileTypeIncludes
()
{
return
fileTypeIncludes
;
return
fileTypeIncludes
;
}
}
public
void
setFileTypeIncludes
(
List
<
String
>
fileTypeIncludes
)
{
this
.
fileTypeIncludes
=
fileTypeIncludes
;
}
public
List
<
String
>
getFileTypeExcludes
()
{
public
List
<
String
>
getFileTypeExcludes
()
{
return
fileTypeExcludes
;
return
fileTypeExcludes
;
}
}
public
void
setFileTypeExcludes
(
List
<
String
>
fileTypeExcludes
)
{
this
.
fileTypeExcludes
=
fileTypeExcludes
;
}
}
}
public
static
class
ExtensionEvents
{
public
static
class
ExtensionEvents
{
...
@@ -821,50 +798,26 @@ public class ProcessPlatform extends ConfigObject {
...
@@ -821,50 +798,26 @@ public class ProcessPlatform extends ConfigObject {
return
enable
;
return
enable
;
}
}
public
void
setEnable
(
Boolean
enable
)
{
this
.
enable
=
enable
;
}
public
List
<
String
>
getApplications
()
{
public
List
<
String
>
getApplications
()
{
return
applications
;
return
applications
;
}
}
public
void
setApplications
(
List
<
String
>
applications
)
{
this
.
applications
=
applications
;
}
public
List
<
String
>
getProcesses
()
{
public
List
<
String
>
getProcesses
()
{
return
processes
;
return
processes
;
}
}
public
void
setProcesses
(
List
<
String
>
processes
)
{
this
.
processes
=
processes
;
}
public
List
<
String
>
getActivities
()
{
public
List
<
String
>
getActivities
()
{
return
activities
;
return
activities
;
}
}
public
void
setActivities
(
List
<
String
>
activities
)
{
this
.
activities
=
activities
;
}
public
String
getUrl
()
{
public
String
getUrl
()
{
return
url
;
return
url
;
}
}
public
void
setUrl
(
String
url
)
{
this
.
url
=
url
;
}
public
String
getCustom
()
{
public
String
getCustom
()
{
return
custom
;
return
custom
;
}
}
public
void
setCustom
(
String
custom
)
{
this
.
custom
=
custom
;
}
}
}
public
static
class
WorkCompletedExtensionEvents
extends
ArrayList
<
WorkCompletedExtensionEvent
>
{
public
static
class
WorkCompletedExtensionEvents
extends
ArrayList
<
WorkCompletedExtensionEvent
>
{
...
@@ -906,59 +859,45 @@ public class ProcessPlatform extends ConfigObject {
...
@@ -906,59 +859,45 @@ public class ProcessPlatform extends ConfigObject {
return
enable
;
return
enable
;
}
}
public
void
setEnable
(
Boolean
enable
)
{
this
.
enable
=
enable
;
}
public
List
<
String
>
getApplications
()
{
public
List
<
String
>
getApplications
()
{
return
applications
;
return
applications
;
}
}
public
void
setApplications
(
List
<
String
>
applications
)
{
this
.
applications
=
applications
;
}
public
List
<
String
>
getProcesses
()
{
public
List
<
String
>
getProcesses
()
{
return
processes
;
return
processes
;
}
}
public
void
setProcesses
(
List
<
String
>
processes
)
{
this
.
processes
=
processes
;
}
public
String
getUrl
()
{
public
String
getUrl
()
{
return
url
;
return
url
;
}
}
public
void
setUrl
(
String
url
)
{
this
.
url
=
url
;
}
public
String
getCustom
()
{
public
String
getCustom
()
{
return
custom
;
return
custom
;
}
}
public
void
setCustom
(
String
custom
)
{
this
.
custom
=
custom
;
}
}
}
public
static
class
UpdateTable
extends
ConfigObject
{
public
static
class
ArchiveHadoop
extends
ConfigObject
{
private
static
final
long
serialVersionUID
=
-
7066262450518673067
L
;
private
static
final
long
serialVersionUID
=
-
8274136904009320770
L
;
public
static
UpdateTable
defaultInstance
()
{
public
static
ArchiveHadoop
defaultInstance
()
{
return
new
UpdateTable
();
return
new
ArchiveHadoop
();
}
}
public
static
final
Boolean
DEFAULT_ENABLE
=
true
;
public
ArchiveHadoop
()
{
this
.
enable
=
DEFAULT_ENABLE
;
this
.
cron
=
DEFAULT_CRON
;
this
.
fsDefaultFS
=
DEFAULT_FS_DEFAULTFS
;
this
.
username
=
DEFAULT_USERNAME
;
this
.
path
=
DEFAULT_PATH
;
}
private
static
final
Boolean
DEFAULT_ENABLE
=
false
;
public
static
final
String
DEFAULT_CRON
=
"20 20 * * * ?"
;
public
static
final
String
DEFAULT_CRON
=
"20 20 * * * ?"
;
private
static
final
String
DEFAULT_FS_DEFAULTFS
=
"hdfs://"
;
public
static
final
Integer
DEFAULT_RETRYMINUTES
=
20
;
private
static
final
String
DEFAULT_USERNAME
=
""
;
private
static
final
String
DEFAULT_PATH
=
""
;
public
static
final
Integer
DEFAULT_THRESHOLDMINUTES
=
60
*
24
*
7
;
@FieldDescribe
(
"是否启用"
)
@FieldDescribe
(
"是否启用"
)
private
Boolean
enable
=
DEFAULT_ENABLE
;
private
Boolean
enable
=
DEFAULT_ENABLE
;
...
@@ -966,11 +905,14 @@ public class ProcessPlatform extends ConfigObject {
...
@@ -966,11 +905,14 @@ public class ProcessPlatform extends ConfigObject {
@FieldDescribe
(
"定时cron表达式."
)
@FieldDescribe
(
"定时cron表达式."
)
private
String
cron
=
DEFAULT_CRON
;
private
String
cron
=
DEFAULT_CRON
;
@FieldDescribe
(
"
重试间隔(分钟),默认20分钟
."
)
@FieldDescribe
(
"
hadoop地址
."
)
private
Integer
retryMinutes
=
DEFAULT_RETRYMINUTE
S
;
private
String
fsDefaultF
S
;
@FieldDescribe
(
"最大保留期限(分钟),默认10080分钟(7天)."
)
@FieldDescribe
(
"hadoop用户名."
)
private
Integer
thresholdMinutes
=
DEFAULT_THRESHOLDMINUTES
;
private
String
username
;
@FieldDescribe
(
"fs路径前缀."
)
private
String
path
;
public
String
getCron
()
{
public
String
getCron
()
{
if
(
StringUtils
.
isNotEmpty
(
this
.
cron
)
&&
CronExpression
.
isValidExpression
(
this
.
cron
))
{
if
(
StringUtils
.
isNotEmpty
(
this
.
cron
)
&&
CronExpression
.
isValidExpression
(
this
.
cron
))
{
...
@@ -984,28 +926,47 @@ public class ProcessPlatform extends ConfigObject {
...
@@ -984,28 +926,47 @@ public class ProcessPlatform extends ConfigObject {
return
BooleanUtils
.
isTrue
(
this
.
enable
);
return
BooleanUtils
.
isTrue
(
this
.
enable
);
}
}
public
void
setCron
(
String
cron
)
{
public
String
getFsDefaultFS
(
)
{
this
.
cron
=
cron
;
return
StringUtils
.
isEmpty
(
this
.
fsDefaultFS
)
?
DEFAULT_FS_DEFAULTFS
:
this
.
fsDefaultFS
;
}
}
public
void
setEnable
(
Boolean
enable
)
{
public
String
getUsername
(
)
{
this
.
enable
=
enabl
e
;
return
StringUtils
.
isEmpty
(
this
.
username
)
?
DEFAULT_USERNAME
:
this
.
usernam
e
;
}
}
public
Integer
getRetryMinutes
()
{
public
String
getPath
()
{
return
NumberTools
.
nullOrLessThan
(
this
.
retryMinutes
,
0
)
?
DEFAULT_RETRYMINUTES
:
this
.
retryMinutes
;
return
StringUtils
.
isEmpty
(
this
.
path
)
?
DEFAULT_PATH
:
this
.
path
;
}
}
}
public
void
setRetryMinutes
(
Integer
retryMinutes
)
{
public
static
class
UpdateTable
extends
ConfigObject
{
this
.
retryMinutes
=
retryMinutes
;
private
static
final
long
serialVersionUID
=
-
7066262450518673067L
;
public
static
UpdateTable
defaultInstance
()
{
return
new
UpdateTable
();
}
}
public
Integer
getThresholdMinutes
()
{
public
static
final
Boolean
DEFAULT_ENABLE
=
true
;
return
NumberTools
.
nullOrLessThan
(
this
.
thresholdMinutes
,
0
)
?
DEFAULT_THRESHOLDMINUTES
:
this
.
thresholdMinutes
;
public
static
final
String
DEFAULT_CRON
=
"20 20 * * * ?"
;
@FieldDescribe
(
"是否启用"
)
private
Boolean
enable
=
DEFAULT_ENABLE
;
@FieldDescribe
(
"定时cron表达式."
)
private
String
cron
=
DEFAULT_CRON
;
public
String
getCron
()
{
if
(
StringUtils
.
isNotEmpty
(
this
.
cron
)
&&
CronExpression
.
isValidExpression
(
this
.
cron
))
{
return
this
.
cron
;
}
else
{
return
DEFAULT_CRON
;
}
}
}
public
void
setThresholdMinutes
(
Integer
thresholdMinutes
)
{
public
Boolean
getEnable
(
)
{
this
.
thresholdMinutes
=
thresholdMinutes
;
return
BooleanUtils
.
isTrue
(
this
.
enable
)
;
}
}
}
}
...
...
o2server/x_base_core_project/src/main/java/com/x/base/core/project/message/MessageConnector.java
浏览文件 @
10ba7bd1
...
@@ -191,7 +191,7 @@ public class MessageConnector {
...
@@ -191,7 +191,7 @@ public class MessageConnector {
public
static
final
String
CONSUME_WELINK
=
"welink"
;
public
static
final
String
CONSUME_WELINK
=
"welink"
;
public
static
final
String
CONSUME_ZHENGWUDINGDING
=
"zhengwu
D
ingding"
;
public
static
final
String
CONSUME_ZHENGWUDINGDING
=
"zhengwu
d
ingding"
;
public
static
final
String
CONSUME_QIYEWEIXIN
=
"qiyeweixin"
;
public
static
final
String
CONSUME_QIYEWEIXIN
=
"qiyeweixin"
;
...
@@ -199,7 +199,7 @@ public class MessageConnector {
...
@@ -199,7 +199,7 @@ public class MessageConnector {
public
static
final
String
CONSUME_KAFKA
=
"kafka"
;
public
static
final
String
CONSUME_KAFKA
=
"kafka"
;
public
static
final
String
CONSUME_ACTIVEMQ
=
"active
M
q"
;
public
static
final
String
CONSUME_ACTIVEMQ
=
"active
m
q"
;
// restful类型
// restful类型
public
static
final
String
CONSUME_RESTFUL
=
"restful"
;
public
static
final
String
CONSUME_RESTFUL
=
"restful"
;
// 邮件类型
// 邮件类型
...
...
o2server/x_message_assemble_communicate/pom.xml
浏览文件 @
10ba7bd1
...
@@ -25,16 +25,15 @@
...
@@ -25,16 +25,15 @@
<groupId>
o2oa
</groupId>
<groupId>
o2oa
</groupId>
<artifactId>
x_message_core_entity
</artifactId>
<artifactId>
x_message_core_entity
</artifactId>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
org.apache.kafka
</groupId>
<groupId>
org.apache.kafka
</groupId>
<artifactId>
kafka-clients
</artifactId>
<artifactId>
kafka-clients
</artifactId>
<version>
2.6
.0
</version>
<version>
3.1
.0
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
org.apache.activemq
</groupId>
<groupId>
org.apache.activemq
</groupId>
<artifactId>
activemq-client
</artifactId>
<artifactId>
activemq-client
</artifactId>
<version>
5.1
4.5
</version>
<version>
5.1
7.0
</version>
<exclusions>
<exclusions>
<exclusion>
<exclusion>
<groupId>
org.apache.geronimo.specs
</groupId>
<groupId>
org.apache.geronimo.specs
</groupId>
...
...
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/Active
M
qConsumeQueue.java
→
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/Active
m
qConsumeQueue.java
浏览文件 @
10ba7bd1
...
@@ -26,7 +26,7 @@ import com.google.gson.Gson;
...
@@ -26,7 +26,7 @@ import com.google.gson.Gson;
import
com.x.base.core.container.EntityManagerContainer
;
import
com.x.base.core.container.EntityManagerContainer
;
import
com.x.base.core.container.factory.EntityManagerContainerFactory
;
import
com.x.base.core.container.factory.EntityManagerContainerFactory
;
import
com.x.base.core.entity.JpaObject_
;
import
com.x.base.core.entity.JpaObject_
;
import
com.x.base.core.project.config.Message.Active
M
qConsumer
;
import
com.x.base.core.project.config.Message.Active
m
qConsumer
;
import
com.x.base.core.project.gson.XGsonBuilder
;
import
com.x.base.core.project.gson.XGsonBuilder
;
import
com.x.base.core.project.logger.Logger
;
import
com.x.base.core.project.logger.Logger
;
import
com.x.base.core.project.logger.LoggerFactory
;
import
com.x.base.core.project.logger.LoggerFactory
;
...
@@ -36,14 +36,14 @@ import com.x.base.core.project.tools.ListTools;
...
@@ -36,14 +36,14 @@ import com.x.base.core.project.tools.ListTools;
import
com.x.message.core.entity.Message
;
import
com.x.message.core.entity.Message
;
import
com.x.message.core.entity.Message_
;
import
com.x.message.core.entity.Message_
;
public
class
Active
M
qConsumeQueue
extends
AbstractQueue
<
Message
>
{
public
class
Active
m
qConsumeQueue
extends
AbstractQueue
<
Message
>
{
private
static
final
Logger
LOGGER
=
LoggerFactory
.
getLogger
(
Active
M
qConsumeQueue
.
class
);
private
static
final
Logger
LOGGER
=
LoggerFactory
.
getLogger
(
Active
m
qConsumeQueue
.
class
);
private
static
final
Gson
gson
=
XGsonBuilder
.
instance
();
private
static
final
Gson
gson
=
XGsonBuilder
.
instance
();
protected
void
execute
(
Message
message
)
throws
Exception
{
protected
void
execute
(
Message
message
)
throws
Exception
{
if
(
null
!=
message
&&
StringUtils
.
isNotEmpty
(
message
.
getItem
())
)
{
if
(
null
!=
message
)
{
update
(
message
);
update
(
message
);
}
}
List
<
String
>
ids
=
listOverStay
();
List
<
String
>
ids
=
listOverStay
();
...
@@ -53,9 +53,7 @@ public class ActiveMqConsumeQueue extends AbstractQueue<Message> {
...
@@ -53,9 +53,7 @@ public class ActiveMqConsumeQueue extends AbstractQueue<Message> {
Optional
<
Message
>
optional
=
find
(
id
);
Optional
<
Message
>
optional
=
find
(
id
);
if
(
optional
.
isPresent
())
{
if
(
optional
.
isPresent
())
{
message
=
optional
.
get
();
message
=
optional
.
get
();
if
(
StringUtils
.
isNotEmpty
(
message
.
getItem
()))
{
update
(
message
);
update
(
message
);
}
}
}
}
}
}
}
...
@@ -72,8 +70,8 @@ public class ActiveMqConsumeQueue extends AbstractQueue<Message> {
...
@@ -72,8 +70,8 @@ public class ActiveMqConsumeQueue extends AbstractQueue<Message> {
private
void
update
(
Message
message
)
{
private
void
update
(
Message
message
)
{
try
{
try
{
Active
M
qConsumer
consumer
=
gson
.
fromJson
(
message
.
getProperties
().
getConsumerJsonElement
(),
Active
m
qConsumer
consumer
=
gson
.
fromJson
(
message
.
getProperties
().
getConsumerJsonElement
(),
Active
M
qConsumer
.
class
);
Active
m
qConsumer
.
class
);
producer
(
message
,
consumer
);
producer
(
message
,
consumer
);
success
(
message
.
getId
());
success
(
message
.
getId
());
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
...
@@ -82,7 +80,7 @@ public class ActiveMqConsumeQueue extends AbstractQueue<Message> {
...
@@ -82,7 +80,7 @@ public class ActiveMqConsumeQueue extends AbstractQueue<Message> {
}
}
}
}
private
void
producer
(
Message
message
,
Active
M
qConsumer
consumer
)
throws
JMSException
{
private
void
producer
(
Message
message
,
Active
m
qConsumer
consumer
)
throws
JMSException
{
ActiveMQConnectionFactory
connectionFactory
;
ActiveMQConnectionFactory
connectionFactory
;
...
@@ -92,7 +90,7 @@ public class ActiveMqConsumeQueue extends AbstractQueue<Message> {
...
@@ -92,7 +90,7 @@ public class ActiveMqConsumeQueue extends AbstractQueue<Message> {
}
else
{
}
else
{
connectionFactory
=
new
ActiveMQConnectionFactory
(
consumer
.
getUrl
());
connectionFactory
=
new
ActiveMQConnectionFactory
(
consumer
.
getUrl
());
}
}
connectionFactory
.
setTrustedPackages
(
ListTools
.
toList
(
Active
M
qConsumeQueue
.
class
.
getPackage
().
getName
()));
connectionFactory
.
setTrustedPackages
(
ListTools
.
toList
(
Active
m
qConsumeQueue
.
class
.
getPackage
().
getName
()));
try
(
Connection
connection
=
connectionFactory
.
createConnection
())
{
try
(
Connection
connection
=
connectionFactory
.
createConnection
())
{
connection
.
start
();
connection
.
start
();
try
(
Session
session
=
connection
.
createSession
(
false
,
Session
.
AUTO_ACKNOWLEDGE
))
{
try
(
Session
session
=
connection
.
createSession
(
false
,
Session
.
AUTO_ACKNOWLEDGE
))
{
...
...
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/ApiConsumeQueue.java
浏览文件 @
10ba7bd1
...
@@ -41,7 +41,7 @@ public class ApiConsumeQueue extends AbstractQueue<Message> {
...
@@ -41,7 +41,7 @@ public class ApiConsumeQueue extends AbstractQueue<Message> {
private
static
Gson
gson
=
XGsonBuilder
.
instance
();
private
static
Gson
gson
=
XGsonBuilder
.
instance
();
protected
void
execute
(
Message
message
)
throws
Exception
{
protected
void
execute
(
Message
message
)
throws
Exception
{
if
(
null
!=
message
&&
StringUtils
.
isNotEmpty
(
message
.
getItem
())
)
{
if
(
null
!=
message
)
{
update
(
message
);
update
(
message
);
}
}
List
<
String
>
ids
=
listOverStay
();
List
<
String
>
ids
=
listOverStay
();
...
@@ -51,9 +51,7 @@ public class ApiConsumeQueue extends AbstractQueue<Message> {
...
@@ -51,9 +51,7 @@ public class ApiConsumeQueue extends AbstractQueue<Message> {
Optional
<
Message
>
optional
=
find
(
id
);
Optional
<
Message
>
optional
=
find
(
id
);
if
(
optional
.
isPresent
())
{
if
(
optional
.
isPresent
())
{
message
=
optional
.
get
();
message
=
optional
.
get
();
if
(
StringUtils
.
isNotEmpty
(
message
.
getItem
()))
{
update
(
message
);
update
(
message
);
}
}
}
}
}
}
}
...
...
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/HadoopConsumeQueue.java
浏览文件 @
10ba7bd1
...
@@ -42,7 +42,8 @@ public class HadoopConsumeQueue extends AbstractQueue<Message> {
...
@@ -42,7 +42,8 @@ public class HadoopConsumeQueue extends AbstractQueue<Message> {
private
static
final
Gson
gson
=
XGsonBuilder
.
instance
();
private
static
final
Gson
gson
=
XGsonBuilder
.
instance
();
protected
void
execute
(
Message
message
)
throws
Exception
{
protected
void
execute
(
Message
message
)
throws
Exception
{
if
(
null
!=
message
&&
StringUtils
.
isNotEmpty
(
message
.
getItem
()))
{
LOGGER
.
debug
(
"execute message:{}."
,
message:
:
toString
);
if
(
null
!=
message
)
{
update
(
message
);
update
(
message
);
}
}
List
<
String
>
ids
=
listOverStay
();
List
<
String
>
ids
=
listOverStay
();
...
@@ -52,9 +53,7 @@ public class HadoopConsumeQueue extends AbstractQueue<Message> {
...
@@ -52,9 +53,7 @@ public class HadoopConsumeQueue extends AbstractQueue<Message> {
Optional
<
Message
>
optional
=
find
(
id
);
Optional
<
Message
>
optional
=
find
(
id
);
if
(
optional
.
isPresent
())
{
if
(
optional
.
isPresent
())
{
message
=
optional
.
get
();
message
=
optional
.
get
();
if
(
StringUtils
.
isNotEmpty
(
message
.
getItem
()))
{
update
(
message
);
update
(
message
);
}
}
}
}
}
}
}
...
@@ -75,9 +74,14 @@ public class HadoopConsumeQueue extends AbstractQueue<Message> {
...
@@ -75,9 +74,14 @@ public class HadoopConsumeQueue extends AbstractQueue<Message> {
HadoopConsumer
.
class
);
HadoopConsumer
.
class
);
try
(
FileSystem
fileSystem
=
FileSystem
.
get
(
configuration
(
consumer
));
try
(
FileSystem
fileSystem
=
FileSystem
.
get
(
configuration
(
consumer
));
InputStream
inputStream
=
new
ByteArrayInputStream
(
InputStream
inputStream
=
new
ByteArrayInputStream
(
message
.
getBody
().
getBytes
(
StandardCharsets
.
UTF_8
));
message
.
getBody
().
getBytes
(
StandardCharsets
.
UTF_8
)))
{
FSDataOutputStream
outputStream
=
fileSystem
.
create
(
path
(
message
,
consumer
)))
{
org
.
apache
.
hadoop
.
fs
.
Path
path
=
path
(
message
,
consumer
);
inputStream
.
transferTo
(
outputStream
);
if
(
fileSystem
.
exists
(
path
))
{
fileSystem
.
delete
(
path
,
false
);
}
try
(
FSDataOutputStream
outputStream
=
fileSystem
.
create
(
path
))
{
inputStream
.
transferTo
(
outputStream
);
}
}
}
success
(
message
.
getId
());
success
(
message
.
getId
());
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
...
@@ -97,10 +101,10 @@ public class HadoopConsumeQueue extends AbstractQueue<Message> {
...
@@ -97,10 +101,10 @@ public class HadoopConsumeQueue extends AbstractQueue<Message> {
}
}
if
(
StringUtils
.
isNotEmpty
(
message
.
getPerson
()))
{
if
(
StringUtils
.
isNotEmpty
(
message
.
getPerson
()))
{
path
=
new
org
.
apache
.
hadoop
.
fs
.
Path
(
path
,
new
org
.
apache
.
hadoop
.
fs
.
Path
(
message
.
getPerson
()));
path
=
new
org
.
apache
.
hadoop
.
fs
.
Path
(
path
,
new
org
.
apache
.
hadoop
.
fs
.
Path
(
message
.
getPerson
()));
}
else
{
path
=
new
org
.
apache
.
hadoop
.
fs
.
Path
(
path
,
new
org
.
apache
.
hadoop
.
fs
.
Path
(
"default"
));
}
}
if
(
StringUtils
.
isNotEmpty
(
message
.
getTitle
()))
{
path
=
new
org
.
apache
.
hadoop
.
fs
.
Path
(
path
,
new
org
.
apache
.
hadoop
.
fs
.
Path
(
message
.
getId
()));
path
=
new
org
.
apache
.
hadoop
.
fs
.
Path
(
path
,
new
org
.
apache
.
hadoop
.
fs
.
Path
(
message
.
getTitle
()));
}
return
path
;
return
path
;
}
}
...
...
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/JdbcConsumeQueue.java
浏览文件 @
10ba7bd1
...
@@ -52,7 +52,7 @@ public class JdbcConsumeQueue extends AbstractQueue<Message> {
...
@@ -52,7 +52,7 @@ public class JdbcConsumeQueue extends AbstractQueue<Message> {
private
static
final
Gson
gson
=
XGsonBuilder
.
instance
();
private
static
final
Gson
gson
=
XGsonBuilder
.
instance
();
protected
void
execute
(
Message
message
)
throws
Exception
{
protected
void
execute
(
Message
message
)
throws
Exception
{
if
(
null
!=
message
&&
StringUtils
.
isNotEmpty
(
message
.
getItem
())
)
{
if
(
null
!=
message
)
{
update
(
message
);
update
(
message
);
}
}
List
<
String
>
ids
=
listOverStay
();
List
<
String
>
ids
=
listOverStay
();
...
@@ -62,9 +62,7 @@ public class JdbcConsumeQueue extends AbstractQueue<Message> {
...
@@ -62,9 +62,7 @@ public class JdbcConsumeQueue extends AbstractQueue<Message> {
Optional
<
Message
>
optional
=
find
(
id
);
Optional
<
Message
>
optional
=
find
(
id
);
if
(
optional
.
isPresent
())
{
if
(
optional
.
isPresent
())
{
message
=
optional
.
get
();
message
=
optional
.
get
();
if
(
StringUtils
.
isNotEmpty
(
message
.
getItem
()))
{
update
(
message
);
update
(
message
);
}
}
}
}
}
}
}
...
...
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/KafkaConsumeQueue.java
浏览文件 @
10ba7bd1
...
@@ -40,7 +40,7 @@ public class KafkaConsumeQueue extends AbstractQueue<Message> {
...
@@ -40,7 +40,7 @@ public class KafkaConsumeQueue extends AbstractQueue<Message> {
private
static
final
Gson
gson
=
XGsonBuilder
.
instance
();
private
static
final
Gson
gson
=
XGsonBuilder
.
instance
();
protected
void
execute
(
Message
message
)
throws
Exception
{
protected
void
execute
(
Message
message
)
throws
Exception
{
if
(
null
!=
message
&&
StringUtils
.
isNotEmpty
(
message
.
getItem
())
)
{
if
(
null
!=
message
)
{
update
(
message
);
update
(
message
);
}
}
List
<
String
>
ids
=
listOverStay
();
List
<
String
>
ids
=
listOverStay
();
...
@@ -50,9 +50,7 @@ public class KafkaConsumeQueue extends AbstractQueue<Message> {
...
@@ -50,9 +50,7 @@ public class KafkaConsumeQueue extends AbstractQueue<Message> {
Optional
<
Message
>
optional
=
find
(
id
);
Optional
<
Message
>
optional
=
find
(
id
);
if
(
optional
.
isPresent
())
{
if
(
optional
.
isPresent
())
{
message
=
optional
.
get
();
message
=
optional
.
get
();
if
(
StringUtils
.
isNotEmpty
(
message
.
getItem
()))
{
update
(
message
);
update
(
message
);
}
}
}
}
}
}
}
...
...
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/MailConsumeQueue.java
浏览文件 @
10ba7bd1
...
@@ -41,7 +41,7 @@ public class MailConsumeQueue extends AbstractQueue<Message> {
...
@@ -41,7 +41,7 @@ public class MailConsumeQueue extends AbstractQueue<Message> {
private
static
final
Gson
gson
=
XGsonBuilder
.
instance
();
private
static
final
Gson
gson
=
XGsonBuilder
.
instance
();
protected
void
execute
(
Message
message
)
throws
Exception
{
protected
void
execute
(
Message
message
)
throws
Exception
{
if
(
null
!=
message
&&
StringUtils
.
isNotEmpty
(
message
.
getItem
())
)
{
if
(
null
!=
message
)
{
update
(
message
);
update
(
message
);
}
}
List
<
String
>
ids
=
listOverStay
();
List
<
String
>
ids
=
listOverStay
();
...
@@ -51,9 +51,7 @@ public class MailConsumeQueue extends AbstractQueue<Message> {
...
@@ -51,9 +51,7 @@ public class MailConsumeQueue extends AbstractQueue<Message> {
Optional
<
Message
>
optional
=
find
(
id
);
Optional
<
Message
>
optional
=
find
(
id
);
if
(
optional
.
isPresent
())
{
if
(
optional
.
isPresent
())
{
message
=
optional
.
get
();
message
=
optional
.
get
();
if
(
StringUtils
.
isNotEmpty
(
message
.
getItem
()))
{
update
(
message
);
update
(
message
);
}
}
}
}
}
}
}
...
...
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/Mp
W
eixinConsumeQueue.java
→
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/Mp
w
eixinConsumeQueue.java
浏览文件 @
10ba7bd1
...
@@ -29,9 +29,9 @@ import com.x.organization.core.entity.Person;
...
@@ -29,9 +29,9 @@ import com.x.organization.core.entity.Person;
* 发送微信公众号模版消息 Created by fancyLou on 3/11/21. Copyright © 2021 O2. All rights
* 发送微信公众号模版消息 Created by fancyLou on 3/11/21. Copyright © 2021 O2. All rights
* reserved.
* reserved.
*/
*/
public
class
Mp
W
eixinConsumeQueue
extends
AbstractQueue
<
Message
>
{
public
class
Mp
w
eixinConsumeQueue
extends
AbstractQueue
<
Message
>
{
private
static
final
Logger
LOGGER
=
LoggerFactory
.
getLogger
(
Mp
W
eixinConsumeQueue
.
class
);
private
static
final
Logger
LOGGER
=
LoggerFactory
.
getLogger
(
Mp
w
eixinConsumeQueue
.
class
);
private
static
final
Gson
gson
=
XGsonBuilder
.
instance
();
private
static
final
Gson
gson
=
XGsonBuilder
.
instance
();
...
...
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/Pms
I
nnerConsumeQueue.java
→
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/Pms
i
nnerConsumeQueue.java
浏览文件 @
10ba7bd1
...
@@ -12,7 +12,7 @@ import com.x.base.core.project.queue.AbstractQueue;
...
@@ -12,7 +12,7 @@ import com.x.base.core.project.queue.AbstractQueue;
import
com.x.message.assemble.communicate.message.PmsInnerMessage
;
import
com.x.message.assemble.communicate.message.PmsInnerMessage
;
import
com.x.message.core.entity.Message
;
import
com.x.message.core.entity.Message
;
public
class
Pms
I
nnerConsumeQueue
extends
AbstractQueue
<
Message
>
{
public
class
Pms
i
nnerConsumeQueue
extends
AbstractQueue
<
Message
>
{
protected
void
execute
(
Message
message
)
throws
Exception
{
protected
void
execute
(
Message
message
)
throws
Exception
{
Application
app
=
ThisApplication
.
context
().
applications
()
Application
app
=
ThisApplication
.
context
().
applications
()
...
...
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/RestfulConsumeQueue.java
浏览文件 @
10ba7bd1
...
@@ -44,7 +44,7 @@ public class RestfulConsumeQueue extends AbstractQueue<Message> {
...
@@ -44,7 +44,7 @@ public class RestfulConsumeQueue extends AbstractQueue<Message> {
private
static
WebservicesClient
client
=
new
WebservicesClient
();
private
static
WebservicesClient
client
=
new
WebservicesClient
();
protected
void
execute
(
Message
message
)
throws
Exception
{
protected
void
execute
(
Message
message
)
throws
Exception
{
if
(
null
!=
message
&&
StringUtils
.
isNotEmpty
(
message
.
getItem
())
)
{
if
(
null
!=
message
)
{
update
(
message
);
update
(
message
);
}
}
List
<
String
>
ids
=
listOverStay
();
List
<
String
>
ids
=
listOverStay
();
...
@@ -54,9 +54,7 @@ public class RestfulConsumeQueue extends AbstractQueue<Message> {
...
@@ -54,9 +54,7 @@ public class RestfulConsumeQueue extends AbstractQueue<Message> {
Optional
<
Message
>
optional
=
find
(
id
);
Optional
<
Message
>
optional
=
find
(
id
);
if
(
optional
.
isPresent
())
{
if
(
optional
.
isPresent
())
{
message
=
optional
.
get
();
message
=
optional
.
get
();
if
(
StringUtils
.
isNotEmpty
(
message
.
getItem
()))
{
update
(
message
);
update
(
message
);
}
}
}
}
}
}
}
...
...
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/TableConsumeQueue.java
浏览文件 @
10ba7bd1
...
@@ -12,7 +12,6 @@ import javax.persistence.criteria.Predicate;
...
@@ -12,7 +12,6 @@ import javax.persistence.criteria.Predicate;
import
javax.persistence.criteria.Root
;
import
javax.persistence.criteria.Root
;
import
org.apache.commons.lang3.BooleanUtils
;
import
org.apache.commons.lang3.BooleanUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.time.DateUtils
;
import
org.apache.commons.lang3.time.DateUtils
;
import
com.google.gson.Gson
;
import
com.google.gson.Gson
;
...
@@ -39,7 +38,7 @@ public class TableConsumeQueue extends AbstractQueue<Message> {
...
@@ -39,7 +38,7 @@ public class TableConsumeQueue extends AbstractQueue<Message> {
private
static
final
Gson
gson
=
XGsonBuilder
.
instance
();
private
static
final
Gson
gson
=
XGsonBuilder
.
instance
();
protected
void
execute
(
Message
message
)
throws
Exception
{
protected
void
execute
(
Message
message
)
throws
Exception
{
if
(
null
!=
message
&&
StringUtils
.
isNotEmpty
(
message
.
getItem
())
)
{
if
(
null
!=
message
)
{
update
(
message
);
update
(
message
);
}
}
List
<
String
>
ids
=
listOverStay
();
List
<
String
>
ids
=
listOverStay
();
...
@@ -49,9 +48,7 @@ public class TableConsumeQueue extends AbstractQueue<Message> {
...
@@ -49,9 +48,7 @@ public class TableConsumeQueue extends AbstractQueue<Message> {
Optional
<
Message
>
optional
=
find
(
id
);
Optional
<
Message
>
optional
=
find
(
id
);
if
(
optional
.
isPresent
())
{
if
(
optional
.
isPresent
())
{
message
=
optional
.
get
();
message
=
optional
.
get
();
if
(
StringUtils
.
isNotEmpty
(
message
.
getItem
()))
{
update
(
message
);
update
(
message
);
}
}
}
}
}
}
}
...
...
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/ThisApplication.java
浏览文件 @
10ba7bd1
...
@@ -32,17 +32,17 @@ public class ThisApplication {
...
@@ -32,17 +32,17 @@ public class ThisApplication {
public
static
final
QiyeweixinConsumeQueue
qiyeweixinConsumeQueue
=
new
QiyeweixinConsumeQueue
();
public
static
final
QiyeweixinConsumeQueue
qiyeweixinConsumeQueue
=
new
QiyeweixinConsumeQueue
();
public
static
final
Zhengwu
DingdingConsumeQueue
zhengwuDingdingConsumeQueue
=
new
ZhengwuD
ingdingConsumeQueue
();
public
static
final
Zhengwu
dingdingConsumeQueue
zhengwudingdingConsumeQueue
=
new
Zhengwud
ingdingConsumeQueue
();
public
static
final
DingdingConsumeQueue
dingdingConsumeQueue
=
new
DingdingConsumeQueue
();
public
static
final
DingdingConsumeQueue
dingdingConsumeQueue
=
new
DingdingConsumeQueue
();
public
static
final
We
LinkConsumeQueue
weLinkConsumeQueue
=
new
WeL
inkConsumeQueue
();
public
static
final
We
linkConsumeQueue
welinkConsumeQueue
=
new
Wel
inkConsumeQueue
();
public
static
final
Pms
InnerConsumeQueue
pmsInnerConsumeQueue
=
new
PmsI
nnerConsumeQueue
();
public
static
final
Pms
innerConsumeQueue
pmsinnerConsumeQueue
=
new
Pmsi
nnerConsumeQueue
();
public
static
final
Mp
WeixinConsumeQueue
mpWeixinConsumeQueue
=
new
MpW
eixinConsumeQueue
();
public
static
final
Mp
weixinConsumeQueue
mpweixinConsumeQueue
=
new
Mpw
eixinConsumeQueue
();
public
static
final
Active
MqConsumeQueue
activeMqConsumeQueue
=
new
ActiveM
qConsumeQueue
();
public
static
final
Active
mqConsumeQueue
activemqConsumeQueue
=
new
Activem
qConsumeQueue
();
public
static
final
KafkaConsumeQueue
kafkaConsumeQueue
=
new
KafkaConsumeQueue
();
public
static
final
KafkaConsumeQueue
kafkaConsumeQueue
=
new
KafkaConsumeQueue
();
...
@@ -87,7 +87,7 @@ public class ThisApplication {
...
@@ -87,7 +87,7 @@ public class ThisApplication {
private
static
void
startQueue
()
throws
Exception
{
private
static
void
startQueue
()
throws
Exception
{
context
().
startQueue
(
kafkaConsumeQueue
);
context
().
startQueue
(
kafkaConsumeQueue
);
context
().
startQueue
(
active
M
qConsumeQueue
);
context
().
startQueue
(
active
m
qConsumeQueue
);
context
().
startQueue
(
restfulConsumeQueue
);
context
().
startQueue
(
restfulConsumeQueue
);
context
().
startQueue
(
apiConsumeQueue
);
context
().
startQueue
(
apiConsumeQueue
);
context
().
startQueue
(
mailConsumeQueue
);
context
().
startQueue
(
mailConsumeQueue
);
...
@@ -100,20 +100,20 @@ public class ThisApplication {
...
@@ -100,20 +100,20 @@ public class ThisApplication {
}
}
if
(
BooleanUtils
.
isTrue
(
Config
.
zhengwuDingding
().
getEnable
())
if
(
BooleanUtils
.
isTrue
(
Config
.
zhengwuDingding
().
getEnable
())
&&
BooleanUtils
.
isTrue
(
Config
.
zhengwuDingding
().
getMessageEnable
()))
{
&&
BooleanUtils
.
isTrue
(
Config
.
zhengwuDingding
().
getMessageEnable
()))
{
context
().
startQueue
(
zhengwu
D
ingdingConsumeQueue
);
context
().
startQueue
(
zhengwu
d
ingdingConsumeQueue
);
}
}
if
(
Config
.
dingding
().
getEnable
()
&&
Config
.
dingding
().
getMessageEnable
())
{
if
(
Config
.
dingding
().
getEnable
()
&&
Config
.
dingding
().
getMessageEnable
())
{
context
().
startQueue
(
dingdingConsumeQueue
);
context
().
startQueue
(
dingdingConsumeQueue
);
}
}
if
(
BooleanUtils
.
isTrue
(
Config
.
pushConfig
().
getEnable
()))
{
if
(
BooleanUtils
.
isTrue
(
Config
.
pushConfig
().
getEnable
()))
{
context
().
startQueue
(
pms
I
nnerConsumeQueue
);
context
().
startQueue
(
pms
i
nnerConsumeQueue
);
}
}
if
(
Config
.
weLink
().
getEnable
()
&&
Config
.
weLink
().
getMessageEnable
())
{
if
(
Config
.
weLink
().
getEnable
()
&&
Config
.
weLink
().
getMessageEnable
())
{
context
().
startQueue
(
we
L
inkConsumeQueue
);
context
().
startQueue
(
we
l
inkConsumeQueue
);
}
}
if
(
BooleanUtils
.
isTrue
(
Config
.
mPweixin
().
getEnable
())
if
(
BooleanUtils
.
isTrue
(
Config
.
mPweixin
().
getEnable
())
&&
BooleanUtils
.
isTrue
(
Config
.
mPweixin
().
getMessageEnable
()))
{
&&
BooleanUtils
.
isTrue
(
Config
.
mPweixin
().
getMessageEnable
()))
{
context
().
startQueue
(
mp
W
eixinConsumeQueue
);
context
().
startQueue
(
mp
w
eixinConsumeQueue
);
}
}
if
(
BooleanUtils
.
isTrue
(
Config
.
communicate
().
wsEnable
()))
{
if
(
BooleanUtils
.
isTrue
(
Config
.
communicate
().
wsEnable
()))
{
context
().
startQueue
(
wsConsumeQueue
);
context
().
startQueue
(
wsConsumeQueue
);
...
...
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/We
L
inkConsumeQueue.java
→
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/We
l
inkConsumeQueue.java
浏览文件 @
10ba7bd1
...
@@ -24,9 +24,9 @@ import com.x.message.assemble.communicate.message.WeLinkMessage;
...
@@ -24,9 +24,9 @@ import com.x.message.assemble.communicate.message.WeLinkMessage;
import
com.x.message.core.entity.Message
;
import
com.x.message.core.entity.Message
;
import
com.x.organization.core.entity.Person
;
import
com.x.organization.core.entity.Person
;
public
class
We
L
inkConsumeQueue
extends
AbstractQueue
<
Message
>
{
public
class
We
l
inkConsumeQueue
extends
AbstractQueue
<
Message
>
{
private
static
final
Logger
LOGGER
=
LoggerFactory
.
getLogger
(
We
L
inkConsumeQueue
.
class
);
private
static
final
Logger
LOGGER
=
LoggerFactory
.
getLogger
(
We
l
inkConsumeQueue
.
class
);
protected
void
execute
(
Message
message
)
throws
Exception
{
protected
void
execute
(
Message
message
)
throws
Exception
{
...
...
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/Zhengwu
D
ingdingConsumeQueue.java
→
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/Zhengwu
d
ingdingConsumeQueue.java
浏览文件 @
10ba7bd1
...
@@ -10,9 +10,9 @@ import com.x.base.core.project.queue.AbstractQueue;
...
@@ -10,9 +10,9 @@ import com.x.base.core.project.queue.AbstractQueue;
import
com.x.message.assemble.communicate.message.ZhengwuDingdingMessage
;
import
com.x.message.assemble.communicate.message.ZhengwuDingdingMessage
;
import
com.x.message.core.entity.Message
;
import
com.x.message.core.entity.Message
;
public
class
Zhengwu
D
ingdingConsumeQueue
extends
AbstractQueue
<
Message
>
{
public
class
Zhengwu
d
ingdingConsumeQueue
extends
AbstractQueue
<
Message
>
{
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
Zhengwu
D
ingdingConsumeQueue
.
class
);
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
Zhengwu
d
ingdingConsumeQueue
.
class
);
protected
void
execute
(
Message
message
)
throws
Exception
{
protected
void
execute
(
Message
message
)
throws
Exception
{
...
...
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/jaxrs/connector/ActionCreate.java
浏览文件 @
10ba7bd1
...
@@ -149,7 +149,8 @@ class ActionCreate extends BaseAction {
...
@@ -149,7 +149,8 @@ class ActionCreate extends BaseAction {
@Deprecated
@Deprecated
private
Message
assembleMessage
(
String
consumer
,
Wi
cpWi
,
Instant
instant
)
throws
Exception
{
private
Message
assembleMessage
(
String
consumer
,
Wi
cpWi
,
Instant
instant
)
throws
Exception
{
Message
message
=
null
;
Message
message
=
null
;
switch
(
Objects
.
toString
(
consumer
,
""
))
{
String
type
=
StringUtils
.
lowerCase
(
Objects
.
toString
(
consumer
,
""
));
switch
(
type
)
{
case
MessageConnector
.
CONSUME_WS
:
case
MessageConnector
.
CONSUME_WS
:
message
=
this
.
wsMessage
(
cpWi
,
instant
);
message
=
this
.
wsMessage
(
cpWi
,
instant
);
break
;
break
;
...
@@ -184,7 +185,7 @@ class ActionCreate extends BaseAction {
...
@@ -184,7 +185,7 @@ class ActionCreate extends BaseAction {
@Deprecated
@Deprecated
private
void
sendMessage
(
List
<
Message
>
messages
)
throws
Exception
{
private
void
sendMessage
(
List
<
Message
>
messages
)
throws
Exception
{
for
(
Message
message
:
messages
)
{
for
(
Message
message
:
messages
)
{
switch
(
message
.
getConsumer
(
))
{
switch
(
StringUtils
.
lowerCase
(
message
.
getConsumer
()
))
{
case
MessageConnector
.
CONSUME_WS
:
case
MessageConnector
.
CONSUME_WS
:
sendMessageWs
(
message
);
sendMessageWs
(
message
);
break
;
break
;
...
@@ -219,14 +220,14 @@ class ActionCreate extends BaseAction {
...
@@ -219,14 +220,14 @@ class ActionCreate extends BaseAction {
private
void
sendMessageMPWeixin
(
Message
message
)
throws
Exception
{
private
void
sendMessageMPWeixin
(
Message
message
)
throws
Exception
{
if
(
BooleanUtils
.
isTrue
(
Config
.
mPweixin
().
getEnable
())
if
(
BooleanUtils
.
isTrue
(
Config
.
mPweixin
().
getEnable
())
&&
BooleanUtils
.
isTrue
(
Config
.
mPweixin
().
getMessageEnable
()))
{
&&
BooleanUtils
.
isTrue
(
Config
.
mPweixin
().
getMessageEnable
()))
{
ThisApplication
.
mp
W
eixinConsumeQueue
.
send
(
message
);
ThisApplication
.
mp
w
eixinConsumeQueue
.
send
(
message
);
}
}
}
}
@Deprecated
@Deprecated
private
void
sendMessagePmsInner
(
Message
message
)
throws
Exception
{
private
void
sendMessagePmsInner
(
Message
message
)
throws
Exception
{
if
(
BooleanUtils
.
isTrue
(
Config
.
pushConfig
().
getEnable
()))
{
if
(
BooleanUtils
.
isTrue
(
Config
.
pushConfig
().
getEnable
()))
{
ThisApplication
.
pms
I
nnerConsumeQueue
.
send
(
message
);
ThisApplication
.
pms
i
nnerConsumeQueue
.
send
(
message
);
}
}
}
}
...
@@ -243,7 +244,7 @@ class ActionCreate extends BaseAction {
...
@@ -243,7 +244,7 @@ class ActionCreate extends BaseAction {
private
void
sendMessageZhengwuDingding
(
Message
message
)
throws
Exception
{
private
void
sendMessageZhengwuDingding
(
Message
message
)
throws
Exception
{
if
(
BooleanUtils
.
isTrue
(
Config
.
zhengwuDingding
().
getEnable
())
if
(
BooleanUtils
.
isTrue
(
Config
.
zhengwuDingding
().
getEnable
())
&&
BooleanUtils
.
isTrue
(
Config
.
zhengwuDingding
().
getMessageEnable
()))
{
&&
BooleanUtils
.
isTrue
(
Config
.
zhengwuDingding
().
getMessageEnable
()))
{
ThisApplication
.
zhengwu
D
ingdingConsumeQueue
.
send
(
message
);
ThisApplication
.
zhengwu
d
ingdingConsumeQueue
.
send
(
message
);
}
}
}
}
...
@@ -251,7 +252,7 @@ class ActionCreate extends BaseAction {
...
@@ -251,7 +252,7 @@ class ActionCreate extends BaseAction {
private
void
sendMessageWeLink
(
Message
message
)
throws
Exception
{
private
void
sendMessageWeLink
(
Message
message
)
throws
Exception
{
if
(
BooleanUtils
.
isTrue
(
Config
.
weLink
().
getEnable
())
if
(
BooleanUtils
.
isTrue
(
Config
.
weLink
().
getEnable
())
&&
BooleanUtils
.
isTrue
(
Config
.
weLink
().
getMessageEnable
()))
{
&&
BooleanUtils
.
isTrue
(
Config
.
weLink
().
getMessageEnable
()))
{
ThisApplication
.
we
L
inkConsumeQueue
.
send
(
message
);
ThisApplication
.
we
l
inkConsumeQueue
.
send
(
message
);
}
}
}
}
...
@@ -485,7 +486,7 @@ class ActionCreate extends BaseAction {
...
@@ -485,7 +486,7 @@ class ActionCreate extends BaseAction {
private
Message
v3AssembleMessage
(
Wi
wi
,
Consumer
consumer
,
Instant
instant
)
{
private
Message
v3AssembleMessage
(
Wi
wi
,
Consumer
consumer
,
Instant
instant
)
{
Message
message
=
null
;
Message
message
=
null
;
String
type
=
Objects
.
toString
(
consumer
.
getType
(),
""
);
String
type
=
StringUtils
.
lowerCase
(
Objects
.
toString
(
consumer
.
getType
(),
""
)
);
switch
(
type
)
{
switch
(
type
)
{
case
MessageConnector
.
CONSUME_WS
:
case
MessageConnector
.
CONSUME_WS
:
message
=
v3WsMessage
(
wi
,
consumer
);
message
=
v3WsMessage
(
wi
,
consumer
);
...
@@ -565,7 +566,7 @@ class ActionCreate extends BaseAction {
...
@@ -565,7 +566,7 @@ class ActionCreate extends BaseAction {
}
}
message
.
setType
(
wi
.
getType
());
message
.
setType
(
wi
.
getType
());
message
.
setConsumed
(
false
);
message
.
setConsumed
(
false
);
message
.
setConsumer
(
wi
.
getType
());
message
.
setConsumer
(
consumer
.
getType
());
message
.
getProperties
().
setConsumerJsonElement
(
gson
.
toJsonTree
(
consumer
));
message
.
getProperties
().
setConsumerJsonElement
(
gson
.
toJsonTree
(
consumer
));
return
message
;
return
message
;
}
}
...
@@ -756,7 +757,8 @@ class ActionCreate extends BaseAction {
...
@@ -756,7 +757,8 @@ class ActionCreate extends BaseAction {
private
void
v3SendMessage
(
List
<
Message
>
messages
)
throws
Exception
{
private
void
v3SendMessage
(
List
<
Message
>
messages
)
throws
Exception
{
for
(
Message
message
:
messages
)
{
for
(
Message
message
:
messages
)
{
switch
(
message
.
getConsumer
())
{
String
type
=
StringUtils
.
lowerCase
(
message
.
getConsumer
());
switch
(
type
)
{
case
MessageConnector
.
CONSUME_WS
:
case
MessageConnector
.
CONSUME_WS
:
ThisApplication
.
wsConsumeQueue
.
send
(
message
);
ThisApplication
.
wsConsumeQueue
.
send
(
message
);
break
;
break
;
...
@@ -767,25 +769,25 @@ class ActionCreate extends BaseAction {
...
@@ -767,25 +769,25 @@ class ActionCreate extends BaseAction {
ThisApplication
.
dingdingConsumeQueue
.
send
(
message
);
ThisApplication
.
dingdingConsumeQueue
.
send
(
message
);
break
;
break
;
case
MessageConnector
.
CONSUME_WELINK
:
case
MessageConnector
.
CONSUME_WELINK
:
ThisApplication
.
we
L
inkConsumeQueue
.
send
(
message
);
ThisApplication
.
we
l
inkConsumeQueue
.
send
(
message
);
break
;
break
;
case
MessageConnector
.
CONSUME_ZHENGWUDINGDING
:
case
MessageConnector
.
CONSUME_ZHENGWUDINGDING
:
ThisApplication
.
zhengwu
D
ingdingConsumeQueue
.
send
(
message
);
ThisApplication
.
zhengwu
d
ingdingConsumeQueue
.
send
(
message
);
break
;
break
;
case
MessageConnector
.
CONSUME_QIYEWEIXIN
:
case
MessageConnector
.
CONSUME_QIYEWEIXIN
:
ThisApplication
.
qiyeweixinConsumeQueue
.
send
(
message
);
ThisApplication
.
qiyeweixinConsumeQueue
.
send
(
message
);
break
;
break
;
case
MessageConnector
.
CONSUME_PMS_INNER
:
case
MessageConnector
.
CONSUME_PMS_INNER
:
ThisApplication
.
pms
I
nnerConsumeQueue
.
send
(
message
);
ThisApplication
.
pms
i
nnerConsumeQueue
.
send
(
message
);
break
;
break
;
case
MessageConnector
.
CONSUME_MPWEIXIN
:
case
MessageConnector
.
CONSUME_MPWEIXIN
:
ThisApplication
.
mp
W
eixinConsumeQueue
.
send
(
message
);
ThisApplication
.
mp
w
eixinConsumeQueue
.
send
(
message
);
break
;
break
;
case
MessageConnector
.
CONSUME_KAFKA
:
case
MessageConnector
.
CONSUME_KAFKA
:
ThisApplication
.
kafkaConsumeQueue
.
send
(
message
);
ThisApplication
.
kafkaConsumeQueue
.
send
(
message
);
break
;
break
;
case
MessageConnector
.
CONSUME_ACTIVEMQ
:
case
MessageConnector
.
CONSUME_ACTIVEMQ
:
ThisApplication
.
active
M
qConsumeQueue
.
send
(
message
);
ThisApplication
.
active
m
qConsumeQueue
.
send
(
message
);
break
;
break
;
case
MessageConnector
.
CONSUME_RESTFUL
:
case
MessageConnector
.
CONSUME_RESTFUL
:
ThisApplication
.
restfulConsumeQueue
.
send
(
message
);
ThisApplication
.
restfulConsumeQueue
.
send
(
message
);
...
...
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/jaxrs/im/ActionMsgCreate.java
浏览文件 @
10ba7bd1
...
@@ -81,7 +81,7 @@ public class ActionMsgCreate extends BaseAction {
...
@@ -81,7 +81,7 @@ public class ActionMsgCreate extends BaseAction {
message
.
setType
(
MessageConnector
.
TYPE_IM_CREATE
);
message
.
setType
(
MessageConnector
.
TYPE_IM_CREATE
);
message
.
setId
(
""
);
message
.
setId
(
""
);
if
(
BooleanUtils
.
isTrue
(
Config
.
pushConfig
().
getEnable
()))
{
if
(
BooleanUtils
.
isTrue
(
Config
.
pushConfig
().
getEnable
()))
{
ThisApplication
.
pms
I
nnerConsumeQueue
.
send
(
message
);
ThisApplication
.
pms
i
nnerConsumeQueue
.
send
(
message
);
}
}
}
}
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
...
...
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/schedule/TriggerMessageConsumeQueue.java
浏览文件 @
10ba7bd1
...
@@ -16,7 +16,7 @@ public class TriggerMessageConsumeQueue extends AbstractJob {
...
@@ -16,7 +16,7 @@ public class TriggerMessageConsumeQueue extends AbstractJob {
LOGGER
.
debug
(
LOGGER
.
debug
(
"schedule trigger kafkaConsumeQueue, activeMqConsumeQueue, restfulConsumeQueue, mailConsumeQueue, apiConsumeQueue, jdbcConsumeQueue, tableConsumeQueue, hadoopConsumeQueue."
);
"schedule trigger kafkaConsumeQueue, activeMqConsumeQueue, restfulConsumeQueue, mailConsumeQueue, apiConsumeQueue, jdbcConsumeQueue, tableConsumeQueue, hadoopConsumeQueue."
);
ThisApplication
.
kafkaConsumeQueue
.
send
(
null
);
ThisApplication
.
kafkaConsumeQueue
.
send
(
null
);
ThisApplication
.
active
M
qConsumeQueue
.
send
(
null
);
ThisApplication
.
active
m
qConsumeQueue
.
send
(
null
);
ThisApplication
.
restfulConsumeQueue
.
send
(
null
);
ThisApplication
.
restfulConsumeQueue
.
send
(
null
);
ThisApplication
.
mailConsumeQueue
.
send
(
null
);
ThisApplication
.
mailConsumeQueue
.
send
(
null
);
ThisApplication
.
apiConsumeQueue
.
send
(
null
);
ThisApplication
.
apiConsumeQueue
.
send
(
null
);
...
...
o2server/x_message_core_entity/src/main/java/com/x/message/core/entity/Message.java
浏览文件 @
10ba7bd1
...
@@ -47,8 +47,6 @@ public class Message extends SliceJpaObject {
...
@@ -47,8 +47,6 @@ public class Message extends SliceJpaObject {
@Column
(
length
=
length_id
,
name
=
ColumnNamePrefix
+
id_FIELDNAME
)
@Column
(
length
=
length_id
,
name
=
ColumnNamePrefix
+
id_FIELDNAME
)
private
String
id
=
createId
();
private
String
id
=
createId
();
/* 以上为 JpaObject 默认字段 */
public
void
onPersist
()
throws
Exception
{
public
void
onPersist
()
throws
Exception
{
// nothing
// nothing
}
}
...
@@ -113,13 +111,6 @@ public class Message extends SliceJpaObject {
...
@@ -113,13 +111,6 @@ public class Message extends SliceJpaObject {
@CheckPersist
(
allowEmpty
=
false
)
@CheckPersist
(
allowEmpty
=
false
)
private
String
instant
;
private
String
instant
;
public
static
final
String
ITEM_FIELDNAME
=
"item"
;
@FieldDescribe
(
"配置项."
)
@Column
(
length
=
JpaObject
.
length_255B
,
name
=
ColumnNamePrefix
+
ITEM_FIELDNAME
)
@Index
(
name
=
TABLE
+
IndexNameMiddle
+
ITEM_FIELDNAME
)
@CheckPersist
(
allowEmpty
=
true
)
private
String
item
;
public
static
final
String
PROPERTIES_FIELDNAME
=
"properties"
;
public
static
final
String
PROPERTIES_FIELDNAME
=
"properties"
;
@FieldDescribe
(
"属性对象存储字段."
)
@FieldDescribe
(
"属性对象存储字段."
)
@Persistent
@Persistent
...
@@ -180,14 +171,6 @@ public class Message extends SliceJpaObject {
...
@@ -180,14 +171,6 @@ public class Message extends SliceJpaObject {
return
instant
;
return
instant
;
}
}
public
String
getItem
()
{
return
item
;
}
public
void
setItem
(
String
item
)
{
this
.
item
=
item
;
}
public
void
setInstant
(
String
instant
)
{
public
void
setInstant
(
String
instant
)
{
this
.
instant
=
instant
;
this
.
instant
=
instant
;
}
}
...
...
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/message/Event.java
浏览文件 @
10ba7bd1
...
@@ -32,6 +32,8 @@ public class Event extends SliceJpaObject {
...
@@ -32,6 +32,8 @@ public class Event extends SliceJpaObject {
public
static
final
String
EVENTTYPE_UPDATETABLE
=
"updateTable"
;
public
static
final
String
EVENTTYPE_UPDATETABLE
=
"updateTable"
;
public
static
final
String
EVENTTYPE_ARCHIVEHADOOP
=
"archiveHadoop"
;
public
String
getId
()
{
public
String
getId
()
{
return
id
;
return
id
;
}
}
...
...
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/ArchiveHadoopQueue.java
0 → 100644
浏览文件 @
10ba7bd1
package
com.x.processplatform.service.processing
;
import
java.io.BufferedWriter
;
import
java.io.IOException
;
import
java.io.OutputStreamWriter
;
import
java.nio.charset.StandardCharsets
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.List
;
import
javax.persistence.EntityManager
;
import
javax.persistence.criteria.CriteriaBuilder
;
import
javax.persistence.criteria.CriteriaQuery
;
import
javax.persistence.criteria.Predicate
;
import
javax.persistence.criteria.Root
;
import
org.apache.commons.io.IOUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.time.DateUtils
;
import
org.apache.hadoop.fs.FSDataOutputStream
;
import
org.apache.hadoop.fs.FileSystem
;
import
org.apache.hadoop.fs.Path
;
import
com.google.gson.Gson
;
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.entity.dataitem.DataItem
;
import
com.x.base.core.entity.dataitem.DataItemConverter
;
import
com.x.base.core.entity.dataitem.ItemCategory
;
import
com.x.base.core.project.config.Config
;
import
com.x.base.core.project.config.ProcessPlatform.ArchiveHadoop
;
import
com.x.base.core.project.config.StorageMapping
;
import
com.x.base.core.project.gson.XGsonBuilder
;
import
com.x.base.core.project.logger.Logger
;
import
com.x.base.core.project.logger.LoggerFactory
;
import
com.x.base.core.project.queue.AbstractQueue
;
import
com.x.base.core.project.tools.StringTools
;
import
com.x.processplatform.core.entity.content.Attachment
;
import
com.x.processplatform.core.entity.content.ReadCompleted
;
import
com.x.processplatform.core.entity.content.Record
;
import
com.x.processplatform.core.entity.content.Review
;
import
com.x.processplatform.core.entity.content.TaskCompleted
;
import
com.x.processplatform.core.entity.content.WorkCompleted
;
import
com.x.processplatform.core.entity.content.WorkLog
;
import
com.x.processplatform.core.entity.message.Event
;
import
com.x.processplatform.core.entity.message.Event_
;
import
com.x.query.core.entity.Item
;
public
class
ArchiveHadoopQueue
extends
AbstractQueue
<
String
>
{
private
static
final
Logger
LOGGER
=
LoggerFactory
.
getLogger
(
ArchiveHadoopQueue
.
class
);
private
static
final
String
ATTRIBUTE_FS_DEFAULTFS
=
"fs.defaultFS"
;
private
static
final
String
SYSTEM_PROPERTY_HADOOP_USER_NAME
=
"HADOOP_USER_NAME"
;
private
static
final
int
RETRYMINUTES
=
60
;
private
static
final
int
THRESHOLDMINUTES
=
60
*
24
*
3
;
private
final
Gson
gson
=
XGsonBuilder
.
compactInstance
();
private
final
DataItemConverter
<
Item
>
converter
=
new
DataItemConverter
<>(
Item
.
class
);
protected
void
execute
(
String
id
)
throws
Exception
{
if
(
StringUtils
.
isNotEmpty
(
id
))
{
archive
(
id
);
}
List
<
String
>
ids
=
this
.
checkOverstay
();
if
(!
ids
.
isEmpty
())
{
for
(
String
s
:
ids
)
{
archive
(
s
);
}
clean
();
}
}
private
boolean
archive
(
String
id
)
throws
Exception
{
Event
event
=
exist
(
id
);
if
((
null
!=
event
)
&&
StringUtils
.
equals
(
event
.
getType
(),
Event
.
EVENTTYPE_ARCHIVEHADOOP
))
{
if
(
transfer
(
event
))
{
success
(
id
);
}
else
{
failure
(
id
);
LOGGER
.
warn
(
"归档到Hadoop失败:{}."
,
()
->
id
);
}
}
return
false
;
}
private
boolean
transfer
(
Event
event
)
throws
Exception
{
WorkCompleted
workCompleted
=
null
;
List
<
Item
>
itemList
=
null
;
List
<
TaskCompleted
>
taskCompletedList
=
null
;
List
<
ReadCompleted
>
readCompletedList
=
null
;
List
<
Review
>
reviewList
=
null
;
List
<
WorkLog
>
workLogList
=
null
;
List
<
Record
>
recordList
=
null
;
List
<
Attachment
>
attachmentList
=
null
;
try
{
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
workCompleted
=
emc
.
firstEqual
(
WorkCompleted
.
class
,
WorkCompleted
.
job_FIELDNAME
,
event
.
getJob
());
Business
business
=
new
Business
(
emc
);
if
(
null
!=
workCompleted
)
{
itemList
=
business
.
entityManagerContainer
().
listEqualAndEqual
(
Item
.
class
,
DataItem
.
bundle_FIELDNAME
,
workCompleted
.
getJob
(),
DataItem
.
itemCategory_FIELDNAME
,
ItemCategory
.
pp
);
taskCompletedList
=
this
.
listTaskCompleted
(
business
,
workCompleted
.
getJob
());
readCompletedList
=
this
.
listReadCompleted
(
business
,
workCompleted
.
getJob
());
reviewList
=
this
.
listReview
(
business
,
workCompleted
.
getJob
());
workLogList
=
this
.
listWorkLog
(
business
,
workCompleted
.
getJob
());
recordList
=
this
.
listRecord
(
business
,
workCompleted
.
getJob
());
attachmentList
=
this
.
listAttachment
(
business
,
workCompleted
.
getJob
());
}
}
if
(
null
!=
workCompleted
)
{
ArchiveHadoop
archiveHadoop
=
Config
.
processPlatform
().
getArchiveHadoop
();
org
.
apache
.
hadoop
.
fs
.
Path
dir
=
dir
(
archiveHadoop
,
workCompleted
);
try
(
FileSystem
fileSystem
=
FileSystem
.
get
(
configuration
(
archiveHadoop
)))
{
if
(
fileSystem
.
exists
(
dir
))
{
fileSystem
.
delete
(
dir
,
true
);
}
transferWorkCompleted
(
fileSystem
,
dir
,
workCompleted
);
transferData
(
fileSystem
,
dir
,
itemList
);
transferTaskCompleteds
(
fileSystem
,
dir
,
taskCompletedList
);
transferReadCompleteds
(
fileSystem
,
dir
,
readCompletedList
);
transferReviews
(
fileSystem
,
dir
,
reviewList
);
transferRecords
(
fileSystem
,
dir
,
recordList
);
transferWorkLogs
(
fileSystem
,
dir
,
workLogList
);
transferAttachments
(
fileSystem
,
dir
,
attachmentList
);
}
}
return
true
;
}
catch
(
Exception
e
)
{
LOGGER
.
error
(
e
);
}
return
false
;
}
private
void
transferWorkCompleted
(
FileSystem
fileSystem
,
Path
dir
,
WorkCompleted
workCompleted
)
throws
IOException
{
Path
path
=
new
Path
(
dir
,
"workCompleted.json"
);
try
(
FSDataOutputStream
out
=
fileSystem
.
create
(
path
);
OutputStreamWriter
outputStreamWriter
=
new
OutputStreamWriter
(
out
,
StandardCharsets
.
UTF_8
);
BufferedWriter
bufferedOutputStreamWriter
=
new
BufferedWriter
(
outputStreamWriter
))
{
bufferedOutputStreamWriter
.
write
(
this
.
gson
.
toJson
(
workCompleted
));
}
}
private
void
transferData
(
FileSystem
fileSystem
,
Path
dir
,
List
<
Item
>
itemList
)
throws
IOException
{
Path
path
=
new
Path
(
dir
,
"data.json"
);
try
(
FSDataOutputStream
out
=
fileSystem
.
create
(
path
);
OutputStreamWriter
outputStreamWriter
=
new
OutputStreamWriter
(
out
,
StandardCharsets
.
UTF_8
);
BufferedWriter
bufferedOutputStreamWriter
=
new
BufferedWriter
(
outputStreamWriter
))
{
bufferedOutputStreamWriter
.
write
(
this
.
gson
.
toJson
(
converter
.
assemble
(
itemList
)));
}
}
private
void
transferTaskCompleteds
(
FileSystem
fileSystem
,
Path
dir
,
List
<
TaskCompleted
>
taskCompletedList
)
throws
IOException
{
Path
path
=
new
Path
(
dir
,
"taskCompleteds.json"
);
try
(
FSDataOutputStream
out
=
fileSystem
.
create
(
path
);
OutputStreamWriter
outputStreamWriter
=
new
OutputStreamWriter
(
out
,
StandardCharsets
.
UTF_8
);
BufferedWriter
bufferedOutputStreamWriter
=
new
BufferedWriter
(
outputStreamWriter
))
{
for
(
int
i
=
0
;
i
<
taskCompletedList
.
size
();
i
++)
{
if
(
i
>
0
)
{
bufferedOutputStreamWriter
.
write
(
StringTools
.
LF
);
}
bufferedOutputStreamWriter
.
write
(
this
.
gson
.
toJson
(
taskCompletedList
.
get
(
i
)));
}
}
}
private
void
transferReadCompleteds
(
FileSystem
fileSystem
,
Path
dir
,
List
<
ReadCompleted
>
readCompletedList
)
throws
IOException
{
Path
path
=
new
Path
(
dir
,
"readCompleteds.json"
);
try
(
FSDataOutputStream
out
=
fileSystem
.
create
(
path
);
OutputStreamWriter
outputStreamWriter
=
new
OutputStreamWriter
(
out
,
StandardCharsets
.
UTF_8
);
BufferedWriter
bufferedOutputStreamWriter
=
new
BufferedWriter
(
outputStreamWriter
))
{
for
(
int
i
=
0
;
i
<
readCompletedList
.
size
();
i
++)
{
if
(
i
>
0
)
{
bufferedOutputStreamWriter
.
write
(
StringTools
.
LF
);
}
bufferedOutputStreamWriter
.
write
(
this
.
gson
.
toJson
(
readCompletedList
.
get
(
i
)));
}
}
}
private
void
transferReviews
(
FileSystem
fileSystem
,
Path
dir
,
List
<
Review
>
reviewList
)
throws
IOException
{
Path
path
=
new
Path
(
dir
,
"reviews.json"
);
try
(
FSDataOutputStream
out
=
fileSystem
.
create
(
path
);
OutputStreamWriter
outputStreamWriter
=
new
OutputStreamWriter
(
out
,
StandardCharsets
.
UTF_8
);
BufferedWriter
bufferedOutputStreamWriter
=
new
BufferedWriter
(
outputStreamWriter
))
{
for
(
int
i
=
0
;
i
<
reviewList
.
size
();
i
++)
{
if
(
i
>
0
)
{
bufferedOutputStreamWriter
.
write
(
StringTools
.
LF
);
}
bufferedOutputStreamWriter
.
write
(
this
.
gson
.
toJson
(
reviewList
.
get
(
i
)));
}
}
}
private
void
transferRecords
(
FileSystem
fileSystem
,
Path
dir
,
List
<
Record
>
recordList
)
throws
IOException
{
Path
path
=
new
Path
(
dir
,
"records.json"
);
try
(
FSDataOutputStream
out
=
fileSystem
.
create
(
path
);
OutputStreamWriter
outputStreamWriter
=
new
OutputStreamWriter
(
out
,
StandardCharsets
.
UTF_8
);
BufferedWriter
bufferedOutputStreamWriter
=
new
BufferedWriter
(
outputStreamWriter
))
{
for
(
int
i
=
0
;
i
<
recordList
.
size
();
i
++)
{
if
(
i
>
0
)
{
bufferedOutputStreamWriter
.
write
(
StringTools
.
LF
);
}
bufferedOutputStreamWriter
.
write
(
this
.
gson
.
toJson
(
recordList
.
get
(
i
)));
}
}
}
private
void
transferWorkLogs
(
FileSystem
fileSystem
,
Path
dir
,
List
<
WorkLog
>
workLogList
)
throws
IOException
{
Path
path
=
new
Path
(
dir
,
"workLogs.json"
);
try
(
FSDataOutputStream
out
=
fileSystem
.
create
(
path
);
OutputStreamWriter
outputStreamWriter
=
new
OutputStreamWriter
(
out
,
StandardCharsets
.
UTF_8
);
BufferedWriter
bufferedOutputStreamWriter
=
new
BufferedWriter
(
outputStreamWriter
))
{
for
(
int
i
=
0
;
i
<
workLogList
.
size
();
i
++)
{
if
(
i
>
0
)
{
bufferedOutputStreamWriter
.
write
(
StringTools
.
LF
);
}
bufferedOutputStreamWriter
.
write
(
this
.
gson
.
toJson
(
workLogList
.
get
(
i
)));
}
}
}
private
void
transferAttachments
(
FileSystem
fileSystem
,
Path
dir
,
List
<
Attachment
>
attachmentList
)
throws
Exception
{
Path
path
=
new
Path
(
dir
,
"attachments.json"
);
try
(
FSDataOutputStream
out
=
fileSystem
.
create
(
path
);
OutputStreamWriter
outputStreamWriter
=
new
OutputStreamWriter
(
out
,
StandardCharsets
.
UTF_8
);
BufferedWriter
bufferedOutputStreamWriter
=
new
BufferedWriter
(
outputStreamWriter
))
{
for
(
int
i
=
0
;
i
<
attachmentList
.
size
();
i
++)
{
if
(
i
>
0
)
{
bufferedOutputStreamWriter
.
write
(
StringTools
.
LF
);
}
bufferedOutputStreamWriter
.
write
(
this
.
gson
.
toJson
(
attachmentList
.
get
(
i
)));
}
}
for
(
Attachment
attachment
:
attachmentList
)
{
Path
attachmentPath
=
new
Path
(
dir
,
"attachment_"
+
attachment
.
getId
());
try
(
FSDataOutputStream
out
=
fileSystem
.
create
(
attachmentPath
))
{
StorageMapping
mapping
=
ThisApplication
.
context
().
storageMappings
().
get
(
Attachment
.
class
,
attachment
.
getStorage
());
if
(
null
!=
mapping
)
{
byte
[]
bytes
=
attachment
.
readContent
(
mapping
);
IOUtils
.
write
(
bytes
,
out
);
}
}
}
}
private
org
.
apache
.
hadoop
.
conf
.
Configuration
configuration
(
ArchiveHadoop
archiveHadoop
)
{
if
(
StringUtils
.
isNotEmpty
(
archiveHadoop
.
getUsername
()))
{
System
.
setProperty
(
SYSTEM_PROPERTY_HADOOP_USER_NAME
,
archiveHadoop
.
getUsername
());
}
org
.
apache
.
hadoop
.
conf
.
Configuration
configuration
=
new
org
.
apache
.
hadoop
.
conf
.
Configuration
();
configuration
.
set
(
ATTRIBUTE_FS_DEFAULTFS
,
archiveHadoop
.
getFsDefaultFS
());
return
configuration
;
}
private
org
.
apache
.
hadoop
.
fs
.
Path
dir
(
ArchiveHadoop
archiveHadoop
,
WorkCompleted
workCompleted
)
{
org
.
apache
.
hadoop
.
fs
.
Path
path
;
if
(
StringUtils
.
isEmpty
(
archiveHadoop
.
getPath
()))
{
path
=
new
org
.
apache
.
hadoop
.
fs
.
Path
(
Path
.
SEPARATOR
);
}
else
if
(
StringUtils
.
startsWith
(
archiveHadoop
.
getPath
(),
Path
.
SEPARATOR
))
{
path
=
new
org
.
apache
.
hadoop
.
fs
.
Path
(
archiveHadoop
.
getPath
());
}
else
{
path
=
new
org
.
apache
.
hadoop
.
fs
.
Path
(
Path
.
SEPARATOR
+
archiveHadoop
.
getPath
());
}
path
=
new
org
.
apache
.
hadoop
.
fs
.
Path
(
path
,
new
org
.
apache
.
hadoop
.
fs
.
Path
(
workCompleted
.
getApplication
()));
path
=
new
org
.
apache
.
hadoop
.
fs
.
Path
(
path
,
new
org
.
apache
.
hadoop
.
fs
.
Path
(
workCompleted
.
getProcess
()));
String
id
=
workCompleted
.
getId
();
path
=
new
org
.
apache
.
hadoop
.
fs
.
Path
(
path
,
new
org
.
apache
.
hadoop
.
fs
.
Path
(
id
.
substring
(
0
,
2
)));
path
=
new
org
.
apache
.
hadoop
.
fs
.
Path
(
path
,
new
org
.
apache
.
hadoop
.
fs
.
Path
(
id
.
substring
(
2
,
4
)));
path
=
new
org
.
apache
.
hadoop
.
fs
.
Path
(
path
,
new
org
.
apache
.
hadoop
.
fs
.
Path
(
id
));
return
path
;
}
private
List
<
TaskCompleted
>
listTaskCompleted
(
Business
business
,
String
job
)
throws
Exception
{
return
business
.
entityManagerContainer
().
listEqual
(
TaskCompleted
.
class
,
TaskCompleted
.
job_FIELDNAME
,
job
);
}
private
List
<
ReadCompleted
>
listReadCompleted
(
Business
business
,
String
job
)
throws
Exception
{
return
business
.
entityManagerContainer
().
listEqual
(
ReadCompleted
.
class
,
ReadCompleted
.
job_FIELDNAME
,
job
);
}
private
List
<
Review
>
listReview
(
Business
business
,
String
job
)
throws
Exception
{
return
business
.
entityManagerContainer
().
listEqual
(
Review
.
class
,
Review
.
job_FIELDNAME
,
job
);
}
private
List
<
Record
>
listRecord
(
Business
business
,
String
job
)
throws
Exception
{
return
business
.
entityManagerContainer
().
listEqual
(
Record
.
class
,
Review
.
job_FIELDNAME
,
job
);
}
private
List
<
WorkLog
>
listWorkLog
(
Business
business
,
String
job
)
throws
Exception
{
return
business
.
entityManagerContainer
().
listEqual
(
WorkLog
.
class
,
Review
.
job_FIELDNAME
,
job
);
}
private
List
<
Attachment
>
listAttachment
(
Business
business
,
String
job
)
throws
Exception
{
return
business
.
entityManagerContainer
().
listEqual
(
Attachment
.
class
,
ReadCompleted
.
job_FIELDNAME
,
job
);
}
private
Event
exist
(
String
id
)
{
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
return
emc
.
find
(
id
,
Event
.
class
);
}
catch
(
Exception
e
)
{
LOGGER
.
error
(
e
);
}
return
null
;
}
private
void
success
(
String
id
)
throws
Exception
{
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
Event
event
=
emc
.
find
(
id
,
Event
.
class
);
if
(
null
!=
event
)
{
emc
.
beginTransaction
(
Event
.
class
);
emc
.
remove
(
event
);
emc
.
commit
();
}
}
catch
(
Exception
e
)
{
LOGGER
.
error
(
e
);
}
}
private
void
failure
(
String
id
)
{
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
Event
event
=
emc
.
find
(
id
,
Event
.
class
);
if
(
null
!=
event
)
{
emc
.
beginTransaction
(
Event
.
class
);
Integer
failure
=
event
.
getFailure
();
failure
=
(
failure
==
null
)
?
1
:
failure
+
1
;
event
.
setFailure
(
failure
);
emc
.
commit
();
}
}
catch
(
Exception
e
)
{
LOGGER
.
error
(
e
);
}
}
private
List
<
String
>
checkOverstay
()
throws
Exception
{
List
<
String
>
list
=
new
ArrayList
<>();
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
EntityManager
em
=
emc
.
get
(
Event
.
class
);
CriteriaBuilder
cb
=
em
.
getCriteriaBuilder
();
CriteriaQuery
<
String
>
cq
=
cb
.
createQuery
(
String
.
class
);
Root
<
Event
>
root
=
cq
.
from
(
Event
.
class
);
Predicate
p
=
cb
.
equal
(
root
.
get
(
Event_
.
type
),
Event
.
EVENTTYPE_ARCHIVEHADOOP
);
p
=
cb
.
and
(
p
,
cb
.
lessThanOrEqualTo
(
root
.
get
(
JpaObject_
.
updateTime
),
DateUtils
.
addMinutes
(
new
Date
(),
-
RETRYMINUTES
)));
list
.
addAll
(
em
.
createQuery
(
cq
.
select
(
root
.
get
(
Event_
.
id
)).
where
(
p
)).
setMaxResults
(
100
).
getResultList
());
}
if
(!
list
.
isEmpty
())
{
LOGGER
.
info
(
"查找到 {} 条处理失败的归档到hadoop事件."
,
list:
:
size
);
}
return
list
;
}
private
void
clean
()
throws
Exception
{
List
<
String
>
list
=
new
ArrayList
<>();
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
EntityManager
em
=
emc
.
get
(
Event
.
class
);
CriteriaBuilder
cb
=
em
.
getCriteriaBuilder
();
CriteriaQuery
<
String
>
cq
=
cb
.
createQuery
(
String
.
class
);
Root
<
Event
>
root
=
cq
.
from
(
Event
.
class
);
Predicate
p
=
cb
.
equal
(
root
.
get
(
Event_
.
type
),
Event
.
EVENTTYPE_ARCHIVEHADOOP
);
p
=
cb
.
and
(
p
,
cb
.
lessThanOrEqualTo
(
root
.
get
(
JpaObject_
.
createTime
),
DateUtils
.
addDays
(
new
Date
(),
-
THRESHOLDMINUTES
)));
list
.
addAll
(
em
.
createQuery
(
cq
.
select
(
root
.
get
(
Event_
.
id
)).
where
(
p
)).
setMaxResults
(
100
).
getResultList
());
if
(!
list
.
isEmpty
())
{
emc
.
beginTransaction
(
Event
.
class
);
for
(
String
id
:
list
)
{
Event
event
=
emc
.
find
(
id
,
Event
.
class
);
if
(
null
!=
event
)
{
emc
.
remove
(
event
);
}
}
emc
.
commit
();
}
}
if
(!
list
.
isEmpty
())
{
LOGGER
.
info
(
"删除 {} 条超期的归档到hadoop事件."
,
list:
:
size
);
}
}
}
\ No newline at end of file
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/ThisApplication.java
浏览文件 @
10ba7bd1
...
@@ -52,6 +52,8 @@ public class ThisApplication {
...
@@ -52,6 +52,8 @@ public class ThisApplication {
public
static
final
SyncJaxwsInvokeQueue
syncJaxwsInvokeQueue
=
new
SyncJaxwsInvokeQueue
();
public
static
final
SyncJaxwsInvokeQueue
syncJaxwsInvokeQueue
=
new
SyncJaxwsInvokeQueue
();
public
static
final
UpdateTableQueue
updateTableQueue
=
new
UpdateTableQueue
();
public
static
final
UpdateTableQueue
updateTableQueue
=
new
UpdateTableQueue
();
public
static
final
ArchiveHadoopQueue
archiveHadoopQueue
=
new
ArchiveHadoopQueue
();
private
static
ProcessingToProcessingSignalStack
processingToProcessingSignalStack
=
new
ProcessingToProcessingSignalStack
();
private
static
ProcessingToProcessingSignalStack
processingToProcessingSignalStack
=
new
ProcessingToProcessingSignalStack
();
...
@@ -71,6 +73,7 @@ public class ThisApplication {
...
@@ -71,6 +73,7 @@ public class ThisApplication {
context
().
startQueue
(
syncJaxrsInvokeQueue
);
context
().
startQueue
(
syncJaxrsInvokeQueue
);
context
().
startQueue
(
syncJaxwsInvokeQueue
);
context
().
startQueue
(
syncJaxwsInvokeQueue
);
context
().
startQueue
(
updateTableQueue
);
context
().
startQueue
(
updateTableQueue
);
context
().
startQueue
(
archiveHadoopQueue
);
if
(
BooleanUtils
.
isTrue
(
Config
.
processPlatform
().
getMerge
().
getEnable
()))
{
if
(
BooleanUtils
.
isTrue
(
Config
.
processPlatform
().
getMerge
().
getEnable
()))
{
context
.
schedule
(
Merge
.
class
,
Config
.
processPlatform
().
getMerge
().
getCron
());
context
.
schedule
(
Merge
.
class
,
Config
.
processPlatform
().
getMerge
().
getCron
());
}
}
...
@@ -98,6 +101,9 @@ public class ThisApplication {
...
@@ -98,6 +101,9 @@ public class ThisApplication {
if
(
BooleanUtils
.
isTrue
(
Config
.
processPlatform
().
getUpdateTable
().
getEnable
()))
{
if
(
BooleanUtils
.
isTrue
(
Config
.
processPlatform
().
getUpdateTable
().
getEnable
()))
{
context
.
schedule
(
UpdateTable
.
class
,
Config
.
processPlatform
().
getUpdateTable
().
getCron
());
context
.
schedule
(
UpdateTable
.
class
,
Config
.
processPlatform
().
getUpdateTable
().
getCron
());
}
}
if
(
BooleanUtils
.
isTrue
(
Config
.
processPlatform
().
getArchiveHadoop
().
getEnable
()))
{
context
.
schedule
(
UpdateTable
.
class
,
Config
.
processPlatform
().
getArchiveHadoop
().
getCron
());
}
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
e
.
printStackTrace
();
}
}
...
...
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/UpdateTableQueue.java
浏览文件 @
10ba7bd1
...
@@ -17,9 +17,9 @@ import com.google.gson.Gson;
...
@@ -17,9 +17,9 @@ import com.google.gson.Gson;
import
com.google.gson.JsonElement
;
import
com.google.gson.JsonElement
;
import
com.x.base.core.container.EntityManagerContainer
;
import
com.x.base.core.container.EntityManagerContainer
;
import
com.x.base.core.container.factory.EntityManagerContainerFactory
;
import
com.x.base.core.container.factory.EntityManagerContainerFactory
;
import
com.x.base.core.entity.JpaObject_
;
import
com.x.base.core.project.Applications
;
import
com.x.base.core.project.Applications
;
import
com.x.base.core.project.x_query_service_processing
;
import
com.x.base.core.project.x_query_service_processing
;
import
com.x.base.core.project.config.Config
;
import
com.x.base.core.project.gson.XGsonBuilder
;
import
com.x.base.core.project.gson.XGsonBuilder
;
import
com.x.base.core.project.jaxrs.WrapBoolean
;
import
com.x.base.core.project.jaxrs.WrapBoolean
;
import
com.x.base.core.project.logger.Logger
;
import
com.x.base.core.project.logger.Logger
;
...
@@ -36,6 +36,9 @@ public class UpdateTableQueue extends AbstractQueue<String> {
...
@@ -36,6 +36,9 @@ public class UpdateTableQueue extends AbstractQueue<String> {
private
Gson
gson
=
XGsonBuilder
.
instance
();
private
Gson
gson
=
XGsonBuilder
.
instance
();
private
static
final
int
RETRYMINUTES
=
20
;
private
static
final
int
THRESHOLDMINUTES
=
60
*
24
*
3
;
protected
void
execute
(
String
id
)
throws
Exception
{
protected
void
execute
(
String
id
)
throws
Exception
{
if
(
StringUtils
.
isNotEmpty
(
id
))
{
if
(
StringUtils
.
isNotEmpty
(
id
))
{
update
(
id
);
update
(
id
);
...
@@ -73,7 +76,7 @@ public class UpdateTableQueue extends AbstractQueue<String> {
...
@@ -73,7 +76,7 @@ public class UpdateTableQueue extends AbstractQueue<String> {
data
=
new
WorkDataHelper
(
emc
,
workCompleted
).
get
();
data
=
new
WorkDataHelper
(
emc
,
workCompleted
).
get
();
}
}
}
}
if
(
(
null
!=
data
)
&&
(
null
!=
workCompleted
)
)
{
if
(
null
!=
data
)
{
JsonElement
jsonElement
=
XGsonBuilder
.
merge
(
gson
.
toJsonTree
(
workCompleted
),
gson
.
toJsonTree
(
data
));
JsonElement
jsonElement
=
XGsonBuilder
.
merge
(
gson
.
toJsonTree
(
workCompleted
),
gson
.
toJsonTree
(
data
));
WrapBoolean
resp
=
ThisApplication
.
context
().
applications
().
postQuery
(
x_query_service_processing
.
class
,
WrapBoolean
resp
=
ThisApplication
.
context
().
applications
().
postQuery
(
x_query_service_processing
.
class
,
Applications
.
joinQueryUri
(
"table"
,
event
.
getTarget
(),
"update"
,
event
.
getJob
()),
jsonElement
)
Applications
.
joinQueryUri
(
"table"
,
event
.
getTarget
(),
"update"
,
event
.
getJob
()),
jsonElement
)
...
@@ -131,12 +134,12 @@ public class UpdateTableQueue extends AbstractQueue<String> {
...
@@ -131,12 +134,12 @@ public class UpdateTableQueue extends AbstractQueue<String> {
CriteriaQuery
<
String
>
cq
=
cb
.
createQuery
(
String
.
class
);
CriteriaQuery
<
String
>
cq
=
cb
.
createQuery
(
String
.
class
);
Root
<
Event
>
root
=
cq
.
from
(
Event
.
class
);
Root
<
Event
>
root
=
cq
.
from
(
Event
.
class
);
Predicate
p
=
cb
.
equal
(
root
.
get
(
Event_
.
type
),
Event
.
EVENTTYPE_UPDATETABLE
);
Predicate
p
=
cb
.
equal
(
root
.
get
(
Event_
.
type
),
Event
.
EVENTTYPE_UPDATETABLE
);
p
=
cb
.
and
(
p
,
cb
.
lessThanOrEqualTo
(
root
.
get
(
Even
t_
.
updateTime
),
p
=
cb
.
and
(
p
,
cb
.
lessThanOrEqualTo
(
root
.
get
(
JpaObjec
t_
.
updateTime
),
DateUtils
.
addMinutes
(
new
Date
(),
-
Config
.
processPlatform
().
getUpdateTable
().
getRetryMinutes
()
)));
DateUtils
.
addMinutes
(
new
Date
(),
-
RETRYMINUTES
)));
list
.
addAll
(
em
.
createQuery
(
cq
.
select
(
root
.
get
(
Event_
.
id
)).
where
(
p
)).
setMaxResults
(
100
).
getResultList
());
list
.
addAll
(
em
.
createQuery
(
cq
.
select
(
root
.
get
(
Event_
.
id
)).
where
(
p
)).
setMaxResults
(
100
).
getResultList
());
}
}
if
(!
list
.
isEmpty
())
{
if
(!
list
.
isEmpty
())
{
LOGGER
.
info
(
"查找到 {} 条处理失败的同步到自建表事件."
,
()
->
list
.
size
()
);
LOGGER
.
info
(
"查找到 {} 条处理失败的同步到自建表事件."
,
list:
:
size
);
}
}
return
list
;
return
list
;
}
}
...
@@ -149,8 +152,8 @@ public class UpdateTableQueue extends AbstractQueue<String> {
...
@@ -149,8 +152,8 @@ public class UpdateTableQueue extends AbstractQueue<String> {
CriteriaQuery
<
String
>
cq
=
cb
.
createQuery
(
String
.
class
);
CriteriaQuery
<
String
>
cq
=
cb
.
createQuery
(
String
.
class
);
Root
<
Event
>
root
=
cq
.
from
(
Event
.
class
);
Root
<
Event
>
root
=
cq
.
from
(
Event
.
class
);
Predicate
p
=
cb
.
equal
(
root
.
get
(
Event_
.
type
),
Event
.
EVENTTYPE_UPDATETABLE
);
Predicate
p
=
cb
.
equal
(
root
.
get
(
Event_
.
type
),
Event
.
EVENTTYPE_UPDATETABLE
);
p
=
cb
.
and
(
p
,
cb
.
lessThanOrEqualTo
(
root
.
get
(
Event_
.
createTime
),
DateUtils
.
addMinutes
(
new
Date
(
),
p
=
cb
.
and
(
p
,
cb
.
lessThanOrEqualTo
(
root
.
get
(
JpaObject_
.
createTime
),
-
Config
.
processPlatform
().
getUpdateTable
().
getThresholdMinutes
()
)));
DateUtils
.
addMinutes
(
new
Date
(),
-
THRESHOLDMINUTES
)));
list
.
addAll
(
em
.
createQuery
(
cq
.
select
(
root
.
get
(
Event_
.
id
)).
where
(
p
)).
setMaxResults
(
100
).
getResultList
());
list
.
addAll
(
em
.
createQuery
(
cq
.
select
(
root
.
get
(
Event_
.
id
)).
where
(
p
)).
setMaxResults
(
100
).
getResultList
());
if
(!
list
.
isEmpty
())
{
if
(!
list
.
isEmpty
())
{
emc
.
beginTransaction
(
Event
.
class
);
emc
.
beginTransaction
(
Event
.
class
);
...
@@ -164,7 +167,7 @@ public class UpdateTableQueue extends AbstractQueue<String> {
...
@@ -164,7 +167,7 @@ public class UpdateTableQueue extends AbstractQueue<String> {
}
}
}
}
if
(!
list
.
isEmpty
())
{
if
(!
list
.
isEmpty
())
{
LOGGER
.
info
(
"删除 {} 条超期的同步到自建表事件."
,
()
->
list
.
size
()
);
LOGGER
.
info
(
"删除 {} 条超期的同步到自建表事件."
,
list:
:
size
);
}
}
}
}
}
}
\ No newline at end of file
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/end/EndProcessor.java
浏览文件 @
10ba7bd1
...
@@ -166,30 +166,55 @@ public class EndProcessor extends AbstractEndProcessor {
...
@@ -166,30 +166,55 @@ public class EndProcessor extends AbstractEndProcessor {
// 回写到父Work
// 回写到父Work
tryUpdateParentWork
(
aeiObjects
);
tryUpdateParentWork
(
aeiObjects
);
addUpdateTableEvent
(
aeiObjects
);
addUpdateTableEvent
(
aeiObjects
);
addArchiveHadoopEvent
(
aeiObjects
);
}
}
private
void
addUpdateTableEvent
(
AeiObjects
aeiObjects
)
throws
Exception
{
private
void
addArchiveHadoopEvent
(
AeiObjects
aeiObjects
)
{
if
(
BooleanUtils
.
isTrue
(
aeiObjects
.
getProcess
().
getUpdateTableEnable
())
try
{
&&
ListTools
.
isNotEmpty
(
aeiObjects
.
getProcess
().
getUpdateTableList
()))
{
if
(
BooleanUtils
.
isTrue
(
Config
.
processPlatform
().
getArchiveHadoop
().
getEnable
()))
{
List
<
Event
>
events
=
new
ArrayList
<>();
for
(
String
table
:
aeiObjects
.
getProcess
().
getUpdateTableList
())
{
if
(
StringUtils
.
isNotEmpty
(
table
))
{
Event
event
=
new
Event
();
event
.
setTarget
(
table
);
event
.
setJob
(
aeiObjects
.
getWork
().
getJob
());
event
.
setType
(
Event
.
EVENTTYPE_UPDATETABLE
);
events
.
add
(
event
);
}
}
if
(!
events
.
isEmpty
())
{
aeiObjects
.
entityManagerContainer
().
beginTransaction
(
Event
.
class
);
aeiObjects
.
entityManagerContainer
().
beginTransaction
(
Event
.
class
);
for
(
Event
event
:
events
)
{
Event
event
=
new
Event
();
aeiObjects
.
entityManagerContainer
().
persist
(
event
,
CheckPersistType
.
all
);
event
.
setJob
(
aeiObjects
.
getWork
().
getJob
());
}
event
.
setType
(
Event
.
EVENTTYPE_ARCHIVEHADOOP
);
aeiObjects
.
entityManagerContainer
().
persist
(
event
,
CheckPersistType
.
all
);
aeiObjects
.
entityManagerContainer
().
commit
();
aeiObjects
.
entityManagerContainer
().
commit
();
for
(
Event
event
:
events
)
{
ThisApplication
.
updateTableQueue
.
send
(
event
.
getId
());
ThisApplication
.
updateTableQueue
.
send
(
event
.
getId
());
}
}
catch
(
Exception
e
)
{
LOGGER
.
error
(
e
);
}
}
private
void
addUpdateTableEvent
(
AeiObjects
aeiObjects
)
{
try
{
if
(
BooleanUtils
.
isTrue
(
aeiObjects
.
getProcess
().
getUpdateTableEnable
())
&&
ListTools
.
isNotEmpty
(
aeiObjects
.
getProcess
().
getUpdateTableList
()))
{
List
<
Event
>
events
=
new
ArrayList
<>();
for
(
String
table
:
aeiObjects
.
getProcess
().
getUpdateTableList
())
{
if
(
StringUtils
.
isNotEmpty
(
table
))
{
Event
event
=
new
Event
();
event
.
setTarget
(
table
);
event
.
setJob
(
aeiObjects
.
getWork
().
getJob
());
event
.
setType
(
Event
.
EVENTTYPE_UPDATETABLE
);
events
.
add
(
event
);
}
}
}
sendUpdateTableEvent
(
aeiObjects
,
events
);
}
}
catch
(
Exception
e
)
{
LOGGER
.
error
(
e
);
}
}
private
void
sendUpdateTableEvent
(
AeiObjects
aeiObjects
,
List
<
Event
>
events
)
throws
Exception
{
if
(!
events
.
isEmpty
())
{
aeiObjects
.
entityManagerContainer
().
beginTransaction
(
Event
.
class
);
for
(
Event
event
:
events
)
{
aeiObjects
.
entityManagerContainer
().
persist
(
event
,
CheckPersistType
.
all
);
}
aeiObjects
.
entityManagerContainer
().
commit
();
for
(
Event
event
:
events
)
{
ThisApplication
.
updateTableQueue
.
send
(
event
.
getId
());
}
}
}
}
}
}
...
...
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/schedule/ArchiveHadoop.java
0 → 100644
浏览文件 @
10ba7bd1
package
com.x.processplatform.service.processing.schedule
;
import
org.quartz.JobExecutionContext
;
import
org.quartz.JobExecutionException
;
import
com.x.base.core.project.logger.Logger
;
import
com.x.base.core.project.logger.LoggerFactory
;
import
com.x.base.core.project.schedule.AbstractJob
;
import
com.x.processplatform.service.processing.ThisApplication
;
public
class
ArchiveHadoop
extends
AbstractJob
{
private
static
final
Logger
LOGGER
=
LoggerFactory
.
getLogger
(
ArchiveHadoop
.
class
);
@Override
public
void
schedule
(
JobExecutionContext
jobExecutionContext
)
throws
Exception
{
LOGGER
.
debug
(
"send archiveHadoopQueue signal."
);
try
{
ThisApplication
.
archiveHadoopQueue
.
send
(
""
);
}
catch
(
Exception
e
)
{
throw
new
JobExecutionException
(
e
);
}
}
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录