From b2510718f3b3f9cb8b79d3e3e62909bd9eb04424 Mon Sep 17 00:00:00 2001 From: o2lee Date: Tue, 7 Apr 2020 21:28:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BB=BB=E5=8A=A1=E8=BD=AC?= =?UTF-8?q?=E7=A7=BB=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- o2server/.gitignore | 1 + .../assemble/control/ThisApplication.java | 2 +- .../control/jaxrs/task/ActionMoveToList.java | 191 ++++++++++++++++++ .../task/TaskListNotExistsException.java | 12 ++ 4 files changed, 205 insertions(+), 1 deletion(-) create mode 100644 o2server/.gitignore create mode 100644 o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/task/ActionMoveToList.java create mode 100644 o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/task/TaskListNotExistsException.java diff --git a/o2server/.gitignore b/o2server/.gitignore new file mode 100644 index 0000000000..a1410c3b95 --- /dev/null +++ b/o2server/.gitignore @@ -0,0 +1 @@ +/x_teamwork_assemble_control/src/main/webapp/describe/ diff --git a/o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/ThisApplication.java b/o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/ThisApplication.java index d6249f81bc..8def966f96 100644 --- a/o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/ThisApplication.java +++ b/o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/ThisApplication.java @@ -35,7 +35,7 @@ public class ThisApplication { context.schedule( Timertask_RefreshAllTaskReview.class, "0 0 2 * * ?" ); //每30分钟核对一次所有的工作任务，判断工作任务是否已经超时 - context.schedule( Timertask_CheckAllTaskOverTime.class, "0 0/30 * * * ?" ); + //context.schedule( Timertask_CheckAllTaskOverTime.class, "0 0/30 * * * ?" ); } catch (Exception e) { e.printStackTrace(); diff --git a/o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/task/ActionMoveToList.java b/o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/task/ActionMoveToList.java new file mode 100644 index 0000000000..aaea10a2f5 --- /dev/null +++ b/o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/task/ActionMoveToList.java @@ -0,0 +1,191 @@ +package com.x.teamwork.assemble.control.jaxrs.task; + +import com.x.base.core.entity.JpaObject; +import com.x.base.core.project.annotation.FieldDescribe; +import com.x.base.core.project.bean.WrapCopier; +import com.x.base.core.project.bean.WrapCopierFactory; +import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.http.ActionResult; +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.tools.ListTools; +import com.x.teamwork.assemble.control.service.BatchOperationPersistService; +import com.x.teamwork.assemble.control.service.BatchOperationProcessService; +import com.x.teamwork.core.entity.*; +import org.apache.commons.lang3.StringUtils; + +import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; +import java.util.List; + +/** + * 将指定的任务移动到其他的泳道里 + */ +public class ActionMoveToList extends BaseAction { + + private static Logger logger = LoggerFactory.getLogger(ActionMoveToList.class); + + /** + * 将指定的任务移动到其他的泳道（TaskList）里 + * 1、查询 参数是否合法 + * 2、转移Task的泳道关联 + * 3、调整TaskList和TaskGroup的相关统计数据 + * 4、记录动态信息 + * + * @param request + * @param effectivePerson + * @param sourceTaskId + * @return + * @throws Exception + */ + protected ActionResult execute(HttpServletRequest request, EffectivePerson effectivePerson, String sourceTaskId, String targetListId ) throws Exception { + ActionResult result = new ActionResult<>(); + Wo wo = new Wo(); + Task sourceTask = null; + TaskList targetTaskList = null; + TaskDetail taskDetail = null; + TaskExtField taskExtField = null; + List dynamics = new ArrayList<>(); + Boolean check = true; + + if ( StringUtils.isEmpty( sourceTaskId ) ) { + check = false; + Exception exception = new TaskTransformException("需要复制的工作任务ID不允许为空！"); + result.error( exception ); + } + + if ( StringUtils.isEmpty( targetListId ) ) { + check = false; + Exception exception = new TaskTransformException("需要复制到的目标任务列表ID不允许为空！"); + result.error( exception ); + } + + if( Boolean.TRUE.equals( check ) ){ + try { + sourceTask = taskQueryService.get( sourceTaskId ); + if ( sourceTask == null) { + check = false; + Exception exception = new TaskNotExistsException(sourceTaskId); + result.error( exception ); + } + } catch (Exception e) { + check = false; + Exception exception = new TaskQueryException(e, "根据指定ID查询工作任务信息对象时发生异常。ID:" + sourceTaskId ); + result.error(exception); + logger.error(e, effectivePerson, request, null); + } + } + + if( Boolean.TRUE.equals( check ) ){ + try { + targetTaskList = taskListQueryService.get( targetListId ); + if ( targetTaskList == null) { + check = false; + Exception exception = new TaskListNotExistsException(targetListId); + result.error( exception ); + } + } catch (Exception e) { + check = false; + Exception exception = new TaskQueryException( e, "根据指定ID查询工作任务列表信息对象时发生异常。ID:" + targetListId ); + result.error(exception); + logger.error(e, effectivePerson, request, null); + } + } + + Task newTask = new Task(); + TaskDetail newTaskDetail = new TaskDetail(); + TaskExtField newTaskExtField = new TaskExtField(); + if( Boolean.TRUE.equals( check ) ){ + //COPY对象 + sourceTask.copyTo( newTask ); + taskDetail.copyTo( newTaskDetail ); + taskExtField.copyTo( newTaskExtField ); + + //重新命名 + newTask.setName( sourceTask.getName() + " - 副本"); + + //调整ID + newTask.setId( Task.createId() ); + newTaskDetail.setId( newTask.getId() ); + newTaskExtField.setId( newTask.getId() ); + + try { + newTask = taskPersistService.save( newTask, newTaskDetail, newTaskExtField, effectivePerson ); + wo.setId( newTask.getId() ); + } catch (Exception e) { + check = false; + Exception exception = new TaskPersistException(e, "工作上级任务ID信息更新时发生异常。"); + result.error(exception); + logger.error(e, effectivePerson, request, null); + } + } + + if( Boolean.TRUE.equals( check ) ){ + try { + dynamics = dynamicPersistService.taskCopyDynamic( sourceTask, newTask, effectivePerson ); + } catch (Exception e) { + logger.error(e, effectivePerson, request, null); + } + } + + if( Boolean.TRUE.equals( check ) ){ + try { + new BatchOperationPersistService().addOperation( + BatchOperationProcessService.OPT_OBJ_TASK, + BatchOperationProcessService.OPT_TYPE_PERMISSION, newTask.getId(), newTask.getId(), "刷新文档权限：ID=" + sourceTask.getId() ); + } catch (Exception e) { + logger.error(e, effectivePerson, request, null); + } + } + + if( ListTools.isNotEmpty( dynamics ) ) { + wo.setDynamics( WoDynamic.copier.copy( dynamics ) ); + } + + // 更新缓存 + ApplicationCache.notify( Task.class ); + ApplicationCache.notify( TaskList.class ); + ApplicationCache.notify( TaskView.class ); + ApplicationCache.notify( Review.class ); + ApplicationCache.notify( TaskGroup.class ); + ApplicationCache.notify( Dynamic.class ); + + result.setData( wo ); + return result; + } + + + public static class Wo extends WoId { + + @FieldDescribe("操作引起的动态内容") + List dynamics = new ArrayList<>(); + + public List getDynamics() { + return dynamics; + } + + public void setDynamics(List dynamics) { + this.dynamics = dynamics; + } + + } + + public static class WoDynamic extends Dynamic{ + + private static final long serialVersionUID = -5076990764713538973L; + + public static WrapCopier copier = WrapCopierFactory.wo( Dynamic.class, ActionSave.WoDynamic.class, null, JpaObject.FieldsInvisible); + + private Long rank = 0L; + + public Long getRank() { + return rank; + } + + public void setRank(Long rank) { + this.rank = rank; + } + } +} \ No newline at end of file diff --git a/o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/task/TaskListNotExistsException.java b/o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/task/TaskListNotExistsException.java new file mode 100644 index 0000000000..ed87ca46af --- /dev/null +++ b/o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/task/TaskListNotExistsException.java @@ -0,0 +1,12 @@ +package com.x.teamwork.assemble.control.jaxrs.task; + +import com.x.base.core.project.exception.PromptException; + +class TaskListNotExistsException extends PromptException { + + private static final long serialVersionUID = 1859164370743532895L; + + TaskListNotExistsException(String id ) { + super("指定ID的工作任务列表信息不存在。ID:" + id ); + } +} -- GitLab