diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/WorkContext.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/WorkContext.java index 8d7b61b0085a346c3d7c90f17053d863a1ff80b5..76a41fcfb0ec0dbe355d6e50457e89ba2e35b44e 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/WorkContext.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/WorkContext.java @@ -38,6 +38,14 @@ public class WorkContext { private Task task; 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 { this.aeiObjects = aeiObjects; this.business = aeiObjects.business(); diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionProcessing.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionProcessing.java index c0199c77a7557f478aeb382e5c97138f762fa357..52e240a910fcb76fb6e34d382d62b91983f0f456 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionProcessing.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionProcessing.java @@ -7,6 +7,9 @@ import java.util.concurrent.Callable; import javax.script.CompiledScript; import javax.script.ScriptContext; +import org.apache.commons.lang3.BooleanUtils; +import org.apache.commons.lang3.StringUtils; + import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -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.logger.Logger; 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.processplatform.core.entity.content.Task; import com.x.processplatform.core.entity.content.TaskCompleted; @@ -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.service.processing.Business; 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.configurator.ProcessingConfigurator; import com.x.processplatform.service.processing.processor.AeiObjects; -import org.apache.commons.lang3.BooleanUtils; -import org.apache.commons.lang3.StringUtils; - class ActionProcessing extends BaseAction { @ActionLogger @@ -58,112 +60,6 @@ class ActionProcessing extends BaseAction { job = task.getJob(); } - // Callable> callable = new Callable>() { - // public ActionResult call() throws Exception { - // ActionResult 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(); } @@ -189,6 +85,8 @@ class ActionProcessing extends BaseAction { AeiObjects aeiObjects = new AeiObjects(business, work, manual, new ProcessingConfigurator(), new ProcessingAttributes()); ScriptContext scriptContext = aeiObjects.scriptContext(); + ((WorkContext) scriptContext.getAttribute(ScriptFactory.BINDING_NAME_WORKCONTEXT)) + .bindTask(task); WorkDataHelper workDataHelper = new WorkDataHelper(business.entityManagerContainer(), work); CompiledScript cs = null; cs = business.element().getCompiledScript(task.getApplication(), manual, @@ -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)) { Manual manual = business.element().get(task.getActivity(), Manual.class); if ((null != manual) && (StringUtils.isNotEmpty(manual.getManualAfterTaskScript()) @@ -211,6 +110,8 @@ class ActionProcessing extends BaseAction { AeiObjects aeiObjects = new AeiObjects(business, work, manual, new ProcessingConfigurator(), new ProcessingAttributes()); ScriptContext scriptContext = aeiObjects.scriptContext(); + ((WorkContext) scriptContext.getAttribute(ScriptFactory.BINDING_NAME_WORKCONTEXT)) + .bindTaskCompleted(taskCompleted); CompiledScript cs = null; cs = business.element().getCompiledScript(task.getApplication(), manual, Business.EVENT_MANUALAFTERTASK); @@ -263,7 +164,7 @@ class ActionProcessing extends BaseAction { emc.remove(task, CheckRemoveType.all); emc.commit(); /* 待办执行后脚本,不能修改数据. */ - callManualAfterTaskScript(business, task); + callManualAfterTaskScript(business, task, taskCompleted); MessageFactory.task_to_taskCompleted(taskCompleted); wo.setId(taskCompleted.getId()); }