Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
fuyue82
o2oa
提交
d5f6ca8a
o2oa
项目概览
fuyue82
/
o2oa
与 Fork 源项目一致
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
o2oa
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d5f6ca8a
编写于
1月 20, 2022
作者:
O
o2sword
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
存入缓存的jpa对象要与jpa解绑
上级
43c4e9da
变更
13
隐藏空白更改
内联
并排
Showing
13 changed file
with
52 addition
and
19 deletion
+52
-19
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/factory/ElementFactory.java
...va/com/x/cms/assemble/control/factory/ElementFactory.java
+3
-3
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/factory/ScriptFactory.java
...ava/com/x/cms/assemble/control/factory/ScriptFactory.java
+1
-0
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/factory/element/ElementFactory.java
.../cms/assemble/control/factory/element/ElementFactory.java
+2
-2
o2server/x_file_assemble_control/src/main/java/com/x/file/assemble/control/Business.java
...l/src/main/java/com/x/file/assemble/control/Business.java
+1
-0
o2server/x_file_assemble_control/src/main/java/com/x/file/assemble/control/jaxrs/attachment2/BaseAction.java
...x/file/assemble/control/jaxrs/attachment2/BaseAction.java
+1
-0
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/AbstractFactory.java
...a/com/x/message/assemble/communicate/AbstractFactory.java
+3
-2
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/factory/element/BeginFactory.java
...atform/assemble/surface/factory/element/BeginFactory.java
+2
-1
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/factory/element/ScriptFactory.java
...tform/assemble/surface/factory/element/ScriptFactory.java
+4
-1
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/ElementFactory.java
...ssplatform/service/processing/factory/ElementFactory.java
+23
-4
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/invoke/BaseAction.java
...in/java/com/x/program/center/jaxrs/invoke/BaseAction.java
+1
-0
o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/factory/QueryFactory.java
...va/com/x/query/assemble/surface/factory/QueryFactory.java
+5
-3
o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/statement/ActionExecute.java
...query/assemble/surface/jaxrs/statement/ActionExecute.java
+1
-0
o2server/x_query_service_processing/src/main/java/com/x/query/service/processing/factory/QueryFactory.java
.../com/x/query/service/processing/factory/QueryFactory.java
+5
-3
未找到文件。
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/factory/ElementFactory.java
浏览文件 @
d5f6ca8a
...
...
@@ -41,8 +41,8 @@ public abstract class ElementFactory extends AbstractFactory {
t
=
this
.
entityManagerContainer
().
flag
(
flag
,
clz
);
if
(
t
!=
null
)
{
this
.
entityManagerContainer
().
get
(
clz
).
detach
(
t
);
CacheManager
.
put
(
cacheCategory
,
cacheKey
,
t
);
}
CacheManager
.
put
(
cacheCategory
,
cacheKey
,
t
);
}
return
t
;
}
...
...
@@ -65,8 +65,8 @@ public abstract class ElementFactory extends AbstractFactory {
appInfo
.
getId
());
if
(
t
!=
null
)
{
this
.
entityManagerContainer
().
get
(
clz
).
detach
(
t
);
CacheManager
.
put
(
cacheCategory
,
cacheKey
,
t
);
}
CacheManager
.
put
(
cacheCategory
,
cacheKey
,
t
);
}
return
t
;
}
...
...
@@ -102,4 +102,4 @@ public abstract class ElementFactory extends AbstractFactory {
return
list
;
}
}
\ No newline at end of file
}
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/factory/ScriptFactory.java
浏览文件 @
d5f6ca8a
...
...
@@ -129,6 +129,7 @@ public class ScriptFactory extends ElementFactory {
List
<
Script
>
list
=
em
.
createQuery
(
cq
.
where
(
p
)
).
setMaxResults
(
1
).
getResultList
();
if
(!
list
.
isEmpty
())
{
script
=
list
.
get
(
0
);
em
.
detach
(
script
);
CacheManager
.
put
(
cacheCategory
,
cacheKey
,
script
);
}
}
...
...
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/factory/element/ElementFactory.java
浏览文件 @
d5f6ca8a
...
...
@@ -28,10 +28,10 @@ public abstract class ElementFactory extends AbstractFactory {
t
=
this
.
entityManagerContainer
().
flag
(
flag
,
clz
);
if
(
t
!=
null
)
{
this
.
entityManagerContainer
().
get
(
clz
).
detach
(
t
);
CacheManager
.
put
(
cacheCategory
,
cacheKey
,
t
);
}
CacheManager
.
put
(
cacheCategory
,
cacheKey
,
t
);
}
return
t
;
}
}
\ No newline at end of file
}
o2server/x_file_assemble_control/src/main/java/com/x/file/assemble/control/Business.java
浏览文件 @
d5f6ca8a
...
...
@@ -134,6 +134,7 @@ public class Business {
}
else
{
config
=
this
.
entityManagerContainer
().
firstEqual
(
FileConfig
.
class
,
FileConfig
.
person_FIELDNAME
,
Business
.
SYSTEM_CONFIG
);
if
(
config
!=
null
){
this
.
entityManagerContainer
().
get
(
FileConfig
.
class
).
detach
(
config
);
CacheManager
.
put
(
cacheCategory
,
cacheKey
,
config
);
}
}
...
...
o2server/x_file_assemble_control/src/main/java/com/x/file/assemble/control/jaxrs/attachment2/BaseAction.java
浏览文件 @
d5f6ca8a
...
...
@@ -50,6 +50,7 @@ abstract class BaseAction extends StandardJaxrsAction {
}
else
{
config
=
business
.
entityManagerContainer
().
firstEqual
(
FileConfig
.
class
,
FileConfig
.
person_FIELDNAME
,
Business
.
SYSTEM_CONFIG
);
if
(
config
!=
null
){
business
.
entityManagerContainer
().
get
(
FileConfig
.
class
).
detach
(
config
);
CacheManager
.
put
(
cacheCategory
,
cacheKey
,
config
);
}
}
...
...
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/AbstractFactory.java
浏览文件 @
d5f6ca8a
...
...
@@ -50,8 +50,8 @@ public abstract class AbstractFactory {
t
=
this
.
entityManagerContainer
().
flag
(
flag
,
clz
);
if
(
t
!=
null
)
{
this
.
entityManagerContainer
().
get
(
clz
).
detach
(
t
);
CacheManager
.
put
(
cacheCategory
,
cacheKey
,
t
);
}
CacheManager
.
put
(
cacheCategory
,
cacheKey
,
t
);
}
return
t
;
}
...
...
@@ -71,6 +71,7 @@ public abstract class AbstractFactory {
}
else
{
T
t
=
this
.
entityManagerContainer
().
flag
(
flag
,
clz
);
if
(
null
!=
t
)
{
this
.
entityManagerContainer
().
get
(
clz
).
detach
(
t
);
list
.
add
(
t
);
CacheManager
.
put
(
cacheCategory
,
cacheKey
,
t
);
}
...
...
@@ -78,4 +79,4 @@ public abstract class AbstractFactory {
}
return
list
;
}
}
\ No newline at end of file
}
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/factory/element/BeginFactory.java
浏览文件 @
d5f6ca8a
...
...
@@ -36,9 +36,10 @@ public class BeginFactory extends ElementFactory {
}
else
{
o
=
this
.
entityManagerContainer
().
firstEqual
(
Begin
.
class
,
Activity
.
process_FIELDNAME
,
process
.
getId
());
if
(
null
!=
o
)
{
this
.
entityManagerContainer
().
get
(
Begin
.
class
).
detach
(
o
);
CacheManager
.
put
(
cacheCategory
,
cacheKey
,
o
);
}
}
return
o
;
}
}
\ No newline at end of file
}
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/factory/element/ScriptFactory.java
浏览文件 @
d5f6ca8a
...
...
@@ -78,6 +78,9 @@ public class ScriptFactory extends ElementFactory {
if
(
null
==
script
)
{
script
=
this
.
getWithApplicationWithName
(
application
,
uniqueName
);
}
if
(
script
!=
null
){
this
.
entityManagerContainer
().
get
(
Script
.
class
).
detach
(
script
);
}
return
script
;
}
...
...
@@ -122,4 +125,4 @@ public class ScriptFactory extends ElementFactory {
}
return
null
;
}
}
\ No newline at end of file
}
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/ElementFactory.java
浏览文件 @
d5f6ca8a
...
...
@@ -92,6 +92,7 @@ public class ElementFactory extends AbstractFactory {
}
else
{
t
=
this
.
entityManagerContainer
().
find
(
id
,
clz
);
if
(
t
!=
null
)
{
this
.
entityManagerContainer
().
get
(
clz
).
detach
(
t
);
CacheManager
.
put
(
cacheCategory
,
cacheKey
,
t
);
}
}
...
...
@@ -194,7 +195,10 @@ public class ElementFactory extends AbstractFactory {
begin
=
(
Begin
)
optional
.
get
();
}
else
{
begin
=
this
.
entityManagerContainer
().
firstEqual
(
Begin
.
class
,
Activity
.
process_FIELDNAME
,
id
);
CacheManager
.
put
(
cacheCategory
,
cacheKey
,
begin
);
if
(
begin
!=
null
)
{
this
.
entityManagerContainer
().
get
(
Begin
.
class
).
detach
(
begin
);
CacheManager
.
put
(
cacheCategory
,
cacheKey
,
begin
);
}
}
return
begin
;
}
...
...
@@ -216,6 +220,9 @@ public class ElementFactory extends AbstractFactory {
Root
<
Route
>
root
=
cq
.
from
(
Route
.
class
);
Predicate
p
=
root
.
get
(
Route_
.
id
).
in
(
choice
.
getRouteList
());
list
=
em
.
createQuery
(
cq
.
where
(
p
).
orderBy
(
cb
.
asc
(
root
.
get
(
Route_
.
orderNumber
)))).
getResultList
();
for
(
Route
route
:
list
){
em
.
detach
(
route
);
}
CacheManager
.
put
(
cacheCategory
,
cacheKey
,
list
);
}
}
...
...
@@ -239,6 +246,9 @@ public class ElementFactory extends AbstractFactory {
Root
<
Route
>
root
=
cq
.
from
(
Route
.
class
);
Predicate
p
=
root
.
get
(
Route_
.
id
).
in
(
manual
.
getRouteList
());
list
=
em
.
createQuery
(
cq
.
where
(
p
).
orderBy
(
cb
.
asc
(
root
.
get
(
Route_
.
orderNumber
)))).
getResultList
();
for
(
Route
route
:
list
){
em
.
detach
(
route
);
}
CacheManager
.
put
(
cacheCategory
,
cacheKey
,
list
);
}
}
...
...
@@ -262,6 +272,9 @@ public class ElementFactory extends AbstractFactory {
Root
<
Route
>
root
=
cq
.
from
(
Route
.
class
);
Predicate
p
=
root
.
get
(
Route_
.
id
).
in
(
parallel
.
getRouteList
());
list
=
em
.
createQuery
(
cq
.
where
(
p
).
orderBy
(
cb
.
asc
(
root
.
get
(
Route_
.
orderNumber
)))).
getResultList
();
for
(
Route
route
:
list
){
em
.
detach
(
route
);
}
CacheManager
.
put
(
cacheCategory
,
cacheKey
,
list
);
}
}
...
...
@@ -284,9 +297,12 @@ public class ElementFactory extends AbstractFactory {
List
<
String
>
loops
=
new
ArrayList
<>();
for
(
String
name
:
names
)
{
Script
o
=
this
.
getScriptWithApplicationWithUniqueName
(
applicationId
,
name
);
if
((
null
!=
o
)
&&
(!
list
.
contains
(
o
)))
{
list
.
add
(
o
);
loops
.
addAll
(
o
.
getDependScriptList
());
if
(
null
!=
o
){
this
.
entityManagerContainer
().
get
(
Script
.
class
).
detach
(
o
);
if
(!
list
.
contains
(
o
)){
list
.
add
(
o
);
loops
.
addAll
(
o
.
getDependScriptList
());
}
}
}
names
=
loops
;
...
...
@@ -418,6 +434,9 @@ public class ElementFactory extends AbstractFactory {
p
=
cb
.
and
(
p
,
cb
.
or
(
cb
.
equal
(
root
.
get
(
Mapping_
.
process
),
process
),
cb
.
equal
(
root
.
get
(
Mapping_
.
process
),
""
),
cb
.
isNull
(
root
.
get
(
Mapping_
.
process
))));
List
<
Mapping
>
os
=
em
.
createQuery
(
cq
.
where
(
p
)).
getResultList
();
for
(
Mapping
mapping
:
os
){
em
.
detach
(
mapping
);
}
os
.
stream
().
collect
(
Collectors
.
groupingBy
(
o
->
o
.
getApplication
()
+
o
.
getTableName
()))
.
forEach
((
k
,
v
)
->
list
.
add
(
v
.
stream
().
filter
(
i
->
StringUtils
.
isNotEmpty
(
i
.
getProcess
()))
.
findFirst
().
orElse
(
v
.
get
(
0
))));
...
...
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/invoke/BaseAction.java
浏览文件 @
d5f6ca8a
...
...
@@ -123,6 +123,7 @@ abstract class BaseAction extends StandardJaxrsAction {
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
Invoke
invoke
=
emc
.
flag
(
flag
,
Invoke
.
class
);
if
(
null
!=
invoke
)
{
emc
.
get
(
Invoke
.
class
).
detach
(
invoke
);
CacheManager
.
put
(
cacheCategory
,
cacheKey
,
invoke
);
}
return
invoke
;
...
...
o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/factory/QueryFactory.java
浏览文件 @
d5f6ca8a
...
...
@@ -34,8 +34,8 @@ public class QueryFactory extends AbstractFactory {
list
.
add
((
Query
)
optional
.
get
());
}
else
{
Query
o
=
this
.
pickObject
(
str
);
CacheManager
.
put
(
cache
,
cacheKey
,
o
);
if
(
null
!=
o
)
{
CacheManager
.
put
(
cache
,
cacheKey
,
o
);
list
.
add
(
o
);
}
}
...
...
@@ -54,7 +54,9 @@ public class QueryFactory extends AbstractFactory {
o
=
(
Query
)
optional
.
get
();
}
else
{
o
=
this
.
pickObject
(
flag
);
CacheManager
.
put
(
cache
,
cacheKey
,
o
);
if
(
o
!=
null
)
{
CacheManager
.
put
(
cache
,
cacheKey
,
o
);
}
}
return
o
;
}
...
...
@@ -79,4 +81,4 @@ public class QueryFactory extends AbstractFactory {
}
}
\ No newline at end of file
}
o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/statement/ActionExecute.java
浏览文件 @
d5f6ca8a
...
...
@@ -78,6 +78,7 @@ class ActionExecute extends BaseAction {
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
statement
=
emc
.
flag
(
flag
,
Statement
.
class
);
if
(
null
!=
statement
)
{
emc
.
get
(
Statement
.
class
).
detach
(
statement
);
CacheManager
.
put
(
cache
,
cacheKey
,
statement
);
}
}
...
...
o2server/x_query_service_processing/src/main/java/com/x/query/service/processing/factory/QueryFactory.java
浏览文件 @
d5f6ca8a
...
...
@@ -34,8 +34,8 @@ public class QueryFactory extends AbstractFactory {
list
.
add
((
Query
)
optional
.
get
());
}
else
{
Query
o
=
this
.
pickObject
(
str
);
CacheManager
.
put
(
cache
,
cacheKey
,
o
);
if
(
null
!=
o
)
{
CacheManager
.
put
(
cache
,
cacheKey
,
o
);
list
.
add
(
o
);
}
}
...
...
@@ -54,7 +54,9 @@ public class QueryFactory extends AbstractFactory {
o
=
(
Query
)
optional
.
get
();
}
else
{
o
=
this
.
pickObject
(
flag
);
CacheManager
.
put
(
cache
,
cacheKey
,
o
);
if
(
o
!=
null
)
{
CacheManager
.
put
(
cache
,
cacheKey
,
o
);
}
}
return
o
;
}
...
...
@@ -79,4 +81,4 @@ public class QueryFactory extends AbstractFactory {
}
}
\ No newline at end of file
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录