Skip to content

o2oa
o2oa

ghsby / o2oa
落后 Fork 源项目 2880 个版本

Fork自 浙江兰德纵横网络技术股份有限公司 / o2oa

通知 1
Star 1
Fork 0
o2oa
o2oa

体验新版 GitCode，发现更多精彩内容 >>

提交 0e5756ed 编写于 作者: O o2null
浏览文件
操作

Merge branch 'fix/#276' into 'develop' 

bind task taskCompleted

See merge request o2oa/o2oa!1300
上级 3d20322d c279801d
隐藏空白更改
内联 并排
Showing with 20 addition and 111 deletion
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/WorkContext.java
浏览文件 @ 0e5756ed
...@@ -38,6 +38,14 @@ public class WorkContext { ...@@ -38,6 +38,14 @@ public class WorkContext {
private Task task; private Task task;
private TaskCompleted taskCompleted; private TaskCompleted taskCompleted;
public void bindTask(Task task) {
this.task = task;
}
public void bindTaskCompleted(TaskCompleted taskCompleted) {
this.taskCompleted = taskCompleted;
}
public WorkContext(AeiObjects aeiObjects) throws Exception { public WorkContext(AeiObjects aeiObjects) throws Exception {
this.aeiObjects = aeiObjects; this.aeiObjects = aeiObjects;
this.business = aeiObjects.business(); this.business = aeiObjects.business();
......
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionProcessing.java
浏览文件 @ 0e5756ed
...@@ -7,6 +7,9 @@ import java.util.concurrent.Callable; ...@@ -7,6 +7,9 @@ import java.util.concurrent.Callable;
import javax.script.CompiledScript; import javax.script.CompiledScript;
import javax.script.ScriptContext; import javax.script.ScriptContext;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory; import com.x.base.core.container.factory.EntityManagerContainerFactory;
...@@ -21,6 +24,7 @@ import com.x.base.core.project.http.EffectivePerson; ...@@ -21,6 +24,7 @@ import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.jaxrs.WoId; import com.x.base.core.project.jaxrs.WoId;
import com.x.base.core.project.logger.Logger; import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory; import com.x.base.core.project.logger.LoggerFactory;
import com.x.base.core.project.script.ScriptFactory;
import com.x.base.core.project.tools.ListTools; import com.x.base.core.project.tools.ListTools;
import com.x.processplatform.core.entity.content.Task; import com.x.processplatform.core.entity.content.Task;
import com.x.processplatform.core.entity.content.TaskCompleted; import com.x.processplatform.core.entity.content.TaskCompleted;
...@@ -32,13 +36,11 @@ import com.x.processplatform.core.express.ProcessingAttributes; ...@@ -32,13 +36,11 @@ import com.x.processplatform.core.express.ProcessingAttributes;
import com.x.processplatform.core.express.service.processing.jaxrs.task.WrapProcessing; import com.x.processplatform.core.express.service.processing.jaxrs.task.WrapProcessing;
import com.x.processplatform.service.processing.Business; import com.x.processplatform.service.processing.Business;
import com.x.processplatform.service.processing.MessageFactory; import com.x.processplatform.service.processing.MessageFactory;
import com.x.processplatform.service.processing.WorkContext;
import com.x.processplatform.service.processing.WorkDataHelper; import com.x.processplatform.service.processing.WorkDataHelper;
import com.x.processplatform.service.processing.configurator.ProcessingConfigurator; import com.x.processplatform.service.processing.configurator.ProcessingConfigurator;
import com.x.processplatform.service.processing.processor.AeiObjects; import com.x.processplatform.service.processing.processor.AeiObjects;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
class ActionProcessing extends BaseAction { class ActionProcessing extends BaseAction {
@ActionLogger @ActionLogger
...@@ -58,112 +60,6 @@ class ActionProcessing extends BaseAction { ...@@ -58,112 +60,6 @@ class ActionProcessing extends BaseAction {
job = task.getJob(); job = task.getJob();
} }
// Callable<ActionResult<Wo>> callable = new Callable<ActionResult<Wo>>() {
// public ActionResult<Wo> call() throws Exception {
// ActionResult<Wo> result = new ActionResult<>();
// Wo wo = new Wo();
// try (EntityManagerContainer emc =
// EntityManagerContainerFactory.instance().create()) {
// Business business = new Business(emc);
// /** 生成默认的Wi,用于生成默认的processType */
// if (null == wi.getProcessingType()) {
// wi.setProcessingType(TaskCompleted.PROCESSINGTYPE_TASK);
// }
// Task task = emc.find(id, Task.class);
// if (null == task) {
// throw new ExceptionEntityNotExist(id, Task.class);
// }
// Manual manual = null;
// /* 执行办前脚本 */
// if (Objects.equals(task.getActivityType(), ActivityType.manual)) {
// manual = business.element().get(task.getActivity(), Manual.class);
// if (null != manual) {
// if (StringUtils.isNotEmpty(manual.getManualBeforeTaskScript())
// || StringUtils.isNotEmpty(manual.getManualBeforeTaskScriptText())) {
// Work work = emc.find(task.getWork(), Work.class);
// if (null != work) {
// AeiObjects aeiObjects = new AeiObjects(business, work, manual,
// new ProcessingConfigurator(), new ProcessingAttributes());
// ScriptContext scriptContext = aeiObjects.scriptContext();
// WorkDataHelper workDataHelper = new WorkDataHelper(
// business.entityManagerContainer(), work);
// CompiledScript cs = null;
// cs = business.element().getCompiledScript(task.getApplication(), manual,
// Business.EVENT_MANUALBEFORETASK);
// cs.eval(scriptContext);
// workDataHelper.update(aeiObjects.getData());
// emc.commit();
// }
// }
// }
// }
// /* 将待办转为已办 */
// emc.beginTransaction(TaskCompleted.class);
// emc.beginTransaction(Task.class);
// /* 将所有前面的已办lastest标记false */
// emc.listEqualAndEqual(TaskCompleted.class, TaskCompleted.job_FIELDNAME,
// task.getJob(),
// TaskCompleted.person_FIELDNAME, task.getPerson()).forEach(o -> {
// o.setLatest(false);
// });
// Date now = new Date();
// Long duration = Config.workTime().betweenMinutes(task.getStartTime(), now);
// TaskCompleted taskCompleted = new TaskCompleted(task, wi.getProcessingType(),
// now, duration);
// if (StringUtils.isEmpty(taskCompleted.getOpinion())) {
// Process process = business.element().get(task.getProcess(), Process.class);
// if ((null != process) && process.getRouteNameAsOpinion()) {
// /* 先写入路由意见 */
// taskCompleted.setOpinion(StringUtils.trimToEmpty(ListTools.parallel(task.getRouteNameList(),
// task.getRouteName(), task.getRouteOpinionList())));
// /* 如果路由的名称依然没有获取，那么强制设置为路由名称。 */
// if (StringUtils.isEmpty(taskCompleted.getOpinion())) {
// taskCompleted.setOpinion(task.getRouteName());
// }
// }
// }
// taskCompleted.onPersist();
// emc.persist(taskCompleted, CheckPersistType.all);
// emc.remove(task, CheckRemoveType.all);
// emc.commit();
// /* 待办执行后脚本,不能修改数据. */
// if (null != manual) {
// if (StringUtils.isNotEmpty(manual.getManualAfterTaskScript())
// || StringUtils.isNotEmpty(manual.getManualAfterTaskScriptText())) {
// Work work = emc.find(task.getWork(), Work.class);
// if (null != work) {
// AeiObjects aeiObjects = new AeiObjects(business, work, manual,
// new ProcessingConfigurator(), new ProcessingAttributes());
// ScriptContext scriptContext = aeiObjects.scriptContext();
// CompiledScript cs = null;
// cs = business.element().getCompiledScript(task.getApplication(), manual,
// Business.EVENT_MANUALAFTERTASK);
// cs.eval(scriptContext);
// }
// }
// }
// MessageFactory.task_to_taskCompleted(taskCompleted);
// wo.setId(taskCompleted.getId());
// }
// result.setData(wo);
// return result;
// }
// };
return ProcessPlatformExecutorFactory.get(job).submit(new CallableExecute(wi, id)).get(); return ProcessPlatformExecutorFactory.get(job).submit(new CallableExecute(wi, id)).get();
} }
...@@ -189,6 +85,8 @@ class ActionProcessing extends BaseAction { ...@@ -189,6 +85,8 @@ class ActionProcessing extends BaseAction {
AeiObjects aeiObjects = new AeiObjects(business, work, manual, new ProcessingConfigurator(), AeiObjects aeiObjects = new AeiObjects(business, work, manual, new ProcessingConfigurator(),
new ProcessingAttributes()); new ProcessingAttributes());
ScriptContext scriptContext = aeiObjects.scriptContext(); ScriptContext scriptContext = aeiObjects.scriptContext();
((WorkContext) scriptContext.getAttribute(ScriptFactory.BINDING_NAME_WORKCONTEXT))
.bindTask(task);
WorkDataHelper workDataHelper = new WorkDataHelper(business.entityManagerContainer(), work); WorkDataHelper workDataHelper = new WorkDataHelper(business.entityManagerContainer(), work);
CompiledScript cs = null; CompiledScript cs = null;
cs = business.element().getCompiledScript(task.getApplication(), manual, cs = business.element().getCompiledScript(task.getApplication(), manual,
...@@ -201,7 +99,8 @@ class ActionProcessing extends BaseAction { ...@@ -201,7 +99,8 @@ class ActionProcessing extends BaseAction {
} }
} }
private void callManualAfterTaskScript(Business business, Task task) throws Exception { private void callManualAfterTaskScript(Business business, Task task, TaskCompleted taskCompleted)
throws Exception {
if (Objects.equals(task.getActivityType(), ActivityType.manual)) { if (Objects.equals(task.getActivityType(), ActivityType.manual)) {
Manual manual = business.element().get(task.getActivity(), Manual.class); Manual manual = business.element().get(task.getActivity(), Manual.class);
if ((null != manual) && (StringUtils.isNotEmpty(manual.getManualAfterTaskScript()) if ((null != manual) && (StringUtils.isNotEmpty(manual.getManualAfterTaskScript())
...@@ -211,6 +110,8 @@ class ActionProcessing extends BaseAction { ...@@ -211,6 +110,8 @@ class ActionProcessing extends BaseAction {
AeiObjects aeiObjects = new AeiObjects(business, work, manual, new ProcessingConfigurator(), AeiObjects aeiObjects = new AeiObjects(business, work, manual, new ProcessingConfigurator(),
new ProcessingAttributes()); new ProcessingAttributes());
ScriptContext scriptContext = aeiObjects.scriptContext(); ScriptContext scriptContext = aeiObjects.scriptContext();
((WorkContext) scriptContext.getAttribute(ScriptFactory.BINDING_NAME_WORKCONTEXT))
.bindTaskCompleted(taskCompleted);
CompiledScript cs = null; CompiledScript cs = null;
cs = business.element().getCompiledScript(task.getApplication(), manual, cs = business.element().getCompiledScript(task.getApplication(), manual,
Business.EVENT_MANUALAFTERTASK); Business.EVENT_MANUALAFTERTASK);
...@@ -263,7 +164,7 @@ class ActionProcessing extends BaseAction { ...@@ -263,7 +164,7 @@ class ActionProcessing extends BaseAction {
emc.remove(task, CheckRemoveType.all); emc.remove(task, CheckRemoveType.all);
emc.commit(); emc.commit();
/* 待办执行后脚本,不能修改数据. */ /* 待办执行后脚本,不能修改数据. */
callManualAfterTaskScript(business, task); callManualAfterTaskScript(business, task, taskCompleted);
MessageFactory.task_to_taskCompleted(taskCompleted); MessageFactory.task_to_taskCompleted(taskCompleted);
wo.setId(taskCompleted.getId()); wo.setId(taskCompleted.getId());
} }
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或