Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
fuyue82
o2oa
提交
51473ad1
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,发现更多精彩内容 >>
提交
51473ad1
编写于
10月 14, 2021
作者:
O
o2null
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'fix/spotBugs20211014' into 'wrdp'
spotBug修正 See merge request o2oa/o2oa!5701
上级
e6d482e3
3912b6c0
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
15 addition
and
14 deletion
+15
-14
o2server/x_base_core_project/src/main/java/com/x/base/core/project/executor/ProcessPlatformExecutorFactory.java
...core/project/executor/ProcessPlatformExecutorFactory.java
+1
-1
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionUpdatePrevTaskIdentity.java
...e/processing/jaxrs/task/ActionUpdatePrevTaskIdentity.java
+3
-1
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/taskcompleted/ActionUpdateNextTaskIdentity.java
...ing/jaxrs/taskcompleted/ActionUpdateNextTaskIdentity.java
+6
-3
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionDeleteDraft.java
...form/service/processing/jaxrs/work/ActionDeleteDraft.java
+5
-9
未找到文件。
o2server/x_base_core_project/src/main/java/com/x/base/core/project/executor/ProcessPlatformExecutorFactory.java
浏览文件 @
51473ad1
...
...
@@ -14,7 +14,7 @@ public class ProcessPlatformExecutorFactory {
private
static
ExecutorService
[]
executors
;
public
static
synchronized
ExecutorService
get
(
String
seed
)
throws
Exception
{
public
static
synchronized
ExecutorService
get
(
final
String
seed
)
throws
Exception
{
if
(
null
==
executors
)
{
executors
=
Config
.
resource_node_processPlatformExecutors
();
}
...
...
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionUpdatePrevTaskIdentity.java
浏览文件 @
51473ad1
...
...
@@ -38,9 +38,11 @@ class ActionUpdatePrevTaskIdentity extends BaseAction {
bag
.
wi
.
getTaskList
());
if
(
os
.
isEmpty
())
{
Wo
wo
=
new
Wo
();
ActionResult
<
Wo
>
result
=
new
ActionResult
<
Wo
>();
ActionResult
<
Wo
>
result
=
new
ActionResult
<>();
result
.
setData
(
wo
);
return
result
;
}
else
{
bag
.
job
=
os
.
get
(
0
).
getJob
();
}
}
...
...
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/taskcompleted/ActionUpdateNextTaskIdentity.java
浏览文件 @
51473ad1
...
...
@@ -7,6 +7,7 @@ import java.util.concurrent.TimeUnit;
import
com.google.gson.JsonElement
;
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.annotation.CheckPersistType
;
import
com.x.base.core.project.annotation.ActionLogger
;
import
com.x.base.core.project.executor.ProcessPlatformExecutorFactory
;
...
...
@@ -31,12 +32,14 @@ class ActionUpdateNextTaskIdentity extends BaseAction {
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
List
<
TaskCompleted
>
os
=
emc
.
fetchIn
(
TaskCompleted
.
class
,
ListTools
.
toList
(
TaskCompleted
.
job_FIELDNAME
),
TaskCompleted
.
id_FIELDNAME
,
bag
.
wi
.
getTaskCompletedList
());
JpaObject
.
id_FIELDNAME
,
bag
.
wi
.
getTaskCompletedList
());
if
(
os
.
isEmpty
())
{
Wo
wo
=
new
Wo
();
ActionResult
<
Wo
>
result
=
new
ActionResult
<
Wo
>();
ActionResult
<
Wo
>
result
=
new
ActionResult
<>();
result
.
setData
(
wo
);
return
result
;
}
else
{
bag
.
job
=
os
.
get
(
0
).
getJob
();
}
}
...
...
@@ -44,7 +47,7 @@ class ActionUpdateNextTaskIdentity extends BaseAction {
public
ActionResult
<
Wo
>
call
()
throws
Exception
{
Wo
wo
=
new
Wo
();
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
List
<
TaskCompleted
>
os
=
emc
.
listIn
(
TaskCompleted
.
class
,
TaskCompleted
.
id_FIELDNAME
,
List
<
TaskCompleted
>
os
=
emc
.
listIn
(
TaskCompleted
.
class
,
JpaObject
.
id_FIELDNAME
,
bag
.
wi
.
getTaskCompletedList
());
emc
.
beginTransaction
(
TaskCompleted
.
class
);
for
(
TaskCompleted
o
:
os
)
{
...
...
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionDeleteDraft.java
浏览文件 @
51473ad1
...
...
@@ -20,6 +20,7 @@ import com.x.processplatform.core.entity.content.TaskCompleted;
import
com.x.processplatform.core.entity.content.Work
;
import
com.x.processplatform.service.processing.Business
;
import
org.apache.commons.lang3.BooleanUtils
;
import
org.apache.commons.lang3.StringUtils
;
/**
...
...
@@ -60,7 +61,7 @@ class ActionDeleteDraft extends BaseAction {
workId
=
work
.
getId
();
workTitle
=
work
.
getTitle
();
workSequence
=
work
.
getSequence
();
if
(
work
.
getWorkThroughManual
()
==
false
)
{
if
(
BooleanUtils
.
isFalse
(
work
.
getWorkThroughManual
())
)
{
if
(
StringUtils
.
equals
(
work
.
getWorkCreateType
(),
Work
.
WORKCREATETYPE_SURFACE
))
{
if
(
emc
.
countEqual
(
TaskCompleted
.
class
,
TaskCompleted
.
job_FIELDNAME
,
work
.
getJob
())
==
0
)
{
...
...
@@ -83,14 +84,9 @@ class ActionDeleteDraft extends BaseAction {
}
catch
(
Exception
e
)
{
logger
.
error
(
e
);
}
// if (delete && (null != work)) {
// ThisApplication.context().applications().deleteQuery(x_processplatform_service_processing.class,
// Applications.joinQueryUri("work", work.getId()),
// work.getJob()).getData(WoId.class);
// logger.print("删除长期处于草稿状态的工作, id:{}, title:{}, sequence:{}", workId,
// workTitle, workSequence);
// }
wo
.
setId
(
work
.
getId
());
if
(
null
!=
work
)
{
wo
.
setId
(
work
.
getId
());
}
result
.
setData
(
wo
);
return
result
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录