update

mec-workflow/src/main/java/com/ym/mec/workfow/controller/flow/ProcessController.java

@@ -16,27 +16,19 @@ package com.ym.mec.workfow.controller.flow;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
 import org.snaker.engine.SnakerEngine;
 import org.snaker.engine.access.Page;
 import org.snaker.engine.access.QueryFilter;
-import org.snaker.engine.entity.HistoryTask;
 import org.snaker.engine.entity.Process;
-import org.snaker.engine.entity.Task;
-import org.snaker.engine.helper.AssertHelper;
 import org.snaker.engine.helper.StringHelper;
-import org.snaker.engine.model.ProcessModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 

mec-workflow/src/main/java/com/ym/mec/workfow/controller/flow/TaskController.java

@@ -9,7 +9,6 @@ import org.apache.commons.lang.StringUtils;
 import org.snaker.engine.SnakerEngine;
 import org.snaker.engine.access.Page;
 import org.snaker.engine.access.QueryFilter;
-import org.snaker.engine.core.AccessService;
 import org.snaker.engine.entity.HistoryOrder;
 import org.snaker.engine.entity.Task;
 import org.snaker.engine.entity.WorkItem;
@@ -40,7 +39,7 @@ public class TaskController extends BaseController {
 	@Autowired
 	private SysUserFeignService SysUserFeignService;
 
-	@GetMapping(value = "home")
+	@GetMapping(value = "queryWaitList")
 	public Object homeTaskList() {
 
 		SysUser user = SysUserFeignService.queryUserInfo();
@@ -71,19 +70,6 @@ public class TaskController extends BaseController {
 		return succeed(model);
 	}
 
-	/**
-	 * 根据当前用户查询待办任务列表
-	 * @param model
-	 * @return
-	 */
-	@GetMapping(value = "queryWaitList")
-	public Object queryWaitList(Page<WorkItem> page) {
-		SysUser user = SysUserFeignService.queryUserInfo();
-
-		snakerEngine.query().getWorkItems(page, new QueryFilter().setOperator(user.getUsername()));
-		return succeed(page);
-	}
-
 	@PostMapping(value = "actor/add")
 	public Object addTaskActor(String orderId, String taskName, String operator) {
 		List<Task> tasks = snakerEngine.query().getActiveTasks(new QueryFilter().setOrderId(orderId));
@@ -119,42 +105,6 @@ public class TaskController extends BaseController {
 	}
 
 	/**
-	 * 活动任务查询列表
-	 * @param model
-	 * @return
-	 */
-	@GetMapping(value = "active/more")
-	public Object activeTaskList(Page<WorkItem> page, Integer taskType) {
-		SysUser user = SysUserFeignService.queryUserInfo();
-
-		List<String> list = new ArrayList<String>();
-		list.add(user.getUsername());
-
-		String[] assignees = new String[list.size()];
-		list.toArray(assignees);
-		snakerEngine.query().getWorkItems(page, new QueryFilter().setOperators(assignees).setTaskType(taskType));
-		return succeed(page);
-	}
-
-	/**
-	 * 活动任务查询列表
-	 * @param model
-	 * @return
-	 */
-	@GetMapping(value = "active/ccmore")
-	public Object activeCCList(Page<HistoryOrder> page) {
-		SysUser user = SysUserFeignService.queryUserInfo();
-
-		List<String> list = new ArrayList<String>();
-		list.add(user.getUsername());
-
-		String[] assignees = new String[list.size()];
-		list.toArray(assignees);
-		snakerEngine.query().getCCWorks(page, new QueryFilter().setOperators(assignees).setState(AccessService.STATE_ACTIVE));
-		return succeed(page);
-	}
-
-	/**
 	 * 活动任务的驳回
 	 * @param model
 	 * @param taskId

mec-workflow/src/main/resources/flows/leave.snaker

@@ -4,17 +4,17 @@
 <transition g="" name="transition1" offset="0,0" to="apply"/>
 </start>
 <end displayName="end1" layout="570,124,-1,-1" name="end1"/>
-<task assignee="${applyer}" displayName="请假申请" layout="117,122,-1,-1" name="apply" performType="ANY">
+<task assignee="applyer" displayName="请假申请" layout="117,122,-1,-1" name="apply" performType="ANY">
 <transition g="" name="transition2" offset="0,0" to="approveDept"/>
 </task>
-<task assignee="${deptManager}" displayName="部门经理审批" layout="272,122,-1,-1" name="approveDept" performType="ANY">
+<task assignee="deptManager" displayName="部门经理审批" layout="272,122,-1,-1" name="approveDept" performType="ANY">
 <transition g="" name="transition3" offset="0,0" to="decision1"/>
 </task>
 <decision displayName="decision1" layout="426,124,-1,-1" name="decision1">
-<transition displayName="&lt;=5天" expr="${days &lt;= 5}" g="" name="transition4" offset="0,0" to="end1"/>
-<transition displayName="&gt;5天" expr="${days &gt; 5}" g="" name="transition5" offset="0,0" to="approveBoss"/>
+<transition displayName="&lt;=5天" expr="#days &lt;= 5" g="" name="transition4" offset="0,0" to="end1"/>
+<transition displayName="&gt;5天" expr="#days &gt; 5" g="" name="transition5" offset="0,0" to="approveBoss"/>
 </decision>
-<task assignee="${boss}" displayName="总经理审批" layout="404,231,-1,-1" name="approveBoss" performType="ANY">
+<task assignee="boss" displayName="总经理审批" layout="404,231,-1,-1" name="approveBoss" performType="ANY">
 <transition g="" name="transition6" offset="0,0" to="end1"/>
 </task>
 </process>

mec-workflow/src/main/resources/flows/viprefund.snaker

@@ -4,13 +4,13 @@
 <transition g="" name="transition1" offset="0,0" to="apply"/>
 </start>
 <end displayName="end1" layout="785,160,-1,-1" name="end1"/>
-<task assignee="${student}" autoExecute="Y" displayName="学生申请" layout="280,158,-1,-1" name="apply" performType="ANY" taskType="Major">
+<task assignee="student" autoExecute="Y" displayName="学生申请" layout="280,158,-1,-1" name="apply" performType="ANY" taskType="Major">
 <transition g="" name="transition2" offset="0,0" to="task1"/>
 </task>
-<task assignee="${eduTeacher}" autoExecute="Y" displayName="教务老师审批" layout="425,157,-1,-1" name="task1" performType="ANY" taskType="Major">
+<task assignee="eduTeacher" autoExecute="Y" displayName="教务老师审批" layout="425,157,-1,-1" name="task1" performType="ANY" taskType="Major">
 <transition g="" name="transition3" offset="0,0" to="task2"/>
 </task>
-<task assignee="${deptManager}" autoExecute="Y" displayName="分部经理审批" layout="598,158,-1,-1" name="task2" performType="ANY" taskType="Major">
+<task assignee="deptManager" autoExecute="Y" displayName="分部经理审批" layout="598,158,-1,-1" name="task2" performType="ANY" taskType="Major">
 <transition g="" name="transition4" offset="0,0" to="end1"/>
 </task>
 </process>

workflowy/src/main/java/org/snaker/engine/model/NodeModel.java

@@ -26,6 +26,8 @@ import org.snaker.engine.core.Execution;
 import org.snaker.engine.helper.ClassHelper;
 import org.snaker.engine.helper.StringHelper;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
 /**
  * 节点元素（存在输入输出的变迁）
  * @author yuqs
@@ -40,10 +42,12 @@ public abstract class NodeModel extends BaseModel implements Action {
 	/**
 	 * 输入变迁集合
 	 */
+	@JsonIgnore
 	private List<TransitionModel> inputs = new ArrayList<TransitionModel>();
 	/**
 	 * 输出变迁集合
 	 */
+	@JsonIgnore
 	private List<TransitionModel> outputs = new ArrayList<TransitionModel>();
 	/**
 	 * layout
@@ -137,6 +141,7 @@ public abstract class NodeModel extends BaseModel implements Action {
 		return result;
 	}
 
+	@JsonIgnore
     public <T> List<T> getNextModels(Class<T> clazz) {
         List<T> models = new ArrayList<T>();
         for(TransitionModel tm : this.getOutputs()) {