Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
fuyue82
o2oa
提交
10ad9a29
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,发现更多精彩内容 >>
提交
10ad9a29
编写于
2月 26, 2021
作者:
Z
zhourui
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修改SignalStack 支持异步操作
上级
ccc68e49
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
31 addition
and
5 deletion
+31
-5
o2server/x_base_core_project/src/main/java/com/x/base/core/container/EntityManagerContainer.java
...ava/com/x/base/core/container/EntityManagerContainer.java
+28
-2
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishByWorkFlow.java
...ontrol/jaxrs/document/ActionPersistPublishByWorkFlow.java
+1
-1
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/log/SignalStack.java
...va/com/x/processplatform/core/entity/log/SignalStack.java
+2
-2
未找到文件。
o2server/x_base_core_project/src/main/java/com/x/base/core/container/EntityManagerContainer.java
浏览文件 @
10ad9a29
...
...
@@ -542,8 +542,8 @@ public class EntityManagerContainer extends EntityManagerContainerBasic {
return
new
ArrayList
<
T
>(
query
.
getResultList
());
}
public
<
T
extends
JpaObject
>
List
<
T
>
listEqualAndLessThanOrEqualTo
(
Class
<
T
>
cls
,
String
attribute
,
Object
value
,
String
otherAttribute
,
Object
otherValue
)
throws
Exception
{
public
<
T
extends
JpaObject
>
List
<
T
>
listEqualAndLessThanOrEqualTo
(
Class
<
T
>
cls
,
String
attribute
,
Object
value
,
String
otherAttribute
,
Object
otherValue
)
throws
Exception
{
EntityManager
em
=
this
.
get
(
cls
);
CriteriaBuilder
cb
=
em
.
getCriteriaBuilder
();
CriteriaQuery
<
T
>
cq
=
cb
.
createQuery
(
cls
);
...
...
@@ -610,6 +610,16 @@ public class EntityManagerContainer extends EntityManagerContainerBasic {
return
list
;
}
public
<
T
extends
JpaObject
>
Optional
<
T
>
first
(
Class
<
T
>
cls
)
throws
Exception
{
EntityManager
em
=
this
.
get
(
cls
);
CriteriaBuilder
cb
=
em
.
getCriteriaBuilder
();
CriteriaQuery
<
T
>
cq
=
cb
.
createQuery
(
cls
);
Root
<
T
>
root
=
cq
.
from
(
cls
);
cq
.
select
(
root
);
List
<
T
>
os
=
em
.
createQuery
(
cq
).
setMaxResults
(
1
).
getResultList
();
return
os
.
isEmpty
()
?
Optional
.
empty
()
:
Optional
.
of
(
os
.
get
(
0
));
}
public
<
T
extends
JpaObject
>
T
firstEqual
(
Class
<
T
>
cls
,
String
attribute
,
Object
value
)
throws
Exception
{
EntityManager
em
=
this
.
get
(
cls
);
CriteriaBuilder
cb
=
em
.
getCriteriaBuilder
();
...
...
@@ -1700,6 +1710,22 @@ public class EntityManagerContainer extends EntityManagerContainerBasic {
return
list
;
}
public
<
T
extends
JpaObject
>
List
<
T
>
listSequenceAfter
(
Class
<
T
>
clz
,
Integer
count
,
String
sequence
)
throws
Exception
{
EntityManager
em
=
this
.
get
(
clz
);
CriteriaBuilder
cb
=
em
.
getCriteriaBuilder
();
CriteriaQuery
<
T
>
cq
=
cb
.
createQuery
(
clz
);
Root
<
T
>
root
=
cq
.
from
(
clz
);
Predicate
p
=
cb
.
conjunction
();
if
(
StringUtils
.
isNotEmpty
(
sequence
))
{
p
=
cb
.
greaterThan
(
root
.
get
(
JpaObject
.
sequence_FIELDNAME
),
sequence
);
}
cq
.
select
(
root
).
where
(
p
).
orderBy
(
cb
.
asc
(
root
.
get
(
JpaObject
.
sequence_FIELDNAME
)));
List
<
T
>
os
=
em
.
createQuery
(
cq
).
setMaxResults
((
count
!=
null
&&
count
>
0
)
?
count
:
100
).
getResultList
();
List
<
T
>
list
=
new
ArrayList
<>(
os
);
return
list
;
}
/* 仅在单一数据库可用 */
public
<
T
extends
JpaObject
>
List
<
T
>
fetchDescPaging
(
Class
<
T
>
clz
,
Predicate
predicate
,
Integer
page
,
Integer
count
,
String
orderAttribute
)
throws
Exception
{
...
...
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishByWorkFlow.java
浏览文件 @
10ad9a29
...
...
@@ -211,7 +211,7 @@ public class ActionPersistPublishByWorkFlow extends BaseAction {
if
(
check
)
{
try
{
JsonElement
docData
=
XGsonBuilder
.
instance
().
toJsonTree
(
wi
.
getDocData
()
,
Map
.
class
);
JsonElement
docData
=
XGsonBuilder
.
instance
().
toJsonTree
(
wi
.
getDocData
());
wi
.
setDocStatus
(
"published"
);
if
(
wi
.
getPublishTime
()==
null
)
{
wi
.
setPublishTime
(
new
Date
());
...
...
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/log/SignalStack.java
浏览文件 @
10ad9a29
package
com.x.processplatform.core.entity.log
;
import
java.util.
Linked
List
;
import
java.util.
concurrent.CopyOnWriteArray
List
;
public
class
SignalStack
extends
Linked
List
<
Signal
>
{
public
class
SignalStack
extends
CopyOnWriteArray
List
<
Signal
>
{
private
static
final
long
serialVersionUID
=
-
3971898583590304010L
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录