Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
此号慢热型
o2oa
提交
013c7212
o2oa
项目概览
此号慢热型
/
o2oa
与 Fork 源项目一致
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
o2oa
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
013c7212
编写于
5月 21, 2020
作者:
Z
zhourui
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
消息处理
上级
faf27c29
变更
14
隐藏空白更改
内联
并排
Showing
14 changed file
with
31 addition
and
39 deletion
+31
-39
o2server/start_windows_debug.bat
o2server/start_windows_debug.bat
+1
-1
o2server/x_base_core_project/src/main/java/com/x/base/core/container/FactorDistributionPolicy.java
...a/com/x/base/core/container/FactorDistributionPolicy.java
+4
-4
o2server/x_console/src/main/java/com/x/server/console/Main.java
...er/x_console/src/main/java/com/x/server/console/Main.java
+0
-1
o2server/x_console/src/main/java/com/x/server/console/action/DumpData.java
...e/src/main/java/com/x/server/console/action/DumpData.java
+7
-4
o2server/x_console/src/main/java/com/x/server/console/action/RestoreData.java
...rc/main/java/com/x/server/console/action/RestoreData.java
+1
-2
o2server/x_console/src/main/java/com/x/server/console/server/JettySeverTools.java
...ain/java/com/x/server/console/server/JettySeverTools.java
+6
-8
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/jaxrs/connector/ActionCreate.java
...ge/assemble/communicate/jaxrs/connector/ActionCreate.java
+0
-2
o2server/x_message_assemble_communicate/src/main/webapp/describe/sources/com/x/message/assemble/communicate/jaxrs/connector/ActionCreate.java
...ge/assemble/communicate/jaxrs/connector/ActionCreate.java
+0
-2
o2server/x_message_core_entity/src/main/java/com/x/message/core/entity/Instant.java
...tity/src/main/java/com/x/message/core/entity/Instant.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
+1
-1
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/factory/element/ApplicationDictItemFactory.java
...e/surface/factory/element/ApplicationDictItemFactory.java
+7
-1
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionCreate.java
...essplatform/assemble/surface/jaxrs/work/ActionCreate.java
+1
-10
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionCreateForce.java
...atform/assemble/surface/jaxrs/work/ActionCreateForce.java
+1
-1
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionCreateWithApplicationProcess.java
...urface/jaxrs/work/ActionCreateWithApplicationProcess.java
+1
-1
未找到文件。
o2server/start_windows_debug.bat
浏览文件 @
013c7212
...
@@ -144,5 +144,5 @@ if exist "%~dp0local\update" (
...
@@ -144,5 +144,5 @@ if exist "%~dp0local\update" (
)
)
)
)
@echo
on
@echo
on
"
%~dp0
jvm\windows\bin\java"
-server
Dcom
.sun.management.jmxremote.ssl
=
false
-Dcom
.sun.management.jmxremote.port
=
1099
-Dcom
.sun.management.jmxremote.authenticate
=
false
-Xdebug -Xrunjdwp
:transport
=
dt_socket
,
server
=
y
,
suspend
=
n
,
address
=
20000
-Xms
2
g
-Xmx
8
g
-XX
:
+UseG
1
GC
-XX
:
+HeapDumpOnOutOfMemoryError -jar
"
%~dp0
console.jar"
"
%~dp0
jvm\windows\bin\java"
-server
-
Dcom
.sun.management.jmxremote.ssl
=
false
-Dcom
.sun.management.jmxremote.port
=
1099
-Dcom
.sun.management.jmxremote.authenticate
=
false
-Xdebug -Xrunjdwp
:transport
=
dt_socket
,
server
=
y
,
suspend
=
n
,
address
=
20000
-Xms
2
g
-Xmx
8
g
-XX
:
+UseG
1
GC
-XX
:
+HeapDumpOnOutOfMemoryError -jar
"
%~dp0
console.jar"
pause
pause
\ No newline at end of file
o2server/x_base_core_project/src/main/java/com/x/base/core/container/FactorDistributionPolicy.java
浏览文件 @
013c7212
...
@@ -3,22 +3,22 @@ package com.x.base.core.container;
...
@@ -3,22 +3,22 @@ package com.x.base.core.container;
import
java.util.List
;
import
java.util.List
;
import
java.util.Random
;
import
java.util.Random
;
import
com.x.base.core.entity.JpaObject
;
import
org.apache.commons.beanutils.PropertyUtils
;
import
org.apache.commons.beanutils.PropertyUtils
;
import
org.apache.openjpa.slice.DistributionPolicy
;
import
org.apache.openjpa.slice.DistributionPolicy
;
import
com.x.base.core.entity.SliceJpaObject
;
public
class
FactorDistributionPolicy
implements
DistributionPolicy
{
public
class
FactorDistributionPolicy
implements
DistributionPolicy
{
private
Random
random
=
new
Random
();
private
Random
random
=
new
Random
();
public
String
distribute
(
Object
pc
,
List
<
String
>
slices
,
Object
context
)
{
public
String
distribute
(
Object
pc
,
List
<
String
>
slices
,
Object
context
)
{
try
{
try
{
Object
o
=
PropertyUtils
.
getProperty
(
pc
,
Slice
JpaObject
.
distributeFactor_FIELDNAME
);
Object
o
=
PropertyUtils
.
getProperty
(
pc
,
JpaObject
.
distributeFactor_FIELDNAME
);
Integer
factor
=
null
;
Integer
factor
=
null
;
if
(
null
==
o
)
{
if
(
null
==
o
)
{
factor
=
random
.
nextInt
(
1000
);
factor
=
random
.
nextInt
(
1000
);
PropertyUtils
.
setProperty
(
pc
,
Slice
JpaObject
.
distributeFactor_FIELDNAME
,
factor
);
PropertyUtils
.
setProperty
(
pc
,
JpaObject
.
distributeFactor_FIELDNAME
,
factor
);
}
else
{
}
else
{
factor
=
(
Integer
)
o
;
factor
=
(
Integer
)
o
;
}
}
...
...
o2server/x_console/src/main/java/com/x/server/console/Main.java
浏览文件 @
013c7212
...
@@ -64,7 +64,6 @@ public class Main {
...
@@ -64,7 +64,6 @@ public class Main {
slf4jOtherImplOn
=
true
;
slf4jOtherImplOn
=
true
;
}
}
org
.
slf4j
.
impl
.
StaticLoggerBinder
.
getSingleton
();
org
.
slf4j
.
impl
.
StaticLoggerBinder
.
getSingleton
();
System
.
out
.
println
(
"logger:"
+
org
.
slf4j
.
LoggerFactory
.
getLogger
(
Main
.
class
));
SystemOutErrorSideCopyBuilder
.
start
();
SystemOutErrorSideCopyBuilder
.
start
();
ResourceFactory
.
bind
();
ResourceFactory
.
bind
();
CommandFactory
.
printStartHelp
();
CommandFactory
.
printStartHelp
();
...
...
o2server/x_console/src/main/java/com/x/server/console/action/DumpData.java
浏览文件 @
013c7212
...
@@ -77,9 +77,9 @@ public class DumpData {
...
@@ -77,9 +77,9 @@ public class DumpData {
persistence
.
getName
(),
PersistenceXmlHelper
.
properties
(
cls
.
getName
(),
Config
.
slice
().
getEnable
()));
persistence
.
getName
(),
PersistenceXmlHelper
.
properties
(
cls
.
getName
(),
Config
.
slice
().
getEnable
()));
EntityManager
em
=
emf
.
createEntityManager
();
EntityManager
em
=
emf
.
createEntityManager
();
try
{
try
{
lo
gger
.
print
(
"dump data({}/{}): {}, count: {}."
,
(
i
+
1
),
classNames
.
size
(),
cls
.
getName
(),
lo
ng
estimateCount
=
this
.
estimateCount
(
em
,
cls
);
this
.
estimateCount
(
em
,
cls
)
);
logger
.
print
(
"dump data({}/{}): {}, count: {}."
,
(
i
+
1
),
classNames
.
size
(),
cls
.
getName
(),
estimateCount
);
this
.
dump
(
cls
,
em
);
this
.
dump
(
cls
,
em
,
estimateCount
);
}
finally
{
}
finally
{
em
.
close
();
em
.
close
();
emf
.
close
();
emf
.
close
();
...
@@ -104,7 +104,7 @@ public class DumpData {
...
@@ -104,7 +104,7 @@ public class DumpData {
return
this
.
catalog
.
values
().
stream
().
mapToInt
(
Integer:
:
intValue
).
sum
();
return
this
.
catalog
.
values
().
stream
().
mapToInt
(
Integer:
:
intValue
).
sum
();
}
}
private
<
T
>
void
dump
(
Class
<
T
>
cls
,
EntityManager
em
)
private
<
T
>
void
dump
(
Class
<
T
>
cls
,
EntityManager
em
,
long
total
)
throws
IOException
,
IllegalAccessException
,
InvocationTargetException
,
NoSuchMethodException
{
throws
IOException
,
IllegalAccessException
,
InvocationTargetException
,
NoSuchMethodException
{
/** 创建最终存储文件的目录 */
/** 创建最终存储文件的目录 */
File
directory
=
new
File
(
dir
,
cls
.
getName
());
File
directory
=
new
File
(
dir
,
cls
.
getName
());
...
@@ -114,6 +114,8 @@ public class DumpData {
...
@@ -114,6 +114,8 @@ public class DumpData {
String
id
=
""
;
String
id
=
""
;
List
<
T
>
list
=
null
;
List
<
T
>
list
=
null
;
int
count
=
0
;
int
count
=
0
;
int
loop
=
1
;
int
btach
=
(
int
)
((
total
+
0.0
)
/
containerEntity
.
dumpSize
());
do
{
do
{
list
=
this
.
list
(
em
,
cls
,
id
,
containerEntity
.
dumpSize
());
list
=
this
.
list
(
em
,
cls
,
id
,
containerEntity
.
dumpSize
());
if
(
ListTools
.
isNotEmpty
(
list
))
{
if
(
ListTools
.
isNotEmpty
(
list
))
{
...
@@ -121,6 +123,7 @@ public class DumpData {
...
@@ -121,6 +123,7 @@ public class DumpData {
id
=
BeanUtils
.
getProperty
(
list
.
get
(
list
.
size
()
-
1
),
JpaObject
.
id_FIELDNAME
);
id
=
BeanUtils
.
getProperty
(
list
.
get
(
list
.
size
()
-
1
),
JpaObject
.
id_FIELDNAME
);
File
file
=
new
File
(
directory
,
count
+
".json"
);
File
file
=
new
File
(
directory
,
count
+
".json"
);
FileUtils
.
write
(
file
,
pureGsonDateFormated
.
toJson
(
list
),
DefaultCharset
.
charset
);
FileUtils
.
write
(
file
,
pureGsonDateFormated
.
toJson
(
list
),
DefaultCharset
.
charset
);
logger
.
print
(
"dumping {}/{} part of data:{}."
,
loop
,
btach
,
cls
.
getName
());
}
}
em
.
clear
();
em
.
clear
();
}
while
(
ListTools
.
isNotEmpty
(
list
));
}
while
(
ListTools
.
isNotEmpty
(
list
));
...
...
o2server/x_console/src/main/java/com/x/server/console/action/RestoreData.java
浏览文件 @
013c7212
...
@@ -133,7 +133,7 @@ public class RestoreData {
...
@@ -133,7 +133,7 @@ public class RestoreData {
File
file
=
null
;
File
file
=
null
;
for
(
int
i
=
0
;
i
<
files
.
size
();
i
++)
{
for
(
int
i
=
0
;
i
<
files
.
size
();
i
++)
{
file
=
files
.
get
(
i
);
file
=
files
.
get
(
i
);
System
.
out
.
println
(
"restoring "
+
(
i
+
1
)
+
"/"
+
files
.
size
()
+
" part of data: "
+
cls
.
getName
()
+
"."
);
logger
.
print
(
"restoring {}/{} part of data:{}."
,
(
i
+
1
),
files
.
size
(),
cls
.
getName
()
);
JsonArray
raws
=
this
.
convert
(
file
);
JsonArray
raws
=
this
.
convert
(
file
);
em
.
getTransaction
().
begin
();
em
.
getTransaction
().
begin
();
for
(
JsonElement
o
:
raws
)
{
for
(
JsonElement
o
:
raws
)
{
...
@@ -143,7 +143,6 @@ public class RestoreData {
...
@@ -143,7 +143,6 @@ public class RestoreData {
}
}
em
.
getTransaction
().
commit
();
em
.
getTransaction
().
commit
();
em
.
clear
();
em
.
clear
();
Runtime
.
getRuntime
().
gc
();
}
}
System
.
out
.
println
(
"restore data: "
+
cls
.
getName
()
+
" completed, count: "
+
count
+
"."
);
System
.
out
.
println
(
"restore data: "
+
cls
.
getName
()
+
" completed, count: "
+
count
+
"."
);
return
count
;
return
count
;
...
...
o2server/x_console/src/main/java/com/x/server/console/server/JettySeverTools.java
浏览文件 @
013c7212
...
@@ -37,14 +37,13 @@ public abstract class JettySeverTools {
...
@@ -37,14 +37,13 @@ public abstract class JettySeverTools {
config
.
setSendServerVersion
(
true
);
config
.
setSendServerVersion
(
true
);
config
.
setSendDateHeader
(
false
);
config
.
setSendDateHeader
(
false
);
ServerConnector
sslConnector
=
new
ServerConnector
(
server
,
ServerConnector
https
=
new
ServerConnector
(
server
,
new
SslConnectionFactory
(
sslContextFactory
,
HttpVersion
.
HTTP_1_1
.
asString
()),
new
SslConnectionFactory
(
sslContextFactory
,
HttpVersion
.
HTTP_1_1
.
asString
()),
new
HttpConnectionFactory
(
config
));
new
HttpConnectionFactory
(
config
));
/* 添加到32,压力测试 */
https
.
setAcceptQueueSize
(-
1
);
sslConnector
.
setAcceptQueueSize
(
32
);
https
.
setIdleTimeout
(
30000
);
sslConnector
.
setIdleTimeout
(
30000
);
https
.
setPort
(
port
);
sslConnector
.
setPort
(
port
);
server
.
addConnector
(
https
);
server
.
addConnector
(
sslConnector
);
}
}
protected
static
void
addHttpConnector
(
Server
server
,
Integer
port
)
throws
Exception
{
protected
static
void
addHttpConnector
(
Server
server
,
Integer
port
)
throws
Exception
{
...
@@ -55,8 +54,7 @@ public abstract class JettySeverTools {
...
@@ -55,8 +54,7 @@ public abstract class JettySeverTools {
config
.
setSendServerVersion
(
true
);
config
.
setSendServerVersion
(
true
);
config
.
setSendDateHeader
(
false
);
config
.
setSendDateHeader
(
false
);
ServerConnector
http
=
new
ServerConnector
(
server
,
new
HttpConnectionFactory
(
config
));
ServerConnector
http
=
new
ServerConnector
(
server
,
new
HttpConnectionFactory
(
config
));
/* 添加到32,压力测试 */
http
.
setAcceptQueueSize
(-
1
);
http
.
setAcceptQueueSize
(
32
);
http
.
setIdleTimeout
(
30000
);
http
.
setIdleTimeout
(
30000
);
http
.
setPort
(
port
);
http
.
setPort
(
port
);
server
.
addConnector
(
http
);
server
.
addConnector
(
http
);
...
...
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/jaxrs/connector/ActionCreate.java
浏览文件 @
013c7212
...
@@ -50,7 +50,6 @@ class ActionCreate extends BaseAction {
...
@@ -50,7 +50,6 @@ class ActionCreate extends BaseAction {
}
}
}
}
Instant
instant
=
this
.
instant
(
effectivePerson
,
business
,
wi
,
new
ArrayList
<>(
consumersV2
.
keySet
()));
Instant
instant
=
this
.
instant
(
effectivePerson
,
business
,
wi
,
new
ArrayList
<>(
consumersV2
.
keySet
()));
logger
.
info
(
"生成消息。,,,consumersV2 "
+
consumersV2
.
size
());
if
(!
consumersV2
.
isEmpty
())
{
if
(!
consumersV2
.
isEmpty
())
{
for
(
String
consumer
:
consumersV2
.
keySet
())
{
for
(
String
consumer
:
consumersV2
.
keySet
())
{
Wi
cpwi
=
wi
;
Wi
cpwi
=
wi
;
...
@@ -88,7 +87,6 @@ class ActionCreate extends BaseAction {
...
@@ -88,7 +87,6 @@ class ActionCreate extends BaseAction {
logger
.
warn
(
"执行消息发送脚本[{}]方法异常:{}"
,
func
,
e
.
getMessage
());
logger
.
warn
(
"执行消息发送脚本[{}]方法异常:{}"
,
func
,
e
.
getMessage
());
}
}
Message
message
=
null
;
Message
message
=
null
;
logger
.
info
(
"这里是生成消息对象,consumer:"
+
consumer
);
switch
(
Objects
.
toString
(
consumer
,
""
))
{
switch
(
Objects
.
toString
(
consumer
,
""
))
{
case
MessageConnector
.
CONSUME_WS
:
case
MessageConnector
.
CONSUME_WS
:
message
=
this
.
wsMessage
(
effectivePerson
,
business
,
cpwi
,
instant
);
message
=
this
.
wsMessage
(
effectivePerson
,
business
,
cpwi
,
instant
);
...
...
o2server/x_message_assemble_communicate/src/main/webapp/describe/sources/com/x/message/assemble/communicate/jaxrs/connector/ActionCreate.java
浏览文件 @
013c7212
...
@@ -50,7 +50,6 @@ class ActionCreate extends BaseAction {
...
@@ -50,7 +50,6 @@ class ActionCreate extends BaseAction {
}
}
}
}
Instant
instant
=
this
.
instant
(
effectivePerson
,
business
,
wi
,
new
ArrayList
<>(
consumersV2
.
keySet
()));
Instant
instant
=
this
.
instant
(
effectivePerson
,
business
,
wi
,
new
ArrayList
<>(
consumersV2
.
keySet
()));
logger
.
info
(
"生成消息。,,,consumersV2 "
+
consumersV2
.
size
());
if
(!
consumersV2
.
isEmpty
())
{
if
(!
consumersV2
.
isEmpty
())
{
for
(
String
consumer
:
consumersV2
.
keySet
())
{
for
(
String
consumer
:
consumersV2
.
keySet
())
{
Wi
cpwi
=
wi
;
Wi
cpwi
=
wi
;
...
@@ -88,7 +87,6 @@ class ActionCreate extends BaseAction {
...
@@ -88,7 +87,6 @@ class ActionCreate extends BaseAction {
logger
.
warn
(
"执行消息发送脚本[{}]方法异常:{}"
,
func
,
e
.
getMessage
());
logger
.
warn
(
"执行消息发送脚本[{}]方法异常:{}"
,
func
,
e
.
getMessage
());
}
}
Message
message
=
null
;
Message
message
=
null
;
logger
.
info
(
"这里是生成消息对象,consumer:"
+
consumer
);
switch
(
Objects
.
toString
(
consumer
,
""
))
{
switch
(
Objects
.
toString
(
consumer
,
""
))
{
case
MessageConnector
.
CONSUME_WS
:
case
MessageConnector
.
CONSUME_WS
:
message
=
this
.
wsMessage
(
effectivePerson
,
business
,
cpwi
,
instant
);
message
=
this
.
wsMessage
(
effectivePerson
,
business
,
cpwi
,
instant
);
...
...
o2server/x_message_core_entity/src/main/java/com/x/message/core/entity/Instant.java
浏览文件 @
013c7212
...
@@ -27,7 +27,7 @@ import com.x.base.core.entity.annotation.ContainerEntity;
...
@@ -27,7 +27,7 @@ import com.x.base.core.entity.annotation.ContainerEntity;
import
com.x.base.core.project.annotation.FieldDescribe
;
import
com.x.base.core.project.annotation.FieldDescribe
;
@Entity
@Entity
@ContainerEntity
(
dumpSize
=
1000
,
type
=
ContainerEntity
.
Type
.
content
,
reference
=
ContainerEntity
.
Reference
.
strong
)
@ContainerEntity
(
dumpSize
=
1000
,
type
=
ContainerEntity
.
Type
.
log
,
reference
=
ContainerEntity
.
Reference
.
soft
)
@Table
(
name
=
PersistenceProperties
.
Instant
.
table
,
uniqueConstraints
=
{
@Table
(
name
=
PersistenceProperties
.
Instant
.
table
,
uniqueConstraints
=
{
@UniqueConstraint
(
name
=
PersistenceProperties
.
Instant
.
table
+
JpaObject
.
IndexNameMiddle
@UniqueConstraint
(
name
=
PersistenceProperties
.
Instant
.
table
+
JpaObject
.
IndexNameMiddle
+
JpaObject
.
DefaultUniqueConstraintSuffix
,
columnNames
=
{
JpaObject
.
IDCOLUMN
,
+
JpaObject
.
DefaultUniqueConstraintSuffix
,
columnNames
=
{
JpaObject
.
IDCOLUMN
,
...
...
o2server/x_message_core_entity/src/main/java/com/x/message/core/entity/Message.java
浏览文件 @
013c7212
...
@@ -20,7 +20,7 @@ import com.x.base.core.entity.annotation.ContainerEntity;
...
@@ -20,7 +20,7 @@ import com.x.base.core.entity.annotation.ContainerEntity;
import
com.x.base.core.project.annotation.FieldDescribe
;
import
com.x.base.core.project.annotation.FieldDescribe
;
@Entity
@Entity
@ContainerEntity
(
dumpSize
=
1000
,
type
=
ContainerEntity
.
Type
.
content
,
reference
=
ContainerEntity
.
Reference
.
strong
)
@ContainerEntity
(
dumpSize
=
1000
,
type
=
ContainerEntity
.
Type
.
log
,
reference
=
ContainerEntity
.
Reference
.
soft
)
@Table
(
name
=
PersistenceProperties
.
Message
.
table
,
uniqueConstraints
=
{
@Table
(
name
=
PersistenceProperties
.
Message
.
table
,
uniqueConstraints
=
{
@UniqueConstraint
(
name
=
PersistenceProperties
.
Message
.
table
+
JpaObject
.
IndexNameMiddle
@UniqueConstraint
(
name
=
PersistenceProperties
.
Message
.
table
+
JpaObject
.
IndexNameMiddle
+
JpaObject
.
DefaultUniqueConstraintSuffix
,
columnNames
=
{
JpaObject
.
IDCOLUMN
,
+
JpaObject
.
DefaultUniqueConstraintSuffix
,
columnNames
=
{
JpaObject
.
IDCOLUMN
,
...
...
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/factory/element/ApplicationDictItemFactory.java
浏览文件 @
013c7212
...
@@ -14,6 +14,8 @@ import com.x.processplatform.assemble.surface.Business;
...
@@ -14,6 +14,8 @@ import com.x.processplatform.assemble.surface.Business;
import
com.x.processplatform.core.entity.element.ApplicationDictItem
;
import
com.x.processplatform.core.entity.element.ApplicationDictItem
;
import
com.x.processplatform.core.entity.element.ApplicationDictItem_
;
import
com.x.processplatform.core.entity.element.ApplicationDictItem_
;
import
org.apache.commons.lang3.StringUtils
;
public
class
ApplicationDictItemFactory
extends
AbstractFactory
{
public
class
ApplicationDictItemFactory
extends
AbstractFactory
{
public
ApplicationDictItemFactory
(
Business
abstractBusiness
)
throws
Exception
{
public
ApplicationDictItemFactory
(
Business
abstractBusiness
)
throws
Exception
{
...
@@ -52,7 +54,11 @@ public class ApplicationDictItemFactory extends AbstractFactory {
...
@@ -52,7 +54,11 @@ public class ApplicationDictItemFactory extends AbstractFactory {
CriteriaQuery
<
ApplicationDictItem
>
cq
=
cb
.
createQuery
(
ApplicationDictItem
.
class
);
CriteriaQuery
<
ApplicationDictItem
>
cq
=
cb
.
createQuery
(
ApplicationDictItem
.
class
);
Root
<
ApplicationDictItem
>
root
=
cq
.
from
(
ApplicationDictItem
.
class
);
Root
<
ApplicationDictItem
>
root
=
cq
.
from
(
ApplicationDictItem
.
class
);
Predicate
p
=
cb
.
equal
(
root
.
get
(
ApplicationDictItem_
.
bundle
),
applicationDict
);
Predicate
p
=
cb
.
equal
(
root
.
get
(
ApplicationDictItem_
.
bundle
),
applicationDict
);
p
=
cb
.
and
(
p
,
cb
.
equal
(
root
.
get
(
"path0"
),
path0
));
if
(
StringUtils
.
isEmpty
(
path0
))
{
p
=
cb
.
and
(
p
,
cb
.
or
(
cb
.
equal
(
root
.
get
(
ApplicationDictItem_
.
path0
),
path0
),
cb
.
isNull
(
root
.
get
(
ApplicationDictItem_
.
path0
))));
}
else
{
p
=
cb
.
and
(
p
,
cb
.
equal
(
root
.
get
(
ApplicationDictItem_
.
path0
),
path0
));
}
p
=
cb
.
and
(
p
,
cb
.
equal
(
root
.
get
(
"path1"
),
path1
));
p
=
cb
.
and
(
p
,
cb
.
equal
(
root
.
get
(
"path1"
),
path1
));
p
=
cb
.
and
(
p
,
cb
.
equal
(
root
.
get
(
"path2"
),
path2
));
p
=
cb
.
and
(
p
,
cb
.
equal
(
root
.
get
(
"path2"
),
path2
));
p
=
cb
.
and
(
p
,
cb
.
equal
(
root
.
get
(
"path3"
),
path3
));
p
=
cb
.
and
(
p
,
cb
.
equal
(
root
.
get
(
"path3"
),
path3
));
...
...
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionCreate.java
浏览文件 @
013c7212
...
@@ -111,7 +111,7 @@ class ActionCreate extends BaseAction {
...
@@ -111,7 +111,7 @@ class ActionCreate extends BaseAction {
}
}
/* 驱动工作,使用非队列方式 */
/* 驱动工作,使用非队列方式 */
ThisApplication
.
context
().
applications
().
putQuery
(
x_processplatform_service_processing
.
class
,
ThisApplication
.
context
().
applications
().
putQuery
(
x_processplatform_service_processing
.
class
,
Applications
.
joinQueryUri
(
"work"
,
workId
,
"pr
cocssing"
,
"nonblocking"
),
null
,
processFlag
);
Applications
.
joinQueryUri
(
"work"
,
workId
,
"pr
ocessing"
,
"nonblocking"
),
null
);
}
else
{
}
else
{
/* 如果是草稿,准备后面的直接打开 */
/* 如果是草稿,准备后面的直接打开 */
workId
=
lastestWorkId
;
workId
=
lastestWorkId
;
...
@@ -196,15 +196,6 @@ class ActionCreate extends BaseAction {
...
@@ -196,15 +196,6 @@ class ActionCreate extends BaseAction {
private
static
final
long
serialVersionUID
=
1307569946729101786L
;
private
static
final
long
serialVersionUID
=
1307569946729101786L
;
// private static List<String> Includes = ListTools.toList("createTime",
// "updateTime", "completed", "fromActivity",
// "fromActivityType", "fromActivityName", "fromActivityToken",
// "fromTime", "arrivedActivity",
// "arrivedActivityType", "arrivedActivityName", "arrivedActivityToken",
// "arrivedTime", "route",
// "routeName", "work", "workCompleted", "connected", "splitting",
// "splitTokenList", "processingType");
static
WrapCopier
<
WorkLog
,
Wo
>
copier
=
WrapCopierFactory
.
wo
(
WorkLog
.
class
,
Wo
.
class
,
null
,
static
WrapCopier
<
WorkLog
,
Wo
>
copier
=
WrapCopierFactory
.
wo
(
WorkLog
.
class
,
Wo
.
class
,
null
,
JpaObject
.
FieldsInvisible
);
JpaObject
.
FieldsInvisible
);
...
...
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionCreateForce.java
浏览文件 @
013c7212
...
@@ -103,7 +103,7 @@ class ActionCreateForce extends BaseAction {
...
@@ -103,7 +103,7 @@ class ActionCreateForce extends BaseAction {
}
}
/* 驱动工作,使用非队列方式 */
/* 驱动工作,使用非队列方式 */
ThisApplication
.
context
().
applications
().
putQuery
(
x_processplatform_service_processing
.
class
,
ThisApplication
.
context
().
applications
().
putQuery
(
x_processplatform_service_processing
.
class
,
Applications
.
joinQueryUri
(
"work"
,
workId
,
"pr
coc
ssing"
,
"nonblocking"
),
null
,
processFlag
);
Applications
.
joinQueryUri
(
"work"
,
workId
,
"pr
oce
ssing"
,
"nonblocking"
),
null
,
processFlag
);
}
else
{
}
else
{
/* 如果是草稿,准备后面的直接打开 */
/* 如果是草稿,准备后面的直接打开 */
workId
=
lastestWorkId
;
workId
=
lastestWorkId
;
...
...
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionCreateWithApplicationProcess.java
浏览文件 @
013c7212
...
@@ -117,7 +117,7 @@ class ActionCreateWithApplicationProcess extends BaseAction {
...
@@ -117,7 +117,7 @@ class ActionCreateWithApplicationProcess extends BaseAction {
}
}
/* 驱动工作,使用非队列方式 */
/* 驱动工作,使用非队列方式 */
ThisApplication
.
context
().
applications
().
putQuery
(
x_processplatform_service_processing
.
class
,
ThisApplication
.
context
().
applications
().
putQuery
(
x_processplatform_service_processing
.
class
,
Applications
.
joinQueryUri
(
"work"
,
workId
,
"pr
coc
ssing"
,
"nonblocking"
),
null
,
processFlag
);
Applications
.
joinQueryUri
(
"work"
,
workId
,
"pr
oce
ssing"
,
"nonblocking"
),
null
,
processFlag
);
}
else
{
}
else
{
/* 如果是草稿,准备后面的直接打开 */
/* 如果是草稿,准备后面的直接打开 */
workId
=
lastestWorkId
;
workId
=
lastestWorkId
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录