Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_42566577
o2oa
提交
889a3e91
o2oa
项目概览
weixin_42566577
/
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,发现更多精彩内容 >>
提交
889a3e91
编写于
9月 28, 2022
作者:
Z
zhourui
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
添加parentWork parentJob输出
上级
dfd926ff
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
59 addition
and
35 deletion
+59
-35
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
+7
-7
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Work.java
.../java/com/x/processplatform/core/entity/content/Work.java
+33
-3
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/BaseAction.java
...essplatform/service/processing/jaxrs/data/BaseAction.java
+19
-25
未找到文件。
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/ProcessPlatform.java
浏览文件 @
889a3e91
...
...
@@ -53,7 +53,7 @@ public class ProcessPlatform extends ConfigObject {
public
static
final
Boolean
DEFAULT_DELETEAPPLICATIONINUSE
=
false
;
public
static
final
Boolean
DEFAULT_UPDATEDATAPROJECTIONENABLE
=
false
;
//
public static final Boolean DEFAULT_UPDATEDATAPROJECTIONENABLE = false;
public
static
final
Boolean
DEFAULT_PROCESSINGSIGNALPERSISTENABLE
=
false
;
...
...
@@ -73,7 +73,7 @@ public class ProcessPlatform extends ConfigObject {
this
.
docToWordDefaultSite
=
DEFAULT_DOCTOWORDDEFAULTSITE
;
this
.
executorCount
=
DEFAULT_EXECUTORCOUNT
;
this
.
executorQueueBusyThreshold
=
DEFAULT_EXECUTORQUEUEBUSYTHRESHOLD
;
this
.
updateDataProjectionEnable
=
DEFAULT_UPDATEDATAPROJECTIONENABLE
;
//
this.updateDataProjectionEnable = DEFAULT_UPDATEDATAPROJECTIONENABLE;
this
.
urge
=
new
Urge
();
this
.
expire
=
new
Expire
();
this
.
touchDelay
=
new
TouchDelay
();
...
...
@@ -121,9 +121,9 @@ public class ProcessPlatform extends ConfigObject {
return
StringUtils
.
isEmpty
(
docToWordDefaultSite
)
?
DEFAULT_DOCTOWORDDEFAULTSITE
:
docToWordDefaultSite
;
}
public
Boolean
getUpdateDataProjectionEnable
()
{
return
BooleanUtils
.
isTrue
(
this
.
updateDataProjectionEnable
);
}
//
public Boolean getUpdateDataProjectionEnable() {
//
return BooleanUtils.isTrue(this.updateDataProjectionEnable);
//
}
@FieldDescribe
(
"维护身份,当工作发生意外错误,无法找到对应的处理人情况下,先尝试将工作分配给创建身份,如果创建身份也不可获取,那么分配给指定人员,默认情况下这个值为空."
)
private
String
maintenanceIdentity
;
...
...
@@ -152,8 +152,8 @@ public class ProcessPlatform extends ConfigObject {
@FieldDescribe
(
"执行器队列繁忙阈值"
)
private
Integer
executorQueueBusyThreshold
;
@FieldDescribe
(
"更新data数据是否执行映射."
)
private
boolean
updateDataProjectionEnable
;
//
@FieldDescribe("更新data数据是否执行映射.")
//
private boolean updateDataProjectionEnable;
@FieldDescribe
(
"催办任务设置,发现即将过期时发送提醒消息."
)
private
Urge
urge
;
...
...
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Work.java
浏览文件 @
889a3e91
...
...
@@ -46,6 +46,7 @@ import com.x.processplatform.core.entity.PersistenceProperties;
import
com.x.processplatform.core.entity.element.ActivityType
;
import
io.swagger.v3.oas.annotations.media.Schema
;
@Schema
(
name
=
"Work"
,
description
=
"流程平台工作."
)
@Entity
@ContainerEntity
(
dumpSize
=
200
,
type
=
ContainerEntity
.
Type
.
content
,
reference
=
ContainerEntity
.
Reference
.
strong
)
...
...
@@ -112,6 +113,8 @@ public class Work extends SliceJpaObject implements ProjectionInterface {
this
.
embedTargetJob
=
this
.
getProperties
().
getEmbedTargetJob
();
this
.
embedCompleted
=
this
.
getProperties
().
getEmbedCompleted
();
this
.
manualTaskIdentityMatrix
=
this
.
getProperties
().
getManualTaskIdentityMatrix
();
this
.
parentJob
=
this
.
getProperties
().
getParentJob
();
this
.
parentWork
=
this
.
getProperties
().
getParentWork
();
}
/* 更新运行方法 */
...
...
@@ -204,6 +207,25 @@ public class Work extends SliceJpaObject implements ProjectionInterface {
this
.
getProperties
().
setManualTaskIdentityMatrix
(
manualTaskIdentityMatrix
);
}
public
void
setParentWork
(
String
parentWork
)
{
this
.
getProperties
().
setParentWork
(
parentWork
);
this
.
parentWork
=
parentWork
;
}
public
String
getParentWork
()
{
return
parentWork
;
}
public
void
setparentJob
(
String
parentJob
)
{
this
.
getProperties
().
setParentJob
(
parentJob
);
this
.
parentJob
=
parentJob
;
}
public
String
getParentJob
()
{
return
parentJob
;
}
@Transient
@FieldDescribe
(
"要拆分的值"
)
private
List
<
String
>
splitValueList
;
...
...
@@ -221,6 +243,16 @@ public class Work extends SliceJpaObject implements ProjectionInterface {
@Transient
private
ManualTaskIdentityMatrix
manualTaskIdentityMatrix
;
public
static
final
String
PARENTWORK_FIELDNAME
=
"parentWork"
;
@Transient
@FieldDescribe
(
"父工作,在当前工作是通过子流程调用时产生."
)
private
String
parentWork
;
public
static
final
String
PARENTJOB_FIELDNAME
=
"parentJob"
;
@Transient
@FieldDescribe
(
"父工作Job,在当前工作是通过子流程调用时产生."
)
private
String
parentJob
;
public
static
final
String
job_FIELDNAME
=
"job"
;
@FieldDescribe
(
"工作"
)
@Column
(
length
=
JpaObject
.
length_id
,
name
=
ColumnNamePrefix
+
job_FIELDNAME
)
...
...
@@ -922,8 +954,6 @@ public class Work extends SliceJpaObject implements ProjectionInterface {
this
.
activityType
=
activityType
;
}
public
ActivityType
getDestinationActivityType
()
{
return
destinationActivityType
;
}
...
...
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/BaseAction.java
浏览文件 @
889a3e91
...
...
@@ -245,14 +245,12 @@ abstract class BaseAction extends StandardJaxrsAction {
// 标记数据已经被修改
business
.
entityManagerContainer
().
beginTransaction
(
Work
.
class
);
work
.
setDataChanged
(
true
);
if
(
BooleanUtils
.
isTrue
(
Config
.
processPlatform
().
getUpdateDataProjectionEnable
()))
{
business
.
entityManagerContainer
().
beginTransaction
(
Task
.
class
);
business
.
entityManagerContainer
().
beginTransaction
(
TaskCompleted
.
class
);
business
.
entityManagerContainer
().
beginTransaction
(
Read
.
class
);
business
.
entityManagerContainer
().
beginTransaction
(
ReadCompleted
.
class
);
business
.
entityManagerContainer
().
beginTransaction
(
Review
.
class
);
projection
(
business
,
work
,
XGsonBuilder
.
convert
(
jsonObject
,
Data
.
class
));
}
// 基于前面的原因,这里进行单独提交
business
.
entityManagerContainer
().
commit
();
}
...
...
@@ -284,7 +282,6 @@ abstract class BaseAction extends StandardJaxrsAction {
this
.
fill
(
_o
,
workCompleted
);
business
.
entityManagerContainer
().
persist
(
_o
);
}
if
(
BooleanUtils
.
isTrue
(
Config
.
processPlatform
().
getUpdateDataProjectionEnable
()))
{
business
.
entityManagerContainer
().
beginTransaction
(
WorkCompleted
.
class
);
business
.
entityManagerContainer
().
beginTransaction
(
Task
.
class
);
business
.
entityManagerContainer
().
beginTransaction
(
TaskCompleted
.
class
);
...
...
@@ -292,7 +289,6 @@ abstract class BaseAction extends StandardJaxrsAction {
business
.
entityManagerContainer
().
beginTransaction
(
ReadCompleted
.
class
);
business
.
entityManagerContainer
().
beginTransaction
(
Review
.
class
);
projection
(
business
,
workCompleted
,
XGsonBuilder
.
convert
(
jsonObject
,
Data
.
class
));
}
// 基于前面的原因,这里进行单独提交
business
.
entityManagerContainer
().
commit
();
...
...
@@ -353,14 +349,12 @@ abstract class BaseAction extends StandardJaxrsAction {
// 标记数据已经被修改
business
.
entityManagerContainer
().
beginTransaction
(
Work
.
class
);
work
.
setDataChanged
(
true
);
if
(
BooleanUtils
.
isTrue
(
Config
.
processPlatform
().
getUpdateDataProjectionEnable
()))
{
business
.
entityManagerContainer
().
beginTransaction
(
Task
.
class
);
business
.
entityManagerContainer
().
beginTransaction
(
TaskCompleted
.
class
);
business
.
entityManagerContainer
().
beginTransaction
(
Read
.
class
);
business
.
entityManagerContainer
().
beginTransaction
(
ReadCompleted
.
class
);
business
.
entityManagerContainer
().
beginTransaction
(
Review
.
class
);
projection
(
business
,
work
,
XGsonBuilder
.
convert
(
jsonElement
,
Data
.
class
));
}
business
.
entityManagerContainer
().
commit
();
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录