no commit message

JeeSpringCloud/src/main/java/com/jeespring/modules/act/ActConfig.java

+package com.jeespring.modules.act;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.ImportResource;
+
+@Configuration
+@ImportResource(locations= {"classpath:spring-context-activiti.xml"})
+public class ActConfig{
+}
+

JeeSpringCloud/src/main/java/com/jeespring/modules/act/dao/ActDao.java

+/**
+ * Copyright &copy; 2012-2016 <a href="https://github.com/thinkgem/jeesite">JeeSite</a> All rights reserved.
+ */
+package com.jeespring.modules.act.dao;
+
+import com.jeespring.common.persistence.InterfaceBaseDao;
+import com.jeespring.common.persistence.annotation.MyBatisDao;
+import com.jeespring.modules.act.entity.Act;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 审批DAO接口
+ * @author thinkgem
+ * @version 2014-05-16
+ */
+@Mapper
+public interface ActDao extends InterfaceBaseDao<Act> {
+
+	public int updateProcInsIdByBusinessId(Act act);
+	
+}

JeeSpringCloud/src/main/java/com/jeespring/modules/act/entity/Act.java

+/**
+ * Copyright &copy; 2012-2016 <a href="https://github.com/thinkgem/jeesite">JeeSite</a> All rights reserved.
+ */
+package com.jeespring.modules.act.entity;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import org.activiti.engine.history.HistoricActivityInstance;
+import org.activiti.engine.history.HistoricTaskInstance;
+import org.activiti.engine.repository.ProcessDefinition;
+import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.engine.task.Task;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.jeespring.common.persistence.AbstractBaseEntity;
+import com.jeespring.common.utils.StringUtils;
+import com.jeespring.common.utils.TimeUtils;
+import com.jeespring.modules.act.utils.Variable;
+
+/**
+ * 工作流Entity
+ * @author ThinkGem
+ * @version 2013-11-03
+ */
+public class Act extends AbstractBaseEntity<Act> {
+	
+	private static final long serialVersionUID = 1L;
+
+	private String taskId; 		// 任务编号
+	private String taskName; 	// 任务名称
+	private String taskDefKey; 	// 任务定义Key（任务环节标识）
+
+	private String procInsId; 	// 流程实例ID
+	private String procDefId; 	// 流程定义ID
+	private String procDefKey; 	// 流程定义Key（流程定义标识）
+
+	private String businessTable;	// 业务绑定Table
+	private String businessId;		// 业务绑定ID
+	
+	private String title; 		// 任务标题
+
+	private String status; 		// 任务状态（todo/claim/finish）
+
+//	private String procExecUrl; 	// 流程执行（办理）RUL
+	private String comment; 	// 任务意见
+	private String flag; 		// 意见状态
+	
+	private Task task; 			// 任务对象
+	private ProcessDefinition procDef; 	// 流程定义对象
+	private ProcessInstance procIns;	// 流程实例对象
+	private HistoricTaskInstance histTask; // 历史任务
+	private HistoricActivityInstance histIns;	//历史活动任务
+
+	private String assignee; // 任务执行人编号
+	private String assigneeName; // 任务执行人名称
+
+	private Variable vars; 		// 流程变量
+//	private Variable taskVars; 	// 流程任务变量
+	
+	private Date beginDate;	// 开始查询日期
+	private Date endDate;	// 结束查询日期
+
+	private List<Act> list; // 任务列表
+
+	public Act() {
+		super();
+	}
+
+	public String getTaskId() {
+		if (taskId == null && task != null){
+			taskId = task.getId();
+		}
+		return taskId;
+	}
+
+	public void setTaskId(String taskId) {
+		this.taskId = taskId;
+	}
+
+	public String getTaskName() {
+		if (taskName == null && task != null){
+			taskName = task.getName();
+		}
+		return taskName;
+	}
+
+	public void setTaskName(String taskName) {
+		this.taskName = taskName;
+	}
+
+	public String getTaskDefKey() {
+		if (taskDefKey == null && task != null){
+			taskDefKey = task.getTaskDefinitionKey();
+		}
+		return taskDefKey;
+	}
+
+	public void setTaskDefKey(String taskDefKey) {
+		this.taskDefKey = taskDefKey;
+	}
+	
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	public Date getTaskCreateDate() {
+		if (task != null){
+			return task.getCreateTime();
+		}
+		return null;
+	}
+	
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	public Date getTaskEndDate() {
+		if (histTask != null){
+			return histTask.getEndTime();
+		}
+		return null;
+	}
+	
+	@JsonIgnore
+	public Task getTask() {
+		return task;
+	}
+
+	public void setTask(Task task) {
+		this.task = task;
+	}
+
+	@JsonIgnore
+	public ProcessDefinition getProcDef() {
+		return procDef;
+	}
+
+	public void setProcDef(ProcessDefinition procDef) {
+		this.procDef = procDef;
+	}
+	
+	public String getProcDefName() {
+		return procDef.getName();
+	}
+
+	@JsonIgnore
+	public ProcessInstance getProcIns() {
+		return procIns;
+	}
+
+	public void setProcIns(ProcessInstance procIns) {
+		this.procIns = procIns;
+		if (procIns != null && procIns.getBusinessKey() != null){
+			String[] ss = procIns.getBusinessKey().split(":");
+			setBusinessTable(ss[0]);
+			setBusinessId(ss[1]);
+		}
+	}
+
+//	public String getProcExecUrl() {
+//		return procExecUrl;
+//	}
+//
+//	public void setProcExecUrl(String procExecUrl) {
+//		this.procExecUrl = procExecUrl;
+//	}
+
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+	
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	@JsonIgnore
+	public HistoricTaskInstance getHistTask() {
+		return histTask;
+	}
+
+	public void setHistTask(HistoricTaskInstance histTask) {
+		this.histTask = histTask;
+	}
+
+	@JsonIgnore
+	public HistoricActivityInstance getHistIns() {
+		return histIns;
+	}
+
+	public void setHistIns(HistoricActivityInstance histIns) {
+		this.histIns = histIns;
+	}
+
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	public Date getBeginDate() {
+		return beginDate;
+	}
+
+	public void setBeginDate(Date beginDate) {
+		this.beginDate = beginDate;
+	}
+
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	public Date getEndDate() {
+		return endDate;
+	}
+
+	public void setEndDate(Date endDate) {
+		this.endDate = endDate;
+	}
+
+	public String getComment() {
+		return comment;
+	}
+
+	public void setComment(String comment) {
+		this.comment = comment;
+	}
+
+	public String getFlag() {
+		return flag;
+	}
+
+	public void setFlag(String flag) {
+		this.flag = flag;
+	}
+
+	public String getProcDefId() {
+		if (procDefId == null && task != null){
+			procDefId = task.getProcessDefinitionId();
+		}
+		return procDefId;
+	}
+
+	public void setProcDefId(String procDefId) {
+		this.procDefId = procDefId;
+	}
+
+	public String getProcInsId() {
+		if (procInsId == null && task != null){
+			procInsId = task.getProcessInstanceId();
+		}
+		return procInsId;
+	}
+
+	public void setProcInsId(String procInsId) {
+		this.procInsId = procInsId;
+	}
+
+	public String getBusinessId() {
+		return businessId;
+	}
+
+	public void setBusinessId(String businessId) {
+		this.businessId = businessId;
+	}
+
+	public String getBusinessTable() {
+		return businessTable;
+	}
+
+	public void setBusinessTable(String businessTable) {
+		this.businessTable = businessTable;
+	}
+
+	public String getAssigneeName() {
+		return assigneeName;
+	}
+
+	public void setAssigneeName(String assigneeName) {
+		this.assigneeName = assigneeName;
+	}
+
+	public String getAssignee() {
+		if (assignee == null && task != null){
+			assignee = task.getAssignee();
+		}
+		return assignee;
+	}
+
+	public void setAssignee(String assignee) {
+		this.assignee = assignee;
+	}
+
+	public List<Act> getList() {
+		return list;
+	}
+
+	public void setList(List<Act> list) {
+		this.list = list;
+	}
+
+	public Variable getVars() {
+		return vars;
+	}
+
+	public void setVars(Variable vars) {
+		this.vars = vars;
+	}
+	
+	/**
+	 * 通过Map设置流程变量值
+	 * @param map
+	 */
+	public void setVars(Map<String, Object> map) {
+		this.vars = new Variable(map);
+	}
+
+//	public Variable getTaskVars() {
+//		return taskVars;
+//	}
+//
+//	public void setTaskVars(Variable taskVars) {
+//		this.taskVars = taskVars;
+//	}
+//
+//	/**
+//	 * 通过Map设置流程任务变量值
+//	 * @param map
+//	 */
+//	public void setTaskVars(Map<String, Object> map) {
+//		this.taskVars = new Variable(map);
+//	}
+
+	/**
+	 * 获取流程定义KEY
+	 * @return
+	 */
+	public String getProcDefKey() {
+		if (StringUtils.isBlank(procDefKey) && StringUtils.isNotBlank(procDefId)){
+			procDefKey = StringUtils.split(procDefId, ":")[0];
+		}
+		return procDefKey;
+	}
+
+	public void setProcDefKey(String procDefKey) {
+		this.procDefKey = procDefKey;
+	}
+	
+	/**
+	 * 获取过去的任务历时
+	 * @return
+	 */
+	public String getDurationTime(){
+		if (histIns!=null && histIns.getDurationInMillis() != null){
+			return TimeUtils.toTimeString(histIns.getDurationInMillis());
+		}
+		return "";
+	}
+	
+	/**
+	 * 是否是一个待办任务
+	 * @return
+	 */
+	public boolean isTodoTask(){
+		return "todo".equals(status) || "claim".equals(status);
+	}
+	
+	/**
+	 * 是否是已完成任务
+	 * @return
+	 */
+	public boolean isFinishTask(){
+		return "finish".equals(status) || StringUtils.isBlank(taskId);
+	}
+
+	@Override
+	public void preInsert() {
+		
+	}
+
+	@Override
+	public void preUpdate() {
+		
+	}
+
+}
+
+

JeeSpringCloud/src/main/java/com/jeespring/modules/act/rest/diagram/services/ProcessDefinitionDiagramLayoutResource.java

+/* Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.jeespring.modules.act.rest.diagram.services;
+
+import org.apache.shiro.authz.annotation.RequiresUser;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+@RestController
+public class ProcessDefinitionDiagramLayoutResource extends BaseProcessDefinitionDiagramLayoutResource {
+	
+	@RequiresUser
+	@RequestMapping(value = "/act/service/process-definition/{processDefinitionId}/diagram-layout", method = RequestMethod.GET, produces = "application/json")
+	public ObjectNode getDiagram(@PathVariable String processDefinitionId) {
+		return getDiagramNode(null, processDefinitionId);
+	}
+	
+}

JeeSpringCloud/src/main/java/com/jeespring/modules/act/rest/diagram/services/ProcessInstanceDiagramLayoutResource.java

+/* Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.jeespring.modules.act.rest.diagram.services;
+
+import org.apache.shiro.authz.annotation.RequiresUser;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+@RestController
+public class ProcessInstanceDiagramLayoutResource extends BaseProcessDefinitionDiagramLayoutResource {
+
+	@RequiresUser
+	@RequestMapping(value = "/act/service/process-instance/{processInstanceId}/diagram-layout", method = RequestMethod.GET, produces = "application/json")
+	public ObjectNode getDiagram(@PathVariable String processInstanceId) {
+		return getDiagramNode(processInstanceId, null);
+	}
+	
+}

JeeSpringCloud/src/main/java/com/jeespring/modules/act/rest/diagram/services/ProcessInstanceHighlightsResource.java

+/* Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.jeespring.modules.act.rest.diagram.services;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.activiti.engine.HistoryService;
+import org.activiti.engine.RepositoryService;
+import org.activiti.engine.RuntimeService;
+import org.activiti.engine.history.HistoricActivityInstance;
+import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity;
+import org.activiti.engine.impl.pvm.PvmTransition;
+import org.activiti.engine.impl.pvm.process.ActivityImpl;
+import org.activiti.engine.runtime.ProcessInstance;
+import org.apache.shiro.authz.annotation.RequiresUser;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+@RestController
+public class ProcessInstanceHighlightsResource {
+
+	@Autowired
+	private RuntimeService runtimeService;
+
+	@Autowired
+	private RepositoryService repositoryService;
+
+	@Autowired
+	private HistoryService historyService;
+
+	protected ObjectMapper objectMapper = new ObjectMapper();
+
+	@RequiresUser
+	@RequestMapping(value = "/act/service/process-instance/{processInstanceId}/highlights", method = RequestMethod.GET, produces = "application/json")
+	public ObjectNode getHighlighted(@PathVariable String processInstanceId) {
+
+		ObjectNode responseJSON = objectMapper.createObjectNode();
+
+		responseJSON.put("processInstanceId", processInstanceId);
+
+		ArrayNode activitiesArray = objectMapper.createArrayNode();
+		ArrayNode flowsArray = objectMapper.createArrayNode();
+
+		try {
+			ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
+			ProcessDefinitionEntity processDefinition = (ProcessDefinitionEntity) repositoryService.getProcessDefinition(processInstance
+					.getProcessDefinitionId());
+
+			responseJSON.put("processDefinitionId", processInstance.getProcessDefinitionId());
+
+			List<String> highLightedActivities = runtimeService.getActiveActivityIds(processInstanceId);
+			List<String> highLightedFlows = getHighLightedFlows(processDefinition, processInstanceId);
+
+			for (String activityId : highLightedActivities) {
+				activitiesArray.add(activityId);
+			}
+
+			for (String flow : highLightedFlows) {
+				flowsArray.add(flow);
+			}
+
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		responseJSON.put("activities", activitiesArray);
+		responseJSON.put("flows", flowsArray);
+
+		return responseJSON;
+	}
+
+	/**
+	 * getHighLightedFlows
+	 * 
+	 * @param processDefinition
+	 * @param processInstanceId
+	 * @return
+	 */
+	private List<String> getHighLightedFlows(ProcessDefinitionEntity processDefinition, String processInstanceId) {
+
+		List<String> highLightedFlows = new ArrayList<String>();
+
+		List<HistoricActivityInstance> historicActivityInstances = historyService.createHistoricActivityInstanceQuery()
+				.processInstanceId(processInstanceId)
+				//order by startime asc is not correct. use default order is correct.
+				//.orderByHistoricActivityInstanceStartTime().asc()/*.orderByActivityId().asc()*/
+				.list();
+
+		LinkedList<HistoricActivityInstance> hisActInstList = new LinkedList<HistoricActivityInstance>();
+		hisActInstList.addAll(historicActivityInstances);
+
+		getHighlightedFlows(processDefinition.getActivities(), hisActInstList, highLightedFlows);
+
+		return highLightedFlows;
+	}
+
+	/**
+	 * getHighlightedFlows
+	 * 
+	 * code logic: 1. Loop all activities by id asc order; 2. Check each activity's outgoing transitions and eventBoundery outgoing transitions, if
+	 * outgoing transitions's destination.id is in other executed activityIds, add this transition to highLightedFlows List; 3. But if activity is not
+	 * a parallelGateway or inclusiveGateway, only choose the earliest flow.
+	 * 
+	 * @param activityList
+	 * @param hisActInstList
+	 * @param highLightedFlows
+	 */
+	private void getHighlightedFlows(List<ActivityImpl> activityList, LinkedList<HistoricActivityInstance> hisActInstList,
+			List<String> highLightedFlows) {
+
+		//check out startEvents in activityList
+		List<ActivityImpl> startEventActList = new ArrayList<ActivityImpl>();
+		Map<String, ActivityImpl> activityMap = new HashMap<String, ActivityImpl>(activityList.size());
+		for (ActivityImpl activity : activityList) {
+
+			activityMap.put(activity.getId(), activity);
+
+			String actType = (String) activity.getProperty("type");
+			if (actType != null && actType.toLowerCase().indexOf("startevent") >= 0) {
+				startEventActList.add(activity);
+			}
+		}
+
+		//These codes is used to avoid a bug: 
+		//ACT-1728 If the process instance was started by a callActivity, it will be not have the startEvent activity in ACT_HI_ACTINST table 
+		//Code logic:
+		//Check the first activity if it is a startEvent, if not check out the startEvent's highlight outgoing flow.
+		HistoricActivityInstance firstHistActInst = hisActInstList.getFirst();
+		String firstActType = (String) firstHistActInst.getActivityType();
+		if (firstActType != null && firstActType.toLowerCase().indexOf("startevent") < 0) {
+			PvmTransition startTrans = getStartTransaction(startEventActList, firstHistActInst);
+			if (startTrans != null) {
+				highLightedFlows.add(startTrans.getId());
+			}
+		}
+
+		while (!hisActInstList.isEmpty()) {
+			HistoricActivityInstance histActInst = hisActInstList.removeFirst();
+			ActivityImpl activity = activityMap.get(histActInst.getActivityId());
+			if (activity != null) {
+				boolean isParallel = false;
+				String type = histActInst.getActivityType();
+				if ("parallelGateway".equals(type) || "inclusiveGateway".equals(type)) {
+					isParallel = true;
+				} else if ("subProcess".equals(histActInst.getActivityType())) {
+					getHighlightedFlows(activity.getActivities(), hisActInstList, highLightedFlows);
+				}
+
+				List<PvmTransition> allOutgoingTrans = new ArrayList<PvmTransition>();
+				allOutgoingTrans.addAll(activity.getOutgoingTransitions());
+				allOutgoingTrans.addAll(getBoundaryEventOutgoingTransitions(activity));
+				List<String> activityHighLightedFlowIds = getHighlightedFlows(allOutgoingTrans, hisActInstList, isParallel);
+				highLightedFlows.addAll(activityHighLightedFlowIds);
+			}
+		}
+	}
+
+	/**
+	 * Check out the outgoing transition connected to firstActInst from startEventActList
+	 * 
+	 * @param startEventActList
+	 * @param firstActInst
+	 * @return
+	 */
+	private PvmTransition getStartTransaction(List<ActivityImpl> startEventActList, HistoricActivityInstance firstActInst) {
+		for (ActivityImpl startEventAct : startEventActList) {
+			for (PvmTransition trans : startEventAct.getOutgoingTransitions()) {
+				if (trans.getDestination().getId().equals(firstActInst.getActivityId())) {
+					return trans;
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * getBoundaryEventOutgoingTransitions
+	 * 
+	 * @param activity
+	 * @return
+	 */
+	private List<PvmTransition> getBoundaryEventOutgoingTransitions(ActivityImpl activity) {
+		List<PvmTransition> boundaryTrans = new ArrayList<PvmTransition>();
+		for (ActivityImpl subActivity : activity.getActivities()) {
+			String type = (String) subActivity.getProperty("type");
+			if (type != null && type.toLowerCase().indexOf("boundary") >= 0) {
+				boundaryTrans.addAll(subActivity.getOutgoingTransitions());
+			}
+		}
+		return boundaryTrans;
+	}
+
+	/**
+	 * find out single activity's highlighted flowIds
+	 * 
+	 * @param activity
+	 * @param hisActInstList
+	 * @param isExclusive if true only return one flowId(Such as exclusiveGateway, BoundaryEvent On Task)
+	 * @return
+	 */
+	private List<String> getHighlightedFlows(List<PvmTransition> pvmTransitionList, LinkedList<HistoricActivityInstance> hisActInstList,
+			boolean isParallel) {
+
+		List<String> highLightedFlowIds = new ArrayList<String>();
+
+		PvmTransition earliestTrans = null;
+		HistoricActivityInstance earliestHisActInst = null;
+
+		for (PvmTransition pvmTransition : pvmTransitionList) {
+
+			String destActId = pvmTransition.getDestination().getId();
+			HistoricActivityInstance destHisActInst = findHisActInst(hisActInstList, destActId);
+			if (destHisActInst != null) {
+				if (isParallel) {
+					highLightedFlowIds.add(pvmTransition.getId());
+				} else if (earliestHisActInst == null || (earliestHisActInst.getId().compareTo(destHisActInst.getId()) > 0)) {
+					earliestTrans = pvmTransition;
+					earliestHisActInst = destHisActInst;
+				}
+			}
+		}
+
+		if ((!isParallel) && earliestTrans != null) {
+			highLightedFlowIds.add(earliestTrans.getId());
+		}
+
+		return highLightedFlowIds;
+	}
+
+	private HistoricActivityInstance findHisActInst(LinkedList<HistoricActivityInstance> hisActInstList, String actId) {
+		for (HistoricActivityInstance hisActInst : hisActInstList) {
+			if (hisActInst.getActivityId().equals(actId)) {
+				return hisActInst;
+			}
+		}
+		return null;
+	}
+}

JeeSpringCloud/src/main/java/com/jeespring/modules/act/rest/editor/main/StencilsetRestResource.java

+/* Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.jeespring.modules.act.rest.editor.main;
+
+import java.io.InputStream;
+
+import org.activiti.engine.ActivitiException;
+import org.apache.commons.io.IOUtils;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author Tijs Rademakers
+ */
+@RestController
+public class StencilsetRestResource {
+	
+	@RequestMapping(value = "/act/service/editor/stencilset", method = RequestMethod.GET, produces = "application/json;charset=utf-8")
+	public @ResponseBody String getStencilset() {
+		InputStream stencilsetStream = this.getClass().getClassLoader().getResourceAsStream("stencilset.json");
+		try {
+			return IOUtils.toString(stencilsetStream, "utf-8");
+		} catch (Exception e) {
+			throw new ActivitiException("Error while loading stencil set", e);
+		}
+	}
+}

JeeSpringCloud/src/main/java/com/jeespring/modules/act/rest/editor/model/ModelEditorJsonRestResource.java

+/* Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.jeespring.modules.act.rest.editor.model;
+
+import org.activiti.editor.constants.ModelDataJsonConstants;
+import org.activiti.engine.ActivitiException;
+import org.activiti.engine.RepositoryService;
+import org.activiti.engine.repository.Model;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+/**
+ * @author Tijs Rademakers
+ */
+@RestController
+public class ModelEditorJsonRestResource implements ModelDataJsonConstants {
+
+	protected static final Logger LOGGER = LoggerFactory.getLogger(ModelEditorJsonRestResource.class);
+
+	@Autowired
+	private RepositoryService repositoryService;
+
+//	@Autowired
+//	private ObjectMapper objectMapper;
+	protected ObjectMapper objectMapper = new ObjectMapper();
+
+	@RequiresPermissions("act:model:edit")
+	@RequestMapping(value = "/act/service/model/{modelId}/json", method = RequestMethod.GET, produces = "application/json")
+	public ObjectNode getEditorJson(@PathVariable String modelId) {
+		ObjectNode modelNode = null;
+
+		Model model = repositoryService.getModel(modelId);
+
+		if (model != null) {
+			try {
+				if (StringUtils.isNotEmpty(model.getMetaInfo())) {
+					modelNode = (ObjectNode) objectMapper.readTree(model.getMetaInfo());
+				} else {
+					modelNode = objectMapper.createObjectNode();
+					modelNode.put(MODEL_NAME, model.getName());
+				}
+				modelNode.put(MODEL_ID, model.getId());
+				ObjectNode editorJsonNode = (ObjectNode) objectMapper.readTree(new String(repositoryService.getModelEditorSource(model.getId()),
+						"utf-8"));
+				modelNode.put("model", editorJsonNode);
+
+			} catch (Exception e) {
+				LOGGER.error("Error creating model JSON", e);
+				throw new ActivitiException("Error creating model JSON", e);
+			}
+		}
+		return modelNode;
+	}
+}

JeeSpringCloud/src/main/java/com/jeespring/modules/act/rest/editor/model/ModelSaveRestResource.java

+/* Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.jeespring.modules.act.rest.editor.model;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+
+import org.activiti.editor.constants.ModelDataJsonConstants;
+import org.activiti.engine.ActivitiException;
+import org.activiti.engine.RepositoryService;
+import org.activiti.engine.repository.Model;
+import org.apache.batik.transcoder.TranscoderInput;
+import org.apache.batik.transcoder.TranscoderOutput;
+import org.apache.batik.transcoder.image.PNGTranscoder;
+import org.apache.log4j.Logger;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.bind.annotation.*;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @author Tijs Rademakers
+ */
+@RestController
+public class ModelSaveRestResource implements ModelDataJsonConstants {
+
+	protected static final Logger LOGGER = Logger.getLogger(ModelSaveRestResource.class);
+
+	@Autowired
+	private RepositoryService repositoryService;
+
+	//	@Autowired
+	//	private ObjectMapper objectMapper;
+	protected ObjectMapper objectMapper = new ObjectMapper();
+
+	@RequiresPermissions("act:model:edit")
+	@RequestMapping(value = "/act/service/model/{modelId}/save",method ={RequestMethod.POST,RequestMethod.GET,RequestMethod.PUT})
+	@ResponseStatus(value = HttpStatus.OK)
+	// @RequestBody MultiValueMap<String, String> values,MultiValueMap<String, String> valuesa
+	public void saveModel(@PathVariable String modelId, HttpServletRequest request, HttpServletResponse response) {
+		try {
+			MultiValueMap<String, String> values=new LinkedMultiValueMap<>();;
+			Model model = repositoryService.getModel(modelId);
+			String name="",description="",json_xml="",svg_xml="";
+			values.add("name",request.getParameter("name"));
+			values.add("description",request.getParameter("description"));
+			values.add("json_xml",request.getParameter("json_xml"));
+			values.add("svg_xml",request.getParameter("svg_xml"));
+			ObjectNode modelJson = (ObjectNode) objectMapper.readTree(model.getMetaInfo());
+
+			modelJson.put(MODEL_NAME, values.getFirst("name"));
+			modelJson.put(MODEL_DESCRIPTION, values.getFirst("description"));
+			model.setMetaInfo(modelJson.toString());
+			model.setName(values.getFirst("name"));
+
+			repositoryService.saveModel(model);
+
+			repositoryService.addModelEditorSource(model.getId(), values.getFirst("json_xml").getBytes("utf-8"));
+
+			InputStream svgStream = new ByteArrayInputStream(values.getFirst("svg_xml").getBytes("utf-8"));
+			TranscoderInput input = new TranscoderInput(svgStream);
+
+			PNGTranscoder transcoder = new PNGTranscoder();
+			// Setup output
+			ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+			TranscoderOutput output = new TranscoderOutput(outStream);
+
+			// Do the transformation
+			transcoder.transcode(input, output);
+			final byte[] result = outStream.toByteArray();
+			repositoryService.addModelEditorSourceExtra(model.getId(), result);
+			outStream.close();
+
+		} catch (Exception e) {
+			LOGGER.error("Error saving model", e);
+			throw new ActivitiException("Error saving model", e);
+		}
+	}
+}

JeeSpringCloud/src/main/java/com/jeespring/modules/act/rest/servlet/FilterServletOutputStream.java

+package com.jeespring.modules.act.rest.servlet;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.WriteListener;
+
+public class FilterServletOutputStream extends ServletOutputStream {
+
+	private DataOutputStream stream;
+
+	public FilterServletOutputStream(OutputStream output) {
+		stream = new DataOutputStream(output);
+	}
+
+	public void write(int b) throws IOException {
+		stream.write(b);
+	}
+
+	public void write(byte[] b) throws IOException {
+		stream.write(b);
+	}
+
+	public void write(byte[] b, int off, int len) throws IOException {
+		stream.write(b, off, len);
+	}
+
+	@Override
+	public boolean isReady() {
+		return false;
+	}
+
+	@Override
+	public void setWriteListener(WriteListener writeListener) {
+
+	}
+}
\ No newline at end of file

JeeSpringCloud/src/main/java/com/jeespring/modules/act/rest/servlet/GenericResponseWrapper.java

+package com.jeespring.modules.act.rest.servlet;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintWriter;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponseWrapper;
+
+public class GenericResponseWrapper extends HttpServletResponseWrapper {
+	
+	private ByteArrayOutputStream output;
+	private int contentLength;
+	private String contentType;
+
+	public GenericResponseWrapper(HttpServletResponse response) {
+		super(response);
+		output = new ByteArrayOutputStream();
+	}
+
+	public byte[] getData() {
+		return output.toByteArray();
+	}
+
+	public ServletOutputStream getOutputStream() {
+		return new FilterServletOutputStream(output);
+	}
+
+	public PrintWriter getWriter() {
+		return new PrintWriter(getOutputStream(), true);
+	}
+
+	public void setContentLength(int length) {
+		this.contentLength = length;
+		super.setContentLength(length);
+	}
+
+	public int getContentLength() {
+		return contentLength;
+	}
+
+	public void setContentType(String type) {
+		this.contentType = type;
+		super.setContentType(type);
+	}
+
+	public String getContentType() {
+		return contentType;
+	}
+}

JeeSpringCloud/src/main/java/com/jeespring/modules/act/rest/servlet/JsonpCallbackFilter.java

+package com.jeespring.modules.act.rest.servlet;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Map;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.annotation.WebFilter;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@WebFilter(urlPatterns={"/act/service/*"})
+public class JsonpCallbackFilter implements Filter
+ {
+
+	private static Logger log = LoggerFactory.getLogger(JsonpCallbackFilter.class);
+
+	public void init(FilterConfig fConfig) throws ServletException {}
+
+	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+		
+		HttpServletRequest httpRequest = (HttpServletRequest) request;
+		HttpServletResponse httpResponse = (HttpServletResponse) response;
+
+		@SuppressWarnings("unchecked")
+		Map<String, String[]> parms = httpRequest.getParameterMap();
+
+		if (parms.containsKey("callback")) {
+			if (log.isDebugEnabled())
+				log.debug("Wrapping response with JSONP callback '" + parms.get("callback")[0] + "'");
+
+			OutputStream out = httpResponse.getOutputStream();
+
+			GenericResponseWrapper wrapper = new GenericResponseWrapper(httpResponse);
+
+			chain.doFilter(request, wrapper);
+
+			//handles the content-size truncation
+			ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+			outputStream.write(new String(parms.get("callback")[0] + "(").getBytes());
+			outputStream.write(wrapper.getData());
+			outputStream.write(new String(");").getBytes());
+			byte jsonpResponse[] = outputStream.toByteArray();
+
+			wrapper.setContentType("text/javascript;charset=UTF-8");
+			wrapper.setContentLength(jsonpResponse.length);
+
+			out.write(jsonpResponse);
+
+			out.close();
+
+		} else {
+			chain.doFilter(request, response);
+		}
+	}
+
+	public void destroy() {}
+}

JeeSpringCloud/src/main/java/com/jeespring/modules/act/service/ActModelService.java

+/**
+ * Copyright &copy; 2012-2016 <a href="https://github.com/thinkgem/jeesite">JeeSite</a> All rights reserved.
+ */
+package com.jeespring.modules.act.service;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.List;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.activiti.bpmn.converter.BpmnXMLConverter;
+import org.activiti.bpmn.model.BpmnModel;
+import org.activiti.editor.constants.ModelDataJsonConstants;
+import org.activiti.editor.language.json.converter.BpmnJsonConverter;
+import org.activiti.engine.ActivitiException;
+import org.activiti.engine.RepositoryService;
+import org.activiti.engine.repository.Deployment;
+import org.activiti.engine.repository.Model;
+import org.activiti.engine.repository.ModelQuery;
+import org.activiti.engine.repository.ProcessDefinition;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.jeespring.common.persistence.Page;
+import com.jeespring.common.service.AbstractService;
+
+/**
+ * 流程模型相关Controller
+ * @author ThinkGem
+ * @version 2013-11-03
+ */
+@Service
+@Transactional(readOnly = true)
+public class ActModelService extends AbstractService {
+
+	@Autowired
+	private RepositoryService repositoryService;
+	
+//	@Autowired
+//	private ObjectMapper objectMapper;
+	protected ObjectMapper objectMapper = new ObjectMapper();
+
+	/**
+	 * 流程模型列表
+	 */
+	public Page<Model> modelList(Page<Model> page, String category) {
+
+		ModelQuery modelQuery = repositoryService.createModelQuery().latestVersion().orderByLastUpdateTime().desc();
+		
+		if (StringUtils.isNotEmpty(category)){
+			modelQuery.modelCategory(category);
+		}
+		
+		page.setCount(modelQuery.count());
+		page.setList(modelQuery.listPage(page.getFirstResult(), page.getMaxResults()));
+
+		return page;
+	}
+
+	/**
+	 * 创建模型
+	 * @throws UnsupportedEncodingException 
+	 */
+	@Transactional(readOnly = false)
+	public Model create(String name, String key, String description, String category) throws UnsupportedEncodingException {
+		
+		ObjectNode editorNode = objectMapper.createObjectNode();
+		editorNode.put("id", "canvas");
+		editorNode.put("resourceId", "canvas");
+		ObjectNode properties = objectMapper.createObjectNode();
+		properties.put("process_author", "jeesite");
+		editorNode.put("properties", properties);
+		ObjectNode stencilset = objectMapper.createObjectNode();
+		stencilset.put("namespace", "http://b3mn.org/stencilset/bpmn2.0#");
+		editorNode.put("stencilset", stencilset);
+		
+		Model modelData = repositoryService.newModel();
+		description = StringUtils.defaultString(description);
+		modelData.setKey(StringUtils.defaultString(key));
+		modelData.setName(name);
+		modelData.setCategory(category);
+		modelData.setVersion(Integer.parseInt(String.valueOf(repositoryService.createModelQuery().modelKey(modelData.getKey()).count()+1)));
+
+		ObjectNode modelObjectNode = objectMapper.createObjectNode();
+		modelObjectNode.put(ModelDataJsonConstants.MODEL_NAME, name);
+		modelObjectNode.put(ModelDataJsonConstants.MODEL_REVISION, modelData.getVersion());
+		modelObjectNode.put(ModelDataJsonConstants.MODEL_DESCRIPTION, description);
+		modelData.setMetaInfo(modelObjectNode.toString());
+		
+		repositoryService.saveModel(modelData);
+		repositoryService.addModelEditorSource(modelData.getId(), editorNode.toString().getBytes("utf-8"));
+		
+		return modelData;
+	}
+
+	/**
+	 * 根据Model部署流程
+	 */
+	@Transactional(readOnly = false)
+	public String deploy(String id) {
+		String message = "";
+		try {
+			Model modelData = repositoryService.getModel(id);
+			BpmnJsonConverter jsonConverter = new BpmnJsonConverter();
+			JsonNode editorNode = new ObjectMapper().readTree(repositoryService.getModelEditorSource(modelData.getId()));
+			BpmnModel bpmnModel = jsonConverter.convertToBpmnModel(editorNode);
+			BpmnXMLConverter xmlConverter = new BpmnXMLConverter();
+			byte[] bpmnBytes = xmlConverter.convertToXML(bpmnModel);
+			
+			String processName = modelData.getName();
+			if (!StringUtils.endsWith(processName, ".bpmn20.xml")){
+				processName += ".bpmn20.xml";
+			}
+//			System.out.println("========="+processName+"============"+modelData.getName());
+			ByteArrayInputStream in = new ByteArrayInputStream(bpmnBytes);
+			Deployment deployment = repositoryService.createDeployment().name(modelData.getName())
+					.addInputStream(processName, in).deploy();
+//					.addString(processName, new String(bpmnBytes)).deploy();
+			
+			// 设置流程分类
+			List<ProcessDefinition> list = repositoryService.createProcessDefinitionQuery().deploymentId(deployment.getId()).list();
+			for (ProcessDefinition processDefinition : list) {
+				repositoryService.setProcessDefinitionCategory(processDefinition.getId(), modelData.getCategory());
+				message = "部署成功，流程ID=" + processDefinition.getId();
+			}
+			if (list.size() == 0){
+				message = "部署失败，没有流程。";
+			}
+		} catch (Exception e) {
+			throw new ActivitiException("设计模型图不正确，检查模型正确性，模型ID="+id, e);
+		}
+		return message;
+	}
+	
+	/**
+	 * 导出model的xml文件
+	 * @throws IOException 
+	 * @throws JsonProcessingException 
+	 */
+	public void export(String id, HttpServletResponse response) {
+		try {
+			Model modelData = repositoryService.getModel(id);
+			BpmnJsonConverter jsonConverter = new BpmnJsonConverter();
+			JsonNode editorNode = new ObjectMapper().readTree(repositoryService.getModelEditorSource(modelData.getId()));
+			BpmnModel bpmnModel = jsonConverter.convertToBpmnModel(editorNode);
+			BpmnXMLConverter xmlConverter = new BpmnXMLConverter();
+			byte[] bpmnBytes = xmlConverter.convertToXML(bpmnModel);
+
+			ByteArrayInputStream in = new ByteArrayInputStream(bpmnBytes);
+			IOUtils.copy(in, response.getOutputStream());
+			String filename = bpmnModel.getMainProcess().getId() + ".bpmn20.xml";
+			response.setHeader("Content-Disposition", "attachment; filename=" + filename);
+			response.flushBuffer();
+		} catch (Exception e) {
+			throw new ActivitiException("导出model的xml文件失败，模型ID="+id, e);
+		}
+		
+	}
+
+	/**
+	 * 更新Model分类
+	 */
+	@Transactional(readOnly = false)
+	public void updateCategory(String id, String category) {
+		Model modelData = repositoryService.getModel(id);
+		modelData.setCategory(category);
+		repositoryService.saveModel(modelData);
+	}
+	
+	/**
+	 * 删除模型
+	 * @param id
+	 * @return
+	 */
+	@Transactional(readOnly = false)
+	public void delete(String id) {
+		repositoryService.deleteModel(id);
+	}
+}

JeeSpringCloud/src/main/java/com/jeespring/modules/act/service/ActProcessService.java

+/**
+ * Copyright &copy; 2012-2016 <a href="https://github.com/thinkgem/jeesite">JeeSite</a> All rights reserved.
+ */
+package com.jeespring.modules.act.service;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.zip.ZipInputStream;
+
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+import org.activiti.bpmn.converter.BpmnXMLConverter;
+import org.activiti.bpmn.model.BpmnModel;
+import org.activiti.editor.constants.ModelDataJsonConstants;
+import org.activiti.editor.language.json.converter.BpmnJsonConverter;
+import org.activiti.engine.ActivitiException;
+import org.activiti.engine.RepositoryService;
+import org.activiti.engine.RuntimeService;
+import org.activiti.engine.repository.Deployment;
+import org.activiti.engine.repository.ProcessDefinition;
+import org.activiti.engine.repository.ProcessDefinitionQuery;
+import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.engine.runtime.ProcessInstanceQuery;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.FilenameUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.jeespring.common.persistence.Page;
+import com.jeespring.common.service.AbstractService;
+import com.jeespring.common.utils.StringUtils;
+
+/**
+ * 流程定义相关Controller
+ * @author ThinkGem
+ * @version 2013-11-03
+ */
+@Service
+@Transactional(readOnly = true)
+public class ActProcessService extends AbstractService {
+
+	@Autowired
+	private RepositoryService repositoryService;
+	@Autowired
+	private RuntimeService runtimeService;
+
+	/**
+	 * 流程定义列表
+	 */
+	public Page<Object[]> processList(Page<Object[]> page, String category) {
+
+	    ProcessDefinitionQuery processDefinitionQuery = repositoryService.createProcessDefinitionQuery()
+	    		.latestVersion().orderByProcessDefinitionKey().asc();
+	    
+	    if (StringUtils.isNotEmpty(category)){
+	    	processDefinitionQuery.processDefinitionCategory(category);
+		}
+	    
+	    page.setCount(processDefinitionQuery.count());
+	    
+	    List<ProcessDefinition> processDefinitionList = processDefinitionQuery.listPage(page.getFirstResult(), page.getMaxResults());
+	    for (ProcessDefinition processDefinition : processDefinitionList) {
+	      String deploymentId = processDefinition.getDeploymentId();
+	      Deployment deployment = repositoryService.createDeploymentQuery().deploymentId(deploymentId).singleResult();
+	      page.getList().add(new Object[]{processDefinition, deployment});
+	    }
+
+		return page;
+	}
+
+	/**
+	 * 流程定义列表
+	 */
+	public Page<ProcessInstance> runningList(Page<ProcessInstance> page, String procInsId, String procDefKey) {
+
+	    ProcessInstanceQuery processInstanceQuery = runtimeService.createProcessInstanceQuery();
+
+	    if (StringUtils.isNotBlank(procInsId)){
+		    processInstanceQuery.processInstanceId(procInsId);
+	    }
+	    
+	    if (StringUtils.isNotBlank(procDefKey)){
+		    processInstanceQuery.processDefinitionKey(procDefKey);
+	    }
+	    
+	    page.setCount(processInstanceQuery.count());
+	    page.setList(processInstanceQuery.listPage(page.getFirstResult(), page.getMaxResults()));
+		return page;
+	}
+	
+	/**
+	 * 读取资源，通过部署ID
+	 * @param processDefinitionId  流程定义ID
+	 * @param processInstanceId 流程实例ID
+	 * @param resourceType 资源类型(xml|image)
+	 */
+	public InputStream resourceRead(String procDefId, String proInsId, String resType) throws Exception {
+		
+		if (StringUtils.isBlank(procDefId)){
+			ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(proInsId).singleResult();
+			procDefId = processInstance.getProcessDefinitionId();
+		}
+		ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(procDefId).singleResult();
+		
+		String resourceName = "";
+		if (resType.equals("image")) {
+			resourceName = processDefinition.getDiagramResourceName();
+		} else if (resType.equals("xml")) {
+			resourceName = processDefinition.getResourceName();
+		}
+		
+		InputStream resourceAsStream = repositoryService.getResourceAsStream(processDefinition.getDeploymentId(), resourceName);
+		return resourceAsStream;
+	}
+	
+	/**
+	 * 部署流程 - 保存
+	 * @param file
+	 * @return
+	 */
+	@Transactional(readOnly = false)
+	public String deploy(String exportDir, String category, MultipartFile file) {
+
+		String message = "";
+		
+		String fileName = file.getOriginalFilename();
+		
+		try {
+			InputStream fileInputStream = file.getInputStream();
+			Deployment deployment;
+			String extension = FilenameUtils.getExtension(fileName);
+			if (extension.equals("zip") || extension.equals("bar")) {
+				ZipInputStream zip = new ZipInputStream(fileInputStream);
+				deployment = repositoryService.createDeployment().addZipInputStream(zip).deploy();
+			} else if (extension.equals("png")) {
+				deployment = repositoryService.createDeployment().addInputStream(fileName, fileInputStream).deploy();
+			} else if (fileName.indexOf("bpmn20.xml") != -1) {
+				deployment = repositoryService.createDeployment().addInputStream(fileName, fileInputStream).deploy();
+			} else if (extension.equals("bpmn")) { // bpmn扩展名特殊处理，转换为bpmn20.xml
+				String baseName = FilenameUtils.getBaseName(fileName); 
+				deployment = repositoryService.createDeployment().addInputStream(baseName + ".bpmn20.xml", fileInputStream).deploy();
+			} else {
+				message = "不支持的文件类型：" + extension;
+				return message;
+			}
+			
+			List<ProcessDefinition> list = repositoryService.createProcessDefinitionQuery().deploymentId(deployment.getId()).list();
+
+			// 设置流程分类
+			for (ProcessDefinition processDefinition : list) {
+//					ActUtils.exportDiagramToFile(repositoryService, processDefinition, exportDir);
+				repositoryService.setProcessDefinitionCategory(processDefinition.getId(), category);
+				message += "部署成功，流程ID=" + processDefinition.getId() + "<br/>";
+			}
+			
+			if (list.size() == 0){
+				message = "部署失败，没有流程。";
+			}
+			
+		} catch (Exception e) {
+			throw new ActivitiException("部署失败！", e);
+		}
+		return message;
+	}
+	
+	/**
+	 * 设置流程分类
+	 */
+	@Transactional(readOnly = false)
+	public void updateCategory(String procDefId, String category) {
+		repositoryService.setProcessDefinitionCategory(procDefId, category);
+	}
+
+	/**
+	 * 挂起、激活流程实例
+	 */
+	@Transactional(readOnly = false)
+	public String updateState(String state, String procDefId) {
+		if (state.equals("active")) {
+			repositoryService.activateProcessDefinitionById(procDefId, true, null);
+			return "已激活ID为[" + procDefId + "]的流程定义。";
+		} else if (state.equals("suspend")) {
+			repositoryService.suspendProcessDefinitionById(procDefId, true, null);
+			return "已挂起ID为[" + procDefId + "]的流程定义。";
+		}
+		return "无操作";
+	}
+	
+	/**
+	 * 将部署的流程转换为模型
+	 * @param procDefId
+	 * @throws UnsupportedEncodingException
+	 * @throws XMLStreamException
+	 */
+	@Transactional(readOnly = false)
+	public org.activiti.engine.repository.Model convertToModel(String procDefId) throws UnsupportedEncodingException, XMLStreamException {
+		
+		ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(procDefId).singleResult();
+		InputStream bpmnStream = repositoryService.getResourceAsStream(processDefinition.getDeploymentId(),
+		processDefinition.getResourceName());
+		XMLInputFactory xif = XMLInputFactory.newInstance();
+		InputStreamReader in = new InputStreamReader(bpmnStream, "UTF-8");
+		XMLStreamReader xtr = xif.createXMLStreamReader(in);
+		BpmnModel bpmnModel = new BpmnXMLConverter().convertToBpmnModel(xtr);
+	
+		BpmnJsonConverter converter = new BpmnJsonConverter();
+		ObjectNode modelNode = converter.convertToJson(bpmnModel);
+		org.activiti.engine.repository.Model modelData = repositoryService.newModel();
+		modelData.setKey(processDefinition.getKey());
+		modelData.setName(processDefinition.getResourceName());
+		modelData.setCategory(processDefinition.getCategory());//.getDeploymentId());
+		modelData.setDeploymentId(processDefinition.getDeploymentId());
+		modelData.setVersion(Integer.parseInt(String.valueOf(repositoryService.createModelQuery().modelKey(modelData.getKey()).count()+1)));
+	
+		ObjectNode modelObjectNode = new ObjectMapper().createObjectNode();
+		modelObjectNode.put(ModelDataJsonConstants.MODEL_NAME, processDefinition.getName());
+		modelObjectNode.put(ModelDataJsonConstants.MODEL_REVISION, modelData.getVersion());
+		modelObjectNode.put(ModelDataJsonConstants.MODEL_DESCRIPTION, processDefinition.getDescription());
+		modelData.setMetaInfo(modelObjectNode.toString());
+	
+		repositoryService.saveModel(modelData);
+	
+		repositoryService.addModelEditorSource(modelData.getId(), modelNode.toString().getBytes("utf-8"));
+	
+		return modelData;
+	}
+	
+	/**
+	 * 导出图片文件到硬盘
+	 */
+	public List<String> exportDiagrams(String exportDir) throws IOException {
+		List<String> files = new ArrayList<String>();
+		List<ProcessDefinition> list = repositoryService.createProcessDefinitionQuery().list();
+		
+		for (ProcessDefinition processDefinition : list) {
+			String diagramResourceName = processDefinition.getDiagramResourceName();
+			String key = processDefinition.getKey();
+			int version = processDefinition.getVersion();
+			String diagramPath = "";
+
+			InputStream resourceAsStream = repositoryService.getResourceAsStream(
+					processDefinition.getDeploymentId(), diagramResourceName);
+			byte[] b = new byte[resourceAsStream.available()];
+
+			@SuppressWarnings("unused")
+			int len = -1;
+			resourceAsStream.read(b, 0, b.length);
+
+			// create file if not exist
+			String diagramDir = exportDir + "/" + key + "/" + version;
+			File diagramDirFile = new File(diagramDir);
+			if (!diagramDirFile.exists()) {
+				diagramDirFile.mkdirs();
+			}
+			diagramPath = diagramDir + "/" + diagramResourceName;
+			File file = new File(diagramPath);
+
+			// 文件存在退出
+			if (file.exists()) {
+				// 文件大小相同时直接返回否则重新创建文件(可能损坏)
+				logger.debug("diagram exist, ignore... : {}", diagramPath);
+				
+				files.add(diagramPath);
+			} else {
+				file.createNewFile();
+				logger.debug("export diagram to : {}", diagramPath);
+
+				// wirte bytes to file
+				FileUtils.writeByteArrayToFile(file, b, true);
+				
+				files.add(diagramPath);
+			}
+			
+		}
+		
+		return files;
+	}
+
+	/**
+	 * 删除部署的流程，级联删除流程实例
+	 * @param deploymentId 流程部署ID
+	 */
+	@Transactional(readOnly = false)
+	public void deleteDeployment(String deploymentId) {
+		repositoryService.deleteDeployment(deploymentId, true);
+	}
+	
+	/**
+	 * 删除部署的流程实例
+	 * @param procInsId 流程实例ID
+	 * @param deleteReason 删除原因，可为空
+	 */
+	@Transactional(readOnly = false)
+	public void deleteProcIns(String procInsId, String deleteReason) {
+		runtimeService.deleteProcessInstance(procInsId, deleteReason);
+	}
+	
+}

JeeSpringCloud/src/main/java/com/jeespring/modules/act/service/cmd/CreateAndTakeTransitionCmd.java

+package com.jeespring.modules.act.service.cmd;
+
+import java.util.Map;
+
+import org.activiti.engine.impl.context.Context;
+import org.activiti.engine.impl.interceptor.Command;
+import org.activiti.engine.impl.interceptor.CommandContext;
+import org.activiti.engine.impl.persistence.entity.ExecutionEntity;
+import org.activiti.engine.impl.persistence.entity.TaskEntity;
+import org.activiti.engine.impl.pvm.process.ActivityImpl;
+import org.activiti.engine.impl.pvm.runtime.AtomicOperation;
+
+public class CreateAndTakeTransitionCmd implements Command<Void> {
+	
+	private TaskEntity currentTaskEntity;
+	private ActivityImpl activity;
+	protected Map<String, Object> variables;
+
+	public CreateAndTakeTransitionCmd(TaskEntity currentTaskEntity, ActivityImpl activity, Map<String, Object> variables) {
+		this.currentTaskEntity = currentTaskEntity;
+		this.activity = activity;
+		this.variables = variables;
+	}
+
+	@Override
+	public Void execute(CommandContext commandContext) {
+		if (currentTaskEntity != null) {
+
+			ExecutionEntity execution = commandContext.getExecutionEntityManager().findExecutionById(currentTaskEntity.getExecutionId());
+			execution.setActivity(activity);
+			execution.performOperation(AtomicOperation.TRANSITION_CREATE_SCOPE);
+
+			if (variables != null) {
+				if (currentTaskEntity.getExecutionId() != null) {
+					currentTaskEntity.setExecutionVariables(variables);
+				} else {
+					currentTaskEntity.setVariables(variables);
+				}
+			}
+			//删除当前的任务，不能删除当前正在执行的任务，所以要先清除掉关联
+			Context.getCommandContext().getTaskEntityManager().deleteTask(currentTaskEntity, TaskEntity.DELETE_REASON_DELETED, false);
+		}
+		return null;
+	}
+}
\ No newline at end of file

JeeSpringCloud/src/main/java/com/jeespring/modules/act/service/cmd/JumpTaskCmd.java

+package com.jeespring.modules.act.service.cmd;
+
+import java.util.Map;
+
+import org.activiti.engine.impl.context.Context;
+import org.activiti.engine.impl.interceptor.Command;
+import org.activiti.engine.impl.interceptor.CommandContext;
+import org.activiti.engine.impl.persistence.entity.ExecutionEntity;
+import org.activiti.engine.impl.persistence.entity.TaskEntity;
+import org.activiti.engine.impl.pvm.process.ActivityImpl;
+import org.activiti.engine.impl.pvm.runtime.AtomicOperation;
+
+public class JumpTaskCmd implements Command<Void> {
+	
+	private TaskEntity taskEntity;
+	private ActivityImpl targetActivity;
+	protected Map<String, Object> variables;
+
+	public JumpTaskCmd(TaskEntity taskEntity, ActivityImpl targetActivity, Map<String, Object> variables) {
+		this.taskEntity = taskEntity;
+		this.targetActivity = targetActivity;
+		this.variables = variables;
+	}
+
+	@Override
+	public Void execute(CommandContext commandContext) {
+		
+		if (taskEntity != null) {
+			
+			//删除当前的任务，不能删除当前正在执行的任务，所以要先清除掉关联
+			if (variables != null) {
+				if (taskEntity.getExecutionId() != null) {
+					taskEntity.setExecutionVariables(variables);
+				} else {
+					taskEntity.setVariables(variables);
+				}
+			}
+
+//			// 完成活动历史
+//			Context.getCommandContext().getHistoryManager()
+//				.recordActivityEnd((ExecutionEntity) taskEntity.getExecution());
+			
+			// 完成待办任务
+			Context.getCommandContext().getTaskEntityManager().deleteTask(taskEntity, 
+					TaskEntity.DELETE_REASON_COMPLETED, false);	// DELETE_REASON_DELETED  DELETE_REASON_COMPLETED
+			
+			// 跳转任务
+			ExecutionEntity execution = taskEntity.getExecution();
+			execution.setActivity(targetActivity);
+			execution.performOperation(AtomicOperation.ACTIVITY_START);
+			
+		}
+
+		return null;
+	}
+}
\ No newline at end of file

JeeSpringCloud/src/main/java/com/jeespring/modules/act/service/cmd/ModelDeployProcessDefinitionCmd.java

+package com.jeespring.modules.act.service.cmd;
+
+import java.io.ByteArrayInputStream;
+
+import org.activiti.bpmn.converter.BpmnXMLConverter;
+import org.activiti.bpmn.model.BpmnModel;
+import org.activiti.editor.language.json.converter.BpmnJsonConverter;
+import org.activiti.engine.ActivitiException;
+import org.activiti.engine.RepositoryService;
+import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
+import org.activiti.engine.impl.context.Context;
+import org.activiti.engine.impl.db.DbSqlSession;
+import org.activiti.engine.impl.interceptor.Command;
+import org.activiti.engine.impl.interceptor.CommandContext;
+import org.activiti.engine.impl.persistence.entity.DeploymentEntity;
+import org.activiti.engine.impl.persistence.entity.ResourceEntity;
+import org.activiti.engine.impl.persistence.entity.ResourceEntityManager;
+import org.activiti.engine.impl.util.IoUtil;
+import org.activiti.engine.repository.ProcessDefinition;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+/**
+ * 模型部署或更新到流程定义
+ * @author ThinkGem
+ * @version 2016年8月2日
+ */
+public class ModelDeployProcessDefinitionCmd implements Command<Void> {
+	
+	private String modelId;
+	private String procDefKey;
+	private String procDefName;
+
+	public ModelDeployProcessDefinitionCmd(String modelId, String procDefKey, String procDefName) {
+		this.modelId = modelId;
+		this.procDefKey = procDefKey;
+		this.procDefName = procDefName;
+	}
+
+	@Override
+	public Void execute(CommandContext commandContext) {
+		RepositoryService repositoryService = Context.getProcessEngineConfiguration()
+				.getRepositoryService();
+		try{
+			// 生成部署名称和数据 ThinkGem
+			JsonNode editorNode = new ObjectMapper().readTree(repositoryService
+						.getModelEditorSource(modelId));
+			BpmnModel bpmnModel = new BpmnJsonConverter().convertToBpmnModel(editorNode);
+			byte[] bpmnBytes = new BpmnXMLConverter().convertToXML(bpmnModel);
+			
+			// 查询流程定义是否已经存在了 ThinkGem
+			ProcessDefinition processDefinition = Context.getProcessEngineConfiguration()
+					.getRepositoryService().createProcessDefinitionQuery()
+					.processDefinitionKey(procDefKey).latestVersion().singleResult();
+			if (processDefinition != null){
+				ResourceEntityManager resourceEntityManager = commandContext.getResourceEntityManager();
+				DeploymentEntity deployment = (DeploymentEntity)repositoryService.createDeploymentQuery()
+						.deploymentId(processDefinition.getDeploymentId()).singleResult();
+				
+				// 删除原资源
+				resourceEntityManager.deleteResourcesByDeploymentId(deployment.getId());
+				Context.getCommandContext().getSession(DbSqlSession.class).flush();
+				
+				// 插入新资源
+			    ResourceEntity resource = new ResourceEntity();
+			    resource.setDeploymentId(deployment.getId());
+			    resource.setName(procDefName + ".bpmn20.xml");
+			    resource.setBytes(bpmnBytes);
+				deployment.addResource(resource);
+				resourceEntityManager.insertResource(resource);
+				
+				// 插入资源图片
+				ProcessEngineConfigurationImpl processEngineConfiguration = Context.getProcessEngineConfiguration();
+				byte[] diagramBytes = IoUtil.readInputStream(processEngineConfiguration.
+	                    getProcessDiagramGenerator().generateDiagram(bpmnModel, "png", processEngineConfiguration.getActivityFontName(),
+	                        processEngineConfiguration.getLabelFontName(),processEngineConfiguration.getAnnotationFontName(), processEngineConfiguration.getClassLoader()), null);
+				ResourceEntity diagramResource = new ResourceEntity();
+				diagramResource.setDeploymentId(deployment.getId());
+				diagramResource.setName(procDefName + "." + processDefinition.getKey() + ".png");
+				diagramResource.setBytes(diagramBytes);
+				deployment.addResource(diagramResource);
+				resourceEntityManager.insertResource(diagramResource);
+			}
+			// 不存在部署一个新的流程 ThinkGem
+			else{ 
+				repositoryService.createDeployment().name(procDefName).addInputStream(
+						procDefName + ".bpmn20.xml", new ByteArrayInputStream(bpmnBytes)).deploy();
+			}
+		}catch(Exception e){
+			throw new ActivitiException("模型部署到流程定义错误", e);
+		}
+		return null;
+	}
+}
\ No newline at end of file

JeeSpringCloud/src/main/java/com/jeespring/modules/act/service/creator/ChainedActivitiesCreator.java

+package com.jeespring.modules.act.service.creator;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.activiti.engine.ProcessEngine;
+import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity;
+import org.activiti.engine.impl.pvm.process.ActivityImpl;
+import org.springframework.util.CollectionUtils;
+
+import com.jeespring.modules.act.utils.ProcessDefUtils;
+
+public class ChainedActivitiesCreator extends RuntimeActivityCreatorSupport implements RuntimeActivityCreator {
+	
+	@SuppressWarnings("unchecked")
+	public ActivityImpl[] createActivities(ProcessEngine processEngine, ProcessDefinitionEntity processDefinition,
+			RuntimeActivityDefinitionEntity info) {
+		info.setFactoryName(ChainedActivitiesCreator.class.getName());
+		RuntimeActivityDefinitionEntityIntepreter radei = new RuntimeActivityDefinitionEntityIntepreter(info);
+
+		if (radei.getCloneActivityIds() == null) {
+			radei.setCloneActivityIds(CollectionUtils.arrayToList(new String[radei.getAssignees().size()]));
+		}
+
+		return createActivities(processEngine, processDefinition, info.getProcessInstanceId(), radei.getPrototypeActivityId(),
+				radei.getNextActivityId(), radei.getAssignees(), radei.getCloneActivityIds());
+	}
+
+	private ActivityImpl[] createActivities(ProcessEngine processEngine, ProcessDefinitionEntity processDefinition, String processInstanceId,
+			String prototypeActivityId, String nextActivityId, List<String> assignees, List<String> activityIds) {
+		ActivityImpl prototypeActivity = ProcessDefUtils.getActivity(processEngine, processDefinition.getId(), prototypeActivityId);
+
+		List<ActivityImpl> activities = new ArrayList<ActivityImpl>();
+		for (int i = 0; i < assignees.size(); i++) {
+			if (activityIds.get(i) == null) {
+				String activityId = createUniqueActivityId(processInstanceId, prototypeActivityId);
+				activityIds.set(i, activityId);
+			}
+
+			ActivityImpl clone = createActivity(processEngine, processDefinition, prototypeActivity, activityIds.get(i), assignees.get(i));
+			activities.add(clone);
+		}
+
+		ActivityImpl nextActivity = ProcessDefUtils.getActivity(processEngine, processDefinition.getId(), nextActivityId);
+		createActivityChain(activities, nextActivity);
+
+		return activities.toArray(new ActivityImpl[0]);
+	}
+}