Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_42566577
o2oa
提交
b44ee05f
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,发现更多精彩内容 >>
提交
b44ee05f
编写于
2月 14, 2022
作者:
R
Ray
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
添加等待结束脚本
上级
28d8fbe0
变更
18
显示空白变更内容
内联
并排
Showing
18 changed file
with
397 addition
and
80 deletion
+397
-80
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/DataServer.java
.../main/java/com/x/base/core/project/config/DataServer.java
+1
-1
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
+49
-20
o2server/x_base_core_project/src/main/java/com/x/base/core/project/scripting/ScriptingFactory.java
...a/com/x/base/core/project/scripting/ScriptingFactory.java
+2
-0
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/application/ApplicationAction.java
...assemble/surface/jaxrs/application/ApplicationAction.java
+8
-9
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionCreate.java
...essplatform/assemble/surface/jaxrs/work/ActionCreate.java
+18
-23
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
+3
-9
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/WorkProperties.java
...x/processplatform/core/entity/content/WorkProperties.java
+28
-6
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Embed.java
...java/com/x/processplatform/core/entity/element/Embed.java
+73
-9
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/EmbedProperties.java
.../processplatform/core/entity/element/EmbedProperties.java
+44
-0
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/Business.java
...va/com/x/processplatform/service/processing/Business.java
+2
-0
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/ThisApplication.java
...x/processplatform/service/processing/ThisApplication.java
+5
-0
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/WorkDataHelper.java
.../x/processplatform/service/processing/WorkDataHelper.java
+1
-1
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/AbstractBaseProcessor.java
...m/service/processing/processor/AbstractBaseProcessor.java
+11
-0
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/embed/EmbedProcessor.java
...rm/service/processing/processor/embed/EmbedProcessor.java
+5
-2
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/end/EndProcessor.java
...atform/service/processing/processor/end/EndProcessor.java
+44
-0
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/end/ExceptionUpdateParentWork.java
...e/processing/processor/end/ExceptionUpdateParentWork.java
+13
-0
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/schedule/ExceptionTouchEmbedWaitUntilCompleted.java
...ssing/schedule/ExceptionTouchEmbedWaitUntilCompleted.java
+13
-0
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/schedule/TouchEmbedWaitUntilCompleted.java
...ice/processing/schedule/TouchEmbedWaitUntilCompleted.java
+77
-0
未找到文件。
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/DataServer.java
浏览文件 @
b44ee05f
...
...
@@ -63,7 +63,7 @@ public class DataServer extends ConfigObject {
private
Integer
maxTotal
;
@FieldDescribe
(
"最大空闲连接数"
)
private
Integer
maxIdle
;
@FieldDescribe
(
"启用统计,默认
启用
"
)
@FieldDescribe
(
"启用统计,默认
开启
"
)
private
Boolean
statEnable
;
@FieldDescribe
(
"统计方式配置,默认mergeStat"
)
private
String
statFilter
;
...
...
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/ProcessPlatform.java
浏览文件 @
b44ee05f
...
...
@@ -75,6 +75,7 @@ public class ProcessPlatform extends ConfigObject {
this
.
urge
=
new
Urge
();
this
.
expire
=
new
Expire
();
this
.
touchDelay
=
new
TouchDelay
();
this
.
touchEmbedWaitUntilCompleted
=
new
TouchEmbedWaitUntilCompleted
();
this
.
merge
=
new
Merge
();
this
.
touchDetained
=
new
TouchDetained
();
this
.
deleteDraft
=
new
DeleteDraft
();
...
...
@@ -162,6 +163,9 @@ public class ProcessPlatform extends ConfigObject {
@FieldDescribe
(
"延时任务设置,定时触发延时任务,当超过延时时间后继续流转."
)
private
TouchDelay
touchDelay
;
@FieldDescribe
(
"触发等待子流程结束设置,当子流程结束回写标识后继续流转."
)
private
TouchEmbedWaitUntilCompleted
touchEmbedWaitUntilCompleted
;
@FieldDescribe
(
"合并任务设置,定时触发合并任务,将已完成工作的Data从Item表中提取合并到WorkCompleted的Data字段中,默认工作完成后2年开始进行合并."
)
private
Merge
merge
;
...
...
@@ -237,6 +241,11 @@ public class ProcessPlatform extends ConfigObject {
return
this
.
touchDelay
==
null
?
new
TouchDelay
()
:
this
.
touchDelay
;
}
public
TouchEmbedWaitUntilCompleted
getTouchEmbedWaitUntilCompleted
()
{
return
this
.
touchEmbedWaitUntilCompleted
==
null
?
new
TouchEmbedWaitUntilCompleted
()
:
this
.
touchEmbedWaitUntilCompleted
;
}
public
TouchDetained
getTouchDetained
()
{
return
this
.
touchDetained
==
null
?
new
TouchDetained
()
:
this
.
touchDetained
;
}
...
...
@@ -269,8 +278,7 @@ public class ProcessPlatform extends ConfigObject {
public
static
class
Urge
extends
ConfigObject
{
public
static
Urge
defaultInstance
()
{
Urge
o
=
new
Urge
();
return
o
;
return
new
Urge
();
}
public
static
final
Boolean
DEFAULT_ENABLE
=
false
;
...
...
@@ -307,8 +315,7 @@ public class ProcessPlatform extends ConfigObject {
public
static
class
Expire
extends
ConfigObject
{
public
static
Expire
defaultInstance
()
{
Expire
o
=
new
Expire
();
return
o
;
return
new
Expire
();
}
public
static
final
Boolean
DEFAULT_ENABLE
=
true
;
...
...
@@ -338,8 +345,7 @@ public class ProcessPlatform extends ConfigObject {
public
static
class
TouchDelay
extends
ConfigObject
{
public
static
TouchDelay
defaultInstance
()
{
TouchDelay
o
=
new
TouchDelay
();
return
o
;
return
new
TouchDelay
();
}
public
static
final
Boolean
DEFAULT_ENABLE
=
true
;
...
...
@@ -366,13 +372,42 @@ public class ProcessPlatform extends ConfigObject {
}
public
static
class
TouchEmbedWaitUntilCompleted
extends
ConfigObject
{
public
static
TouchEmbedWaitUntilCompleted
defaultInstance
()
{
return
new
TouchEmbedWaitUntilCompleted
();
}
public
static
final
Boolean
DEFAULT_ENABLE
=
true
;
public
static
final
String
DEFAULT_CRON
=
"15 0/5 * * * ?"
;
@FieldDescribe
(
"是否启用"
)
private
Boolean
enable
=
DEFAULT_ENABLE
;
@FieldDescribe
(
"定时cron表达式"
)
private
String
cron
=
DEFAULT_CRON
;
public
String
getCron
()
{
if
(
StringUtils
.
isNotEmpty
(
this
.
cron
)
&&
CronExpression
.
isValidExpression
(
this
.
cron
))
{
return
this
.
cron
;
}
else
{
return
DEFAULT_CRON
;
}
}
public
Boolean
getEnable
()
{
return
BooleanUtils
.
isTrue
(
this
.
enable
);
}
}
public
static
class
Merge
extends
ConfigObject
{
private
static
final
long
serialVersionUID
=
-
5858277850858377338L
;
public
static
Merge
defaultInstance
()
{
Merge
o
=
new
Merge
();
return
o
;
return
new
Merge
();
}
public
Merge
()
{
...
...
@@ -427,8 +462,7 @@ public class ProcessPlatform extends ConfigObject {
public
static
class
TouchDetained
extends
ConfigObject
{
public
static
TouchDetained
defaultInstance
()
{
TouchDetained
o
=
new
TouchDetained
();
return
o
;
return
new
TouchDetained
();
}
public
static
final
String
DEFAULT_CRON
=
"30 30 12 * * ?"
;
...
...
@@ -467,8 +501,7 @@ public class ProcessPlatform extends ConfigObject {
public
static
class
DeleteDraft
extends
ConfigObject
{
public
static
DeleteDraft
defaultInstance
()
{
DeleteDraft
o
=
new
DeleteDraft
();
return
o
;
return
new
DeleteDraft
();
}
public
static
final
String
DEFAULT_CRON
=
"0 0 20 * * ?"
;
...
...
@@ -507,8 +540,7 @@ public class ProcessPlatform extends ConfigObject {
public
static
class
PassExpired
extends
ConfigObject
{
public
static
PassExpired
defaultInstance
()
{
PassExpired
o
=
new
PassExpired
();
return
o
;
return
new
PassExpired
();
}
public
static
final
String
DEFAULT_CRON
=
"5 5 8-18 * * ?"
;
...
...
@@ -537,8 +569,7 @@ public class ProcessPlatform extends ConfigObject {
public
static
class
LogLongDetained
extends
ConfigObject
{
public
static
LogLongDetained
defaultInstance
()
{
LogLongDetained
o
=
new
LogLongDetained
();
return
o
;
return
new
LogLongDetained
();
}
public
static
final
String
DEFAULT_CRON
=
"0 0 4 * * ?"
;
...
...
@@ -598,8 +629,7 @@ public class ProcessPlatform extends ConfigObject {
public
static
class
Press
extends
ConfigObject
{
public
static
Press
defaultInstance
()
{
Press
o
=
new
Press
();
return
o
;
return
new
Press
();
}
public
static
final
Integer
DEFAULT_INTERVALMINUTES
=
10
;
...
...
@@ -633,8 +663,7 @@ public class ProcessPlatform extends ConfigObject {
public
static
class
AttachmentConfig
extends
ConfigObject
{
public
static
AttachmentConfig
defaultInstance
()
{
AttachmentConfig
o
=
new
AttachmentConfig
();
return
o
;
return
new
AttachmentConfig
();
}
public
static
final
Integer
DEFAULT_FILE_SIZE
=
0
;
...
...
o2server/x_base_core_project/src/main/java/com/x/base/core/project/scripting/ScriptingFactory.java
浏览文件 @
b44ee05f
...
...
@@ -45,6 +45,8 @@ public class ScriptingFactory {
public
static
final
String
BINDING_NAME_EFFECTIVEPERSON
=
"java_effectivePerson"
;
public
static
final
String
BINDING_NAME_DATA
=
"data"
;
// embedData
public
static
final
String
BINDING_NAME_EMBEDDATA
=
"embedData"
;
public
static
final
String
BINDING_NAME_SERIAL
=
"serial"
;
public
static
final
String
BINDING_NAME_PROCESS
=
"process"
;
...
...
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/application/ApplicationAction.java
浏览文件 @
b44ee05f
...
...
@@ -12,7 +12,6 @@ import javax.ws.rs.container.AsyncResponse;
import
javax.ws.rs.container.Suspended
;
import
javax.ws.rs.core.Context
;
import
javax.ws.rs.core.MediaType
;
import
javax.ws.rs.core.Response
;
import
com.x.base.core.project.annotation.JaxrsDescribe
;
import
com.x.base.core.project.annotation.JaxrsMethodDescribe
;
...
...
@@ -49,7 +48,7 @@ public class ApplicationAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"获取可见的应用,同时判断应用下有
可见
的流程."
,
action
=
ActionListWithPerson
.
class
)
@JaxrsMethodDescribe
(
value
=
"获取可见的应用,同时判断应用下有
启动
的流程."
,
action
=
ActionListWithPerson
.
class
)
@GET
@Path
(
"list"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
...
...
@@ -66,13 +65,13 @@ public class ApplicationAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"获取可见的应用,同时判断应用下有
可见
的流程,并进行流程的名称匹配."
,
action
=
ActionListWithPersonLike
.
class
)
@JaxrsMethodDescribe
(
value
=
"获取可见的应用,同时判断应用下有
启动
的流程,并进行流程的名称匹配."
,
action
=
ActionListWithPersonLike
.
class
)
@GET
@Path
(
"list/key/{key}"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
listWithPersonLike
(
@Suspended
final
AsyncResponse
asyncResponse
,
@
Context
HttpServletRequest
request
,
@
JaxrsParameterDescribe
(
"关键字"
)
@PathParam
(
"key"
)
String
key
)
{
public
void
listWithPersonLike
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"关键字"
)
@PathParam
(
"key"
)
String
key
)
{
ActionResult
<
List
<
ActionListWithPersonLike
.
Wo
>>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
...
...
@@ -84,7 +83,7 @@ public class ApplicationAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"根据当前用户所有可见的Application,并绑定其
可见
的Porcess"
,
action
=
ActionListWithPersonComplex
.
class
)
@JaxrsMethodDescribe
(
value
=
"根据当前用户所有可见的Application,并绑定其
启动
的Porcess"
,
action
=
ActionListWithPersonComplex
.
class
)
@GET
@Path
(
"list/complex"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
...
...
@@ -102,7 +101,7 @@ public class ApplicationAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"根据传入用户,获取可见的Application,并绑定其
可见
的Porcess"
,
action
=
ActionManageListWithPersonComplex
.
class
)
@JaxrsMethodDescribe
(
value
=
"根据传入用户,获取可见的Application,并绑定其
启动
的Porcess"
,
action
=
ActionManageListWithPersonComplex
.
class
)
@GET
@Path
(
"list/complex/manage/{person}"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
...
...
@@ -112,7 +111,7 @@ public class ApplicationAction extends StandardJaxrsAction {
ActionResult
<
List
<
ActionManageListWithPersonComplex
.
Wo
>>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionManageListWithPersonComplex
().
execute
(
effectivePerson
,
person
);
result
=
new
ActionManageListWithPersonComplex
().
execute
(
effectivePerson
,
person
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
null
);
result
.
error
(
e
);
...
...
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionCreate.java
浏览文件 @
b44ee05f
...
...
@@ -83,7 +83,8 @@ class ActionCreate extends BaseAction {
}
}
if
(
StringUtils
.
isEmpty
(
workId
))
{
WoId
woId
=
ThisApplication
.
context
().
applications
().
postQuery
(
x_processplatform_service_processing
.
class
,
WoId
woId
=
ThisApplication
.
context
().
applications
()
.
postQuery
(
x_processplatform_service_processing
.
class
,
Applications
.
joinQueryUri
(
"work"
,
"process"
,
process
.
getId
()),
wi
.
getData
(),
null
)
.
getData
(
WoId
.
class
);
workId
=
woId
.
getId
();
...
...
@@ -100,6 +101,10 @@ class ActionCreate extends BaseAction {
throw
new
ExceptionWorkNotExist
(
workId
);
}
work
.
setTitle
(
wi
.
getTitle
());
// 写入父work标识
if
(
StringUtils
.
isNotBlank
(
wi
.
getParentWork
()))
{
work
.
getProperties
().
setParentWork
(
wi
.
getParentWork
());
}
work
.
setCreatorIdentity
(
identity
);
work
.
setCreatorPerson
(
organization
.
person
().
getWithIdentity
(
identity
));
work
.
setCreatorUnit
(
organization
.
unit
().
getWithIdentity
(
identity
));
...
...
@@ -157,6 +162,17 @@ class ActionCreate extends BaseAction {
@FieldDescribe
(
"工作数据."
)
private
JsonElement
data
;
@FieldDescribe
(
"父工作标识."
)
private
String
parentWork
;
public
String
getParentWork
()
{
return
parentWork
;
}
public
void
setParentWork
(
String
parentWork
)
{
this
.
parentWork
=
parentWork
;
}
public
String
getTitle
()
{
return
title
;
}
...
...
@@ -248,12 +264,6 @@ class ActionCreate extends BaseAction {
private
static
final
long
serialVersionUID
=
2279846765261247910L
;
// public static List<String> Includes = ListTools.toList("createTime",
// "updateTime", "startTime",
// "startTimeMonth", "person", "identity", "unit", "topUnit",
// "routeList", "routeNameList", "work",
// "allowRapid");
static
WrapCopier
<
Task
,
WoTask
>
copier
=
WrapCopierFactory
.
wo
(
Task
.
class
,
WoTask
.
class
,
null
,
JpaObject
.
FieldsInvisible
);
...
...
@@ -370,21 +380,6 @@ class ActionCreate extends BaseAction {
}
});
wo
.
setTaskCompletedList
(
list
);
// /* 补充召回 */
// List<WoTaskCompleted> results = new ArrayList<>();
// for (WoTaskCompleted o : list) {
// results.add(o);
// if (o.getProcessingType().equals(ProcessingType.retract)) {
// WoTaskCompleted retract = new WoTaskCompleted();
// o.copyTo(retract);
// retract.setRouteName("撤回");
// retract.setOpinion("撤回");
// retract.setStartTime(retract.getRetractTime());
// retract.setCompletedTime(retract.getRetractTime());
// results.add(retract);
// }
// }
// wo.setTaskCompletedList(results);
}
}
\ No newline at end of file
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Work.java
浏览文件 @
b44ee05f
...
...
@@ -91,8 +91,6 @@ public class Work extends SliceJpaObject implements ProjectionInterface {
text
=
StringTools
.
utf8SubString
(
text
,
length_255B
);
this
.
setManualTaskIdentityText
(
text
);
}
// 强制进行properties对象写入
//this.setProperties(this.getProperties());
}
@PostLoad
...
...
@@ -154,11 +152,6 @@ public class Work extends SliceJpaObject implements ProjectionInterface {
}
public
List
<
String
>
getSplitValueList
()
{
// 这里调用必须重新指向一次,如果使用
// Work copy = XGsonBuilder.convert(work, Work.class);
// copy.copyTo(this, JpaObject.id_FIELDNAME);
// 这样的方法调用,那么在运行完成以后copy.splitValueList不再指向this.getProperties().getSplitValueList()
this
.
splitValueList
=
this
.
getProperties
().
getSplitValueList
();
return
this
.
splitValueList
;
}
...
...
@@ -399,8 +392,9 @@ public class Work extends SliceJpaObject implements ProjectionInterface {
@FieldDescribe
(
"拆分工作产生的Token"
)
@PersistentCollection
(
fetch
=
FetchType
.
EAGER
)
@OrderColumn
(
name
=
ORDERCOLUMNCOLUMN
)
@ContainerTable
(
name
=
TABLE
+
ContainerTableNameMiddle
+
splitTokenList_FIELDNAME
,
joinIndex
=
@Index
(
name
=
TABLE
+
IndexNameMiddle
+
splitTokenList_FIELDNAME
+
JoinIndexNameSuffix
))
@ContainerTable
(
name
=
TABLE
+
ContainerTableNameMiddle
+
splitTokenList_FIELDNAME
,
joinIndex
=
@Index
(
name
=
TABLE
+
IndexNameMiddle
+
splitTokenList_FIELDNAME
+
JoinIndexNameSuffix
))
@ElementColumn
(
length
=
JpaObject
.
length_id
,
name
=
ColumnNamePrefix
+
splitTokenList_FIELDNAME
)
@ElementIndex
(
name
=
TABLE
+
IndexNameMiddle
+
splitTokenList_FIELDNAME
+
ElementIndexNameSuffix
)
@CheckPersist
(
allowEmpty
=
true
)
...
...
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/WorkProperties.java
浏览文件 @
b44ee05f
...
...
@@ -13,23 +13,29 @@ public class WorkProperties extends JsonProperties {
private
static
final
long
serialVersionUID
=
-
62236689373222398L
;
@FieldDescribe
(
"强制待办处理人"
)
private
List
<
String
>
manualForceTaskIdentityList
=
new
ArrayList
<
String
>();
private
List
<
String
>
manualForceTaskIdentityList
=
new
ArrayList
<>();
@FieldDescribe
(
"授权对象"
)
private
Map
<
String
,
String
>
manualEmpowerMap
=
new
LinkedHashMap
<
String
,
String
>();
private
Map
<
String
,
String
>
manualEmpowerMap
=
new
LinkedHashMap
<>();
@FieldDescribe
(
"服务回调值"
)
private
Map
<
String
,
Object
>
serviceValue
=
new
LinkedHashMap
<
String
,
Object
>();
private
Map
<
String
,
Object
>
serviceValue
=
new
LinkedHashMap
<>();
@FieldDescribe
(
"标题"
)
private
String
title
;
@FieldDescribe
(
"调用子流程后子流程结束将回写,用于标识子流程已经结束."
)
private
String
embedCompleted
;
@FieldDescribe
(
"父工作,在当前工作是通过子流程调用时产生."
)
private
String
parentWork
;
@FieldDescribe
(
"拆分值列表"
)
private
List
<
String
>
splitValueList
=
new
ArrayList
<
String
>();
private
List
<
String
>
splitValueList
=
new
ArrayList
<>();
public
List
<
String
>
getManualForceTaskIdentityList
()
{
if
(
this
.
manualForceTaskIdentityList
==
null
)
{
this
.
manualForceTaskIdentityList
=
new
ArrayList
<
String
>();
this
.
manualForceTaskIdentityList
=
new
ArrayList
<>();
}
return
this
.
manualForceTaskIdentityList
;
}
...
...
@@ -40,7 +46,7 @@ public class WorkProperties extends JsonProperties {
public
Map
<
String
,
String
>
getManualEmpowerMap
()
{
if
(
this
.
manualEmpowerMap
==
null
)
{
this
.
manualEmpowerMap
=
new
LinkedHashMap
<
String
,
String
>();
this
.
manualEmpowerMap
=
new
LinkedHashMap
<>();
}
return
this
.
manualEmpowerMap
;
}
...
...
@@ -79,4 +85,20 @@ public class WorkProperties extends JsonProperties {
this
.
splitValueList
=
splitValueList
;
}
public
String
getEmbedCompleted
()
{
return
embedCompleted
;
}
public
void
setEmbedCompleted
(
String
embedCompleted
)
{
this
.
embedCompleted
=
embedCompleted
;
}
public
String
getParentWork
()
{
return
parentWork
;
}
public
void
setParentWork
(
String
parentWork
)
{
this
.
parentWork
=
parentWork
;
}
}
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Embed.java
浏览文件 @
b44ee05f
...
...
@@ -75,6 +75,10 @@ public class Embed extends Activity {
public
void
postLoad
()
{
if
(
null
!=
this
.
properties
)
{
this
.
customData
=
this
.
getProperties
().
getCustomData
();
this
.
completedEndScript
=
this
.
getProperties
().
getCompletedEndScript
();
this
.
completedEndScriptText
=
this
.
getProperties
().
getCompletedEndScriptText
();
this
.
completedCancelScript
=
this
.
getProperties
().
getCompletedCancelScript
();
this
.
completedCancelScriptText
=
this
.
getProperties
().
getCompletedCancelScriptText
();
}
}
...
...
@@ -104,17 +108,50 @@ public class Embed extends Activity {
this
.
properties
=
new
EmbedProperties
();
}
public
static
final
String
COMPLETEDENDSCRIPT_FIELDNAME
=
"completedEndScript"
;
@FieldDescribe
(
"嵌入子流程在End节点结束事件脚本."
)
@Transient
private
String
completedEndScript
;
public
static
final
String
COMPLETEDENDSCRIPTTEXT_FIELDNAME
=
"completedEndScriptText"
;
@FieldDescribe
(
"嵌入子流程在End节点结束事件脚本文本."
)
@Transient
private
String
completedEndScriptText
;
public
static
final
String
COMPLETEDCANCELSCRIPT_FIELDNAME
=
"completedCancelScript"
;
@FieldDescribe
(
"嵌入子流程在Cancel节点结束事件脚本."
)
@Transient
private
String
completedCancelScript
;
public
static
final
String
COMPLETEDCANCELSCRIPTTEXT_FIELDNAME
=
"completedCancelScriptText"
;
@FieldDescribe
(
"嵌入子流程在Cancel节点结束事件脚本文本."
)
@Transient
private
String
completedCancelScriptText
;
public
static
final
String
CUSTOMDATA_FIELDNAME
=
"customData"
;
@FieldDescribe
(
"节点自定义数据."
)
@Transient
private
JsonElement
customData
;
@Override
public
JsonElement
getCustomData
()
{
if
(
null
!=
customData
)
{
return
this
.
customData
;
}
else
{
return
this
.
getProperties
().
getCustomData
();
}
public
String
getCompletedEndScript
()
{
return
completedEndScript
;
}
public
String
getCompletedCancelScriptText
()
{
return
completedCancelScriptText
;
}
public
String
getCompletedCancelScript
()
{
return
completedCancelScript
;
}
public
String
getCompletedEndScriptText
()
{
return
completedEndScriptText
;
}
@Override
...
...
@@ -123,6 +160,26 @@ public class Embed extends Activity {
this
.
properties
.
setCustomData
(
customData
);
}
public
void
setCompletedEndScript
(
String
completedEndScript
)
{
this
.
getProperties
().
setCompletedEndScript
(
completedEndScript
);
this
.
completedEndScript
=
completedEndScript
;
}
public
void
setCompletedEndScriptText
(
String
completedEndScriptText
)
{
this
.
getProperties
().
setCompletedEndScriptText
(
completedEndScriptText
);
this
.
completedEndScriptText
=
completedEndScriptText
;
}
public
void
setCompletedCancelScript
(
String
completedCancelScript
)
{
this
.
getProperties
().
setCompletedCancelScript
(
completedCancelScript
);
this
.
completedCancelScript
=
completedCancelScript
;
}
public
void
setCompletedCancelScriptText
(
String
completedCancelScriptText
)
{
this
.
getProperties
().
setCompletedCancelScriptText
(
completedCancelScriptText
);
this
.
completedCancelScriptText
=
completedCancelScriptText
;
}
@FieldDescribe
(
"分组"
)
@CheckPersist
(
allowEmpty
=
true
)
@Column
(
length
=
JpaObject
.
length_255B
,
name
=
ColumnNamePrefix
+
group_FIELDNAME
)
...
...
@@ -560,12 +617,19 @@ public class Embed extends Activity {
@CheckPersist
(
allowEmpty
=
true
)
private
EmbedProperties
properties
;
public
static
final
String
WAITUNTIL
END_FIELDNAME
=
"waitUntilEn
d"
;
public
static
final
String
WAITUNTIL
COMPLETED_FIELDNAME
=
"waitUntilComplete
d"
;
@FieldDescribe
(
"等待至子流程结束."
)
@CheckPersist
(
allowEmpty
=
true
)
@Column
(
name
=
ColumnNamePrefix
+
WAITUNTILEND_FIELDNAME
)
@Index
(
name
=
TABLE
+
IndexNameMiddle
+
WAITUNTILEND_FIELDNAME
)
private
Boolean
waitUntilEnd
;
@Column
(
name
=
ColumnNamePrefix
+
WAITUNTILCOMPLETED_FIELDNAME
)
private
Boolean
waitUntilCompleted
;
public
Boolean
getWaitUntilCompleted
()
{
return
waitUntilCompleted
;
}
public
void
setWaitUntilCompleted
(
Boolean
waitUntilCompleted
)
{
this
.
waitUntilCompleted
=
waitUntilCompleted
;
}
public
String
getDisplayLogScript
()
{
return
displayLogScript
;
...
...
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/EmbedProperties.java
浏览文件 @
b44ee05f
...
...
@@ -19,4 +19,48 @@ public class EmbedProperties extends JsonProperties {
this
.
customData
=
customData
;
}
@FieldDescribe
(
"嵌入子流程在End节点结束事件脚本."
)
private
String
completedEndScript
;
@FieldDescribe
(
"嵌入子流程在End节点结束事件脚本文本."
)
private
String
completedEndScriptText
;
@FieldDescribe
(
"嵌入子流程在Cancel节点结束事件脚本."
)
private
String
completedCancelScript
;
@FieldDescribe
(
"嵌入子流程在Cancel节点结束事件脚本文本."
)
private
String
completedCancelScriptText
;
public
String
getCompletedEndScript
()
{
return
completedEndScript
;
}
public
void
setCompletedEndScript
(
String
completedEndScript
)
{
this
.
completedEndScript
=
completedEndScript
;
}
public
String
getCompletedEndScriptText
()
{
return
completedEndScriptText
;
}
public
void
setCompletedEndScriptText
(
String
completedEndScriptText
)
{
this
.
completedEndScriptText
=
completedEndScriptText
;
}
public
String
getCompletedCancelScript
()
{
return
completedCancelScript
;
}
public
void
setCompletedCancelScript
(
String
completedCancelScript
)
{
this
.
completedCancelScript
=
completedCancelScript
;
}
public
String
getCompletedCancelScriptText
()
{
return
completedCancelScriptText
;
}
public
void
setCompletedCancelScriptText
(
String
completedCancelScriptText
)
{
this
.
completedCancelScriptText
=
completedCancelScriptText
;
}
}
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/Business.java
浏览文件 @
b44ee05f
...
...
@@ -45,6 +45,8 @@ public class Business {
public
static
final
String
EVENT_EMBEDTARGETASSIGNDATA
=
"embedTargetAssignData"
;
public
static
final
String
EVENT_EMBEDTARGETIDENTITY
=
"embedTargetIdentity"
;
public
static
final
String
EVENT_EMBEDTARGETTITLE
=
"embedTargetTitle"
;
public
static
final
String
EVENT_EMBEDCOMPLETEDEND
=
"embedCompletedEnd"
;
public
static
final
String
EVENT_EMBEDCOMPLETEDCANCEL
=
"embedCompletedCancel"
;
public
static
final
String
EVENT_PROCESSAFTERBEGIN
=
"processAfterBegin"
;
public
static
final
String
EVENT_PROCESSAFTEREND
=
"processAfterEnd"
;
public
static
final
String
EVENT_PROCESSEXPIRE
=
"processExpire"
;
...
...
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/ThisApplication.java
浏览文件 @
b44ee05f
...
...
@@ -16,6 +16,7 @@ import com.x.processplatform.service.processing.schedule.Merge;
import
com.x.processplatform.service.processing.schedule.PassExpired
;
import
com.x.processplatform.service.processing.schedule.TouchDelay
;
import
com.x.processplatform.service.processing.schedule.TouchDetained
;
import
com.x.processplatform.service.processing.schedule.TouchEmbedWaitUntilCompleted
;
import
com.x.processplatform.service.processing.schedule.Urge
;
public
class
ThisApplication
{
...
...
@@ -73,6 +74,10 @@ public class ThisApplication {
if
(
BooleanUtils
.
isTrue
(
Config
.
processPlatform
().
getUrge
().
getEnable
()))
{
context
.
schedule
(
Urge
.
class
,
Config
.
processPlatform
().
getUrge
().
getCron
());
}
if
(
BooleanUtils
.
isTrue
(
Config
.
processPlatform
().
getTouchEmbedWaitUntilCompleted
().
getEnable
()))
{
context
.
schedule
(
TouchEmbedWaitUntilCompleted
.
class
,
Config
.
processPlatform
().
getTouchEmbedWaitUntilCompleted
().
getCron
());
}
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
...
...
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/WorkDataHelper.java
浏览文件 @
b44ee05f
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/AbstractBaseProcessor.java
浏览文件 @
b44ee05f
...
...
@@ -20,6 +20,7 @@ import com.x.processplatform.core.entity.content.Work;
import
com.x.processplatform.core.entity.content.WorkLog
;
import
com.x.processplatform.core.entity.content.WorkStatus
;
import
com.x.processplatform.core.entity.element.Activity
;
import
com.x.processplatform.core.entity.element.Embed
;
import
com.x.processplatform.core.entity.element.Form
;
import
com.x.processplatform.core.entity.element.Process
;
import
com.x.processplatform.service.processing.Business
;
...
...
@@ -255,6 +256,16 @@ public abstract class AbstractBaseProcessor {
||
StringUtils
.
isNotEmpty
(
activity
.
get
(
AIST
,
String
.
class
));
}
protected
boolean
hasEmbedCompletedEndScript
(
Embed
embed
)
{
return
StringUtils
.
isNotEmpty
(
embed
.
getProperties
().
getCompletedEndScript
())
||
StringUtils
.
isNotEmpty
(
embed
.
getProperties
().
getCompletedEndScriptText
());
}
protected
boolean
hasEmbedCompletedCancelScript
(
Embed
embed
)
{
return
StringUtils
.
isNotEmpty
(
embed
.
getProperties
().
getCompletedCancelScript
())
||
StringUtils
.
isNotEmpty
(
embed
.
getProperties
().
getCompletedCancelScriptText
());
}
protected
void
createFromWorkLog
(
AeiObjects
aeiObjects
,
String
token
,
Date
date
)
throws
Exception
{
WorkLog
workLog
=
WorkLog
.
createFromWork
(
aeiObjects
.
getWork
(),
aeiObjects
.
getActivity
(),
token
,
date
);
aeiObjects
.
getCreateWorkLogs
().
add
(
workLog
);
...
...
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/embed/EmbedProcessor.java
浏览文件 @
b44ee05f
...
...
@@ -102,9 +102,12 @@ public class EmbedProcessor extends AbstractEmbedProcessor {
String
embedWorkId
=
executor
.
execute
(
assignData
);
aeiObjects
.
getWork
().
setEmbedTargetWork
(
embedWorkId
);
}
List
<
Work
>
results
=
new
ArrayList
<>();
// 如果设置了停留至子流程结束,需要等待回写的标记.
if
(
BooleanUtils
.
isNotTrue
(
embed
.
getWaitUntilCompleted
())
||
StringUtils
.
isNotBlank
(
aeiObjects
.
getWork
().
getProperties
().
getEmbedCompleted
()))
{
results
.
add
(
aeiObjects
.
getWork
());
}
return
results
;
}
...
...
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/end/EndProcessor.java
浏览文件 @
b44ee05f
...
...
@@ -4,8 +4,11 @@ import java.util.ArrayList;
import
java.util.Comparator
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.Objects
;
import
javax.script.Bindings
;
import
javax.script.CompiledScript
;
import
javax.script.ScriptContext
;
import
org.apache.commons.lang3.BooleanUtils
;
import
org.apache.commons.lang3.StringUtils
;
...
...
@@ -15,8 +18,11 @@ import com.x.base.core.project.config.Config;
import
com.x.base.core.project.logger.Logger
;
import
com.x.base.core.project.logger.LoggerFactory
;
import
com.x.base.core.project.scripting.JsonScriptingExecutor
;
import
com.x.base.core.project.scripting.ScriptingFactory
;
import
com.x.processplatform.core.entity.content.Work
;
import
com.x.processplatform.core.entity.content.WorkCompleted
;
import
com.x.processplatform.core.entity.element.ActivityType
;
import
com.x.processplatform.core.entity.element.Embed
;
import
com.x.processplatform.core.entity.element.End
;
import
com.x.processplatform.core.entity.element.Route
;
import
com.x.processplatform.core.entity.log.Signal
;
...
...
@@ -151,7 +157,45 @@ public class EndProcessor extends AbstractEndProcessor {
CompiledScript
cs
=
aeiObjects
.
business
().
element
().
getCompiledScript
(
aeiObjects
.
getWork
().
getApplication
(),
aeiObjects
.
getProcess
(),
Business
.
EVENT_PROCESSAFTEREND
);
JsonScriptingExecutor
.
eval
(
cs
,
aeiObjects
.
scriptContext
());
// 回写到父Work
tryUpdateParentWork
(
aeiObjects
);
}
}
private
void
tryUpdateParentWork
(
AeiObjects
aeiObjects
)
{
if
(
StringUtils
.
isBlank
(
aeiObjects
.
getWork
().
getProperties
().
getParentWork
()))
{
try
{
Work
work
=
aeiObjects
.
entityManagerContainer
()
.
find
(
aeiObjects
.
getWork
().
getProperties
().
getParentWork
(),
Work
.
class
);
if
((
null
!=
work
)
&&
Objects
.
equals
(
work
.
getActivityType
(),
ActivityType
.
embed
))
{
Embed
embed
=
(
Embed
)
aeiObjects
.
business
().
element
().
get
(
work
.
getActivity
(),
work
.
getActivityType
());
if
((
null
!=
embed
)
&&
BooleanUtils
.
isTrue
(
embed
.
getWaitUntilCompleted
()))
{
updateParentWork
(
aeiObjects
,
work
,
embed
);
}
}
}
catch
(
Exception
e
)
{
LOGGER
.
error
(
new
ExceptionUpdateParentWork
(
aeiObjects
.
getWork
().
getId
(),
aeiObjects
.
getWork
().
getProperties
().
getParentWork
()));
}
}
}
private
void
updateParentWork
(
AeiObjects
aeiObjects
,
Work
work
,
Embed
embed
)
throws
Exception
{
AeiObjects
embedAeiObjects
=
new
AeiObjects
(
aeiObjects
.
business
(),
work
,
embed
,
aeiObjects
.
getProcessingConfigurator
(),
aeiObjects
.
getProcessingAttributes
());
embedAeiObjects
.
entityManagerContainer
().
beginTransaction
(
Work
.
class
);
work
.
getProperties
().
setEmbedCompleted
(
ActivityType
.
end
.
toString
());
if
(
this
.
hasEmbedCompletedEndScript
(
embed
))
{
CompiledScript
cs
=
aeiObjects
.
business
().
element
().
getCompiledScript
(
aeiObjects
.
getWork
().
getApplication
(),
embed
,
Business
.
EVENT_EMBEDCOMPLETEDEND
);
ScriptContext
scriptContext
=
embedAeiObjects
.
scriptContext
();
Bindings
bindings
=
scriptContext
.
getBindings
(
ScriptContext
.
ENGINE_SCOPE
);
bindings
.
put
(
ScriptingFactory
.
BINDING_NAME_EMBEDDATA
,
aeiObjects
.
getData
());
JsonScriptingExecutor
.
eval
(
cs
,
scriptContext
);
}
embedAeiObjects
.
commit
();
}
@Override
...
...
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/end/ExceptionUpdateParentWork.java
0 → 100644
浏览文件 @
b44ee05f
package
com.x.processplatform.service.processing.processor.end
;
import
com.x.base.core.project.exception.RunningException
;
class
ExceptionUpdateParentWork
extends
RunningException
{
private
static
final
long
serialVersionUID
=
9085364457175859374L
;
ExceptionUpdateParentWork
(
String
work
,
String
parentWork
)
{
super
(
"updateParentWork error, work: {}, parent work:{}."
,
work
,
parentWork
);
}
}
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/schedule/ExceptionTouchEmbedWaitUntilCompleted.java
0 → 100644
浏览文件 @
b44ee05f
package
com.x.processplatform.service.processing.schedule
;
import
com.x.base.core.project.exception.PromptException
;
class
ExceptionTouchEmbedWaitUntilCompleted
extends
PromptException
{
private
static
final
long
serialVersionUID
=
-
7038279889683420366L
;
ExceptionTouchEmbedWaitUntilCompleted
(
Exception
e
,
String
id
,
String
job
)
{
super
(
e
,
"子流程结束工作触发失败, id:{}, job:{}."
,
id
,
job
);
}
}
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/schedule/TouchEmbedWaitUntilCompleted.java
0 → 100644
浏览文件 @
b44ee05f
package
com.x.processplatform.service.processing.schedule
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.concurrent.atomic.AtomicInteger
;
import
org.apache.commons.lang3.StringUtils
;
import
org.quartz.JobExecutionContext
;
import
org.quartz.JobExecutionException
;
import
com.x.base.core.container.EntityManagerContainer
;
import
com.x.base.core.container.factory.EntityManagerContainerFactory
;
import
com.x.base.core.project.Applications
;
import
com.x.base.core.project.x_processplatform_service_processing
;
import
com.x.base.core.project.jaxrs.WoId
;
import
com.x.base.core.project.logger.Logger
;
import
com.x.base.core.project.logger.LoggerFactory
;
import
com.x.base.core.project.schedule.AbstractJob
;
import
com.x.base.core.project.utils.time.TimeStamp
;
import
com.x.processplatform.core.entity.content.Work
;
import
com.x.processplatform.core.entity.element.ActivityType
;
import
com.x.processplatform.core.entity.element.Embed
;
import
com.x.processplatform.core.express.ProcessingAttributes
;
import
com.x.processplatform.service.processing.ThisApplication
;
public
class
TouchEmbedWaitUntilCompleted
extends
AbstractJob
{
private
static
final
Logger
LOGGER
=
LoggerFactory
.
getLogger
(
TouchEmbedWaitUntilCompleted
.
class
);
@Override
public
void
schedule
(
JobExecutionContext
jobExecutionContext
)
throws
Exception
{
try
{
TimeStamp
stamp
=
new
TimeStamp
();
AtomicInteger
count
=
new
AtomicInteger
();
Map
<
String
,
String
>
idJobs
=
this
.
list
();
if
(!
idJobs
.
isEmpty
())
{
for
(
Map
.
Entry
<
String
,
String
>
en
:
idJobs
.
entrySet
())
{
touch
(
en
.
getKey
(),
en
.
getValue
(),
count
);
}
}
if
(
count
.
get
()
>
0
)
{
LOGGER
.
info
(
"完成触发{}个等待子流程结束工作, 耗时:{}."
,
count:
:
intValue
,
stamp:
:
consumingMilliseconds
);
}
}
catch
(
Exception
e
)
{
throw
new
JobExecutionException
(
e
);
}
}
private
void
touch
(
String
id
,
String
job
,
AtomicInteger
count
)
{
try
{
ThisApplication
.
context
().
applications
()
.
putQuery
(
x_processplatform_service_processing
.
class
,
Applications
.
joinQueryUri
(
"work"
,
id
,
"processing"
),
new
ProcessingAttributes
(),
job
)
.
getData
(
WoId
.
class
);
count
.
incrementAndGet
();
}
catch
(
Exception
e
)
{
LOGGER
.
error
(
new
ExceptionTouchEmbedWaitUntilCompleted
(
e
,
id
,
job
));
}
}
private
Map
<
String
,
String
>
list
()
throws
Exception
{
Map
<
String
,
String
>
idJobs
=
new
HashMap
<>();
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
List
<
String
>
embeds
=
emc
.
idsEqual
(
Embed
.
class
,
Embed
.
WAITUNTILCOMPLETED_FIELDNAME
,
true
);
List
<
String
>
ids
=
emc
.
idsEqualAndIn
(
Work
.
class
,
Work
.
activityType_FIELDNAME
,
ActivityType
.
embed
,
Work
.
activity_FIELDNAME
,
embeds
);
for
(
String
id
:
ids
)
{
Work
work
=
emc
.
find
(
id
,
Work
.
class
);
if
(
StringUtils
.
isNotBlank
(
work
.
getProperties
().
getEmbedCompleted
()))
{
idJobs
.
put
(
work
.
getId
(),
work
.
getJob
());
}
}
}
return
idJobs
;
}
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录