variables) {
+ this.variables = variables;
+ }
+
+ @Transient
+ public ProcessInstance getProcessInstance() {
+ return processInstance;
+ }
+
+ public void setProcessInstance(ProcessInstance processInstance) {
+ this.processInstance = processInstance;
+ }
+
+ @Transient
+ public HistoricProcessInstance getHistoricProcessInstance() {
+ return historicProcessInstance;
+ }
+
+ public void setHistoricProcessInstance(HistoricProcessInstance historicProcessInstance) {
+ this.historicProcessInstance = historicProcessInstance;
+ }
+
+ @Transient
+ public ProcessDefinition getProcessDefinition() {
+ return processDefinition;
+ }
+
+ public void setProcessDefinition(ProcessDefinition processDefinition) {
+ this.processDefinition = processDefinition;
+ }
}
diff --git a/src/main/java/me/kafeitu/demo/activiti/entity/oa/LeaveJpaEntity.java b/src/main/java/me/kafeitu/demo/activiti/entity/oa/LeaveJpaEntity.java
new file mode 100644
index 0000000000..8a57283b49
--- /dev/null
+++ b/src/main/java/me/kafeitu/demo/activiti/entity/oa/LeaveJpaEntity.java
@@ -0,0 +1,166 @@
+package me.kafeitu.demo.activiti.entity.oa;
+
+import java.io.Serializable;
+import java.util.Date;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 请假的JPA映射实体
+ *
+ * @author: Henry Yan
+ */
+@Entity(name = "LEAVE_JPA")
+public class LeaveJpaEntity implements Serializable {
+
+ private Long id;
+ private String processInstanceId;
+ private String userId;
+ private Date startTime;
+ private Date endTime;
+ private Date realityStartTime;
+ private Date realityEndTime;
+ private Date reportBackDate;
+ private Date applyTime;
+ private String leaveType;
+ private String reason;
+
+ /**
+ * 部门领导是否同意
+ */
+ private String deptLeaderApproved;
+
+ /**
+ * HR是否同意
+ */
+ private String hrApproved;
+
+ @Id
+ @Column(name="ID")
+ @GeneratedValue(strategy = GenerationType.AUTO)
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ @Column(name = "APPLY_TIME")
+ public Date getApplyTime() {
+ return applyTime;
+ }
+
+ public void setApplyTime(Date applyTime) {
+ this.applyTime = applyTime;
+ }
+
+ @Column(name = "END_TIME")
+ public Date getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(Date endTime) {
+ this.endTime = endTime;
+ }
+
+ @Column(name = "LEAVE_TYPE")
+ public String getLeaveType() {
+ return leaveType;
+ }
+
+ public void setLeaveType(String leaveType) {
+ this.leaveType = leaveType;
+ }
+
+ @Column(name = "PROCESS_INSTANCE_ID")
+ public String getProcessInstanceId() {
+ return processInstanceId;
+ }
+
+ public void setProcessInstanceId(String processInstanceId) {
+ this.processInstanceId = processInstanceId;
+ }
+
+ @Column(name = "REALITY_END_TIME")
+ public Date getRealityEndTime() {
+ return realityEndTime;
+ }
+
+ public void setRealityEndTime(Date realityEndTime) {
+ this.realityEndTime = realityEndTime;
+ }
+
+ @Column(name = "REALITY_START_TIME")
+ public Date getRealityStartTime() {
+ return realityStartTime;
+ }
+
+ public void setRealityStartTime(Date realityStartTime) {
+ this.realityStartTime = realityStartTime;
+ }
+
+ @Column(name = "REASON")
+ public String getReason() {
+ return reason;
+ }
+
+ public void setReason(String reason) {
+ this.reason = reason;
+ }
+
+ @Column(name = "START_TIME")
+ public Date getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(Date startTime) {
+ this.startTime = startTime;
+ }
+
+ @Column(name = "USER_ID")
+ public String getUserId() {
+ return userId;
+ }
+
+ public void setUserId(String userId) {
+ this.userId = userId;
+ }
+
+ @Column(name = "REPORT_BACK_DATE")
+ public Date getReportBackDate() {
+ return reportBackDate;
+ }
+
+ public void setReportBackDate(Date reportBackDate) {
+ this.reportBackDate = reportBackDate;
+ }
+
+ @Column
+ public String getDeptLeaderApproved() {
+ return deptLeaderApproved;
+ }
+
+ public void setDeptLeaderApproved(String deptLeaderApproved) {
+ this.deptLeaderApproved = deptLeaderApproved;
+ }
+
+ @Column
+ public String getHrApproved() {
+ return hrApproved;
+ }
+
+ public void setHrApproved(String hrApproved) {
+ this.hrApproved = hrApproved;
+ }
+
+ @Override
+ public String toString() {
+ return ToStringBuilder.reflectionToString(this);
+ }
+}
diff --git a/src/main/java/me/kafeitu/demo/activiti/service/SetMailInfo.java b/src/main/java/me/kafeitu/demo/activiti/service/SetMailInfo.java
new file mode 100644
index 0000000000..5e9ad0f154
--- /dev/null
+++ b/src/main/java/me/kafeitu/demo/activiti/service/SetMailInfo.java
@@ -0,0 +1,38 @@
+package me.kafeitu.demo.activiti.service;
+
+import java.util.Calendar;
+import java.util.Date;
+
+import org.activiti.engine.IdentityService;
+import org.activiti.engine.delegate.DelegateExecution;
+import org.activiti.engine.delegate.ExecutionListener;
+import org.activiti.engine.identity.User;
+
+/**
+ * 请假流程--邮件任务监听器，用于设置发送邮件时的一些变量
+ *
+ * @author henryyan
+ */
+public class SetMailInfo implements ExecutionListener {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void notify(DelegateExecution execution) throws Exception {
+ IdentityService identityService = execution.getEngineServices().getIdentityService();
+ String applyUserId = (String) execution.getVariable("applyUserId");
+ User user = identityService.createUserQuery().userId(applyUserId).singleResult();
+ String to = user.getEmail();
+ execution.setVariableLocal("to", to);
+ String userName = user.getFirstName() + " " + user.getLastName();
+ execution.setVariableLocal("name", userName);
+
+ // 超时提醒时间设置，请假结束时间+1天
+ Date endDate = (Date) execution.getVariable("endDate");
+ Calendar ca = Calendar.getInstance();
+ ca.setTime(endDate);
+ ca.add(Calendar.DAY_OF_MONTH, 1);
+ execution.setVariableLocal("reportBackTimeout", ca.getTime());
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/me/kafeitu/demo/activiti/service/activiti/WorkflowProcessDefinitionService.java b/src/main/java/me/kafeitu/demo/activiti/service/activiti/WorkflowProcessDefinitionService.java
index 1d92319863..26770ad2b3 100644
--- a/src/main/java/me/kafeitu/demo/activiti/service/activiti/WorkflowProcessDefinitionService.java
+++ b/src/main/java/me/kafeitu/demo/activiti/service/activiti/WorkflowProcessDefinitionService.java
@@ -1,13 +1,11 @@
package me.kafeitu.demo.activiti.service.activiti;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.zip.ZipInputStream;
-
+import me.kafeitu.demo.activiti.util.WorkflowUtils;
import org.activiti.engine.HistoryService;
import org.activiti.engine.RepositoryService;
import org.activiti.engine.RuntimeService;
import org.activiti.engine.history.HistoricProcessInstance;
+import org.activiti.engine.repository.Deployment;
import org.activiti.engine.repository.ProcessDefinition;
import org.apache.commons.lang3.ArrayUtils;
import org.slf4j.Logger;
@@ -18,128 +16,148 @@
import org.springframework.core.io.ResourceLoader;
import org.springframework.stereotype.Service;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+import java.util.zip.ZipInputStream;
+
/**
* 工作流中流程以及流程实例相关Service
- *
- * @author HenryYan
*
+ * @author HenryYan
*/
@Service
public class WorkflowProcessDefinitionService {
- protected Logger logger = LoggerFactory.getLogger(getClass());
-
- @Autowired
- protected RuntimeService runtimeService;
-
- @Autowired
- protected RepositoryService repositoryService;
-
- @Autowired
- protected HistoryService historyService;
-
- /**
- * 根据流程实例ID查询流程定义对象{@link ProcessDefinition}
- * @param processInstanceId 流程实例ID
- * @return 流程定义对象{@link ProcessDefinition}
- */
- public ProcessDefinition findProcessDefinitionByPid(String processInstanceId) {
- HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery()
- .processInstanceId(processInstanceId).singleResult();
- String processDefinitionId = historicProcessInstance.getProcessDefinitionId();
- ProcessDefinition processDefinition = findProcessDefinition(processDefinitionId);
- return processDefinition;
- }
-
- /**
- * 根据流程定义ID查询流程定义对象{@link ProcessDefinition}
- * @param processDefinitionId 流程定义对象ID
- * @return 流程定义对象{@link ProcessDefinition}
- */
- public ProcessDefinition findProcessDefinition(String processDefinitionId) {
- ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery()
- .processDefinitionId(processDefinitionId).singleResult();
- return processDefinition;
- }
-
- /**
- * 部署classpath下面的流程定义
- * 从属性配置文件中获取属性workflow.modules扫描**deployments**
- * 然后从每个**deployments/${module}**查找在属性配置文件中的属性**workflow.module.keys.${submodule}**
- *
配置实例：
- *
- * #workflow for deploy
- * workflow.modules=budget,erp,oa
- * workflow.module.keys.budget=budget
- * workflow.module.keys.erp=acceptInsurance,billing,effectInsurance,endorsement,payment
- * workflow.module.keys.oa=caruse,leave,officalstamp,officesupply,out,overtime
- *
- * @param processKey 流程定义KEY
- * @throws Exception
- */
- public void deployFromClasspath(String... processKey) throws Exception {
- ResourceLoader resourceLoader = new DefaultResourceLoader();
- String[] processKeys = { "leave", "leave-dynamic-from", "leave-formkey", "dispatch" };
- for (String loopProcessKey : processKeys) {
-
- /*
- * 需要过滤指定流程
- */
- if (ArrayUtils.isNotEmpty(processKey)) {
- if (ArrayUtils.contains(processKey, loopProcessKey)) {
- logger.debug("hit module of {}", processKey);
- deploySingleProcess(resourceLoader, loopProcessKey);
- } else {
- logger.debug("module: {} not equals process key: {}, ignore and continue find next.", loopProcessKey,
- processKey);
- }
- } else {
- /*
- * 所有流程
- */
- deploySingleProcess(resourceLoader, loopProcessKey);
- }
- }
- }
-
- /**
- * 部署单个流程定义
- * @param resourceLoader {@link ResourceLoader}
- * @param processKey 模块名称
- * @param subModule 流程定义名称
- * @throws IOException 找不到zip文件时
- */
- private void deploySingleProcess(ResourceLoader resourceLoader, String processKey) throws IOException {
- String classpathResourceUrl = "classpath:/deployments/" + processKey + ".bar";
- logger.debug("read workflow from: {}", classpathResourceUrl);
- Resource resource = resourceLoader.getResource(classpathResourceUrl);
- InputStream inputStream = resource.getInputStream();
- if (inputStream == null) {
- logger.warn("ignore deploy workflow module: {}", classpathResourceUrl);
- } else {
- logger.debug("finded workflow module: {}, deploy it!", classpathResourceUrl);
- ZipInputStream zis = new ZipInputStream(inputStream);
- repositoryService.createDeployment().addZipInputStream(zis).deploy();
- }
- }
-
- /**
- * 重新部署单个流程定义
- * @param processKey 流程定义KEY
- * @throws Exception
- * @see #deployFromClasspath
- */
- public void redeploy(String... processKey) throws Exception {
- this.deployFromClasspath(processKey);
- }
-
- /**
- * 重新部署所有流程定义，调用：{@link #deployFromClasspath()}完成功能
- * @throws Exception
- * @see #deployFromClasspath
- */
- public void deployAllFromClasspath() throws Exception {
- this.deployFromClasspath();
- }
+ protected Logger logger = LoggerFactory.getLogger(getClass());
+
+ @Autowired
+ protected RuntimeService runtimeService;
+
+ @Autowired
+ protected RepositoryService repositoryService;
+
+ @Autowired
+ protected HistoryService historyService;
+
+ /**
+ * 根据流程实例ID查询流程定义对象{@link ProcessDefinition}
+ *
+ * @param processInstanceId 流程实例ID
+ * @return 流程定义对象{@link ProcessDefinition}
+ */
+ public ProcessDefinition findProcessDefinitionByPid(String processInstanceId) {
+ HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
+ String processDefinitionId = historicProcessInstance.getProcessDefinitionId();
+ ProcessDefinition processDefinition = findProcessDefinition(processDefinitionId);
+ return processDefinition;
+ }
+
+ /**
+ * 根据流程定义ID查询流程定义对象{@link ProcessDefinition}
+ *
+ * @param processDefinitionId 流程定义对象ID
+ * @return 流程定义对象{@link ProcessDefinition}
+ */
+ public ProcessDefinition findProcessDefinition(String processDefinitionId) {
+ ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(processDefinitionId).singleResult();
+ return processDefinition;
+ }
+
+ /**
+ * 部署classpath下面的流程定义
+ *
+ * 从属性配置文件中获取属性workflow.modules扫描**deployments**
+ *
+ *
+ * 然后从每个**deployments/${module}**查找在属性配置文件中的属性**workflow.module.keys.${
+ * submodule}**
+ *
+ * 配置实例：
+ *
+ *
+ * #workflow for deploy
+ * workflow.modules=budget,erp,oa
+ * workflow.module.keys.budget=budget
+ * workflow.module.keys.erp=acceptInsurance,billing,effectInsurance,endorsement,payment
+ * workflow.module.keys.oa=caruse,leave,officalstamp,officesupply,out,overtime
+ *
+ *
+ *
+ *
+ * @param processKey 流程定义KEY
+ * @throws Exception
+ */
+ public void deployFromClasspath(String exportDir, String... processKey) throws Exception {
+ ResourceLoader resourceLoader = new DefaultResourceLoader();
+ String[] processKeys = {"leave", "leave-dynamic-from", "leave-formkey", "dispatch"};
+ for (String loopProcessKey : processKeys) {
+
+ /*
+ * 需要过滤指定流程
+ */
+ if (ArrayUtils.isNotEmpty(processKey)) {
+ if (ArrayUtils.contains(processKey, loopProcessKey)) {
+ logger.debug("hit module of {}", (Object[]) processKey);
+ deploySingleProcess(resourceLoader, loopProcessKey, exportDir);
+ } else {
+ logger.debug("module: {} not equals process key: {}, ignore and continue find next.", loopProcessKey, processKey);
+ }
+ } else {
+ /*
+ * 所有流程
+ */
+ deploySingleProcess(resourceLoader, loopProcessKey, exportDir);
+ }
+ }
+ }
+
+ /**
+ * 部署单个流程定义
+ *
+ * @param resourceLoader {@link ResourceLoader}
+ * @param processKey 模块名称
+ * @throws IOException 找不到zip文件时
+ */
+ private void deploySingleProcess(ResourceLoader resourceLoader, String processKey, String exportDir) throws IOException {
+ String classpathResourceUrl = "classpath:/deployments/" + processKey + ".bar";
+ logger.debug("read workflow from: {}", classpathResourceUrl);
+ Resource resource = resourceLoader.getResource(classpathResourceUrl);
+ InputStream inputStream = resource.getInputStream();
+ if (inputStream == null) {
+ logger.warn("ignore deploy workflow module: {}", classpathResourceUrl);
+ } else {
+ logger.debug("finded workflow module: {}, deploy it!", classpathResourceUrl);
+ ZipInputStream zis = new ZipInputStream(inputStream);
+ Deployment deployment = repositoryService.createDeployment().addZipInputStream(zis).deploy();
+
+ // export diagram
+ List list = repositoryService.createProcessDefinitionQuery().deploymentId(deployment.getId()).list();
+ for (ProcessDefinition processDefinition : list) {
+ WorkflowUtils.exportDiagramToFile(repositoryService, processDefinition, exportDir);
+ }
+ }
+ }
+
+ /**
+ * 重新部署单个流程定义
+ *
+ * @param processKey 流程定义KEY
+ * @throws Exception
+ * @see #deployFromClasspath
+ */
+ public void redeploy(String exportDir, String... processKey) throws Exception {
+ this.deployFromClasspath(exportDir, processKey);
+ }
+
+ /**
+ * 重新部署所有流程定义，调用：{@link #deployFromClasspath()}完成功能
+ *
+ * @throws Exception
+ * @see #deployFromClasspath
+ */
+ public void deployAllFromClasspath(String exportDir) throws Exception {
+ this.deployFromClasspath(exportDir);
+ }
}
diff --git a/src/main/java/me/kafeitu/demo/activiti/service/activiti/WorkflowTraceService.java b/src/main/java/me/kafeitu/demo/activiti/service/activiti/WorkflowTraceService.java
index 65736b7b93..8eadf03dd2 100644
--- a/src/main/java/me/kafeitu/demo/activiti/service/activiti/WorkflowTraceService.java
+++ b/src/main/java/me/kafeitu/demo/activiti/service/activiti/WorkflowTraceService.java
@@ -1,13 +1,6 @@
package me.kafeitu.demo.activiti.service.activiti;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
import me.kafeitu.demo.activiti.util.WorkflowUtils;
-
import org.activiti.engine.IdentityService;
import org.activiti.engine.RepositoryService;
import org.activiti.engine.RuntimeService;
@@ -24,12 +17,14 @@
import org.activiti.engine.runtime.ProcessInstance;
import org.activiti.engine.task.Task;
import org.apache.commons.beanutils.PropertyUtils;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import java.util.*;
+
/**
* 工作流跟踪相关Service
*
@@ -37,181 +32,184 @@
*/
@Component
public class WorkflowTraceService {
- protected Logger logger = LoggerFactory.getLogger(getClass());
-
- @Autowired
- protected RuntimeService runtimeService;
-
- @Autowired
- protected TaskService taskService;
-
- @Autowired
- protected RepositoryService repositoryService;
-
- @Autowired
- protected IdentityService identityService;
-
- /**
- * 流程跟踪图
- * @param processInstanceId 流程实例ID
- * @return 封装了各种节点信息
- */
- public List> traceProcess(String processInstanceId) throws Exception {
- Execution execution = runtimeService.createExecutionQuery().executionId(processInstanceId).singleResult();//执行实例
- Object property = PropertyUtils.getProperty(execution, "activityId");
- String activityId = "";
- if (property != null) {
- activityId = property.toString();
- }
- ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId)
- .singleResult();
- ProcessDefinitionEntity processDefinition = (ProcessDefinitionEntity) ((RepositoryServiceImpl) repositoryService)
- .getDeployedProcessDefinition(processInstance.getProcessDefinitionId());
- List activitiList = processDefinition.getActivities();//获得当前任务的所有节点
-
- List> activityInfos = new ArrayList>();
- for (ActivityImpl activity : activitiList) {
-
- boolean currentActiviti = false;
- String id = activity.getId();
-
- // 当前节点
- if (id.equals(activityId)) {
- currentActiviti = true;
- }
-
- Map activityImageInfo = packageSingleActivitiInfo(activity, processInstance, currentActiviti);
-
- activityInfos.add(activityImageInfo);
- }
-
- return activityInfos;
- }
-
- /**
- * 封装输出信息，包括：当前节点的X、Y坐标、变量信息、任务类型、任务描述
- * @param activity
- * @param processInstance
- * @param currentActiviti
- * @return
- */
- private Map packageSingleActivitiInfo(ActivityImpl activity, ProcessInstance processInstance,
- boolean currentActiviti) throws Exception {
- Map vars = new HashMap();
- Map activityInfo = new HashMap();
- activityInfo.put("currentActiviti", currentActiviti);
- setPosition(activity, activityInfo);
- setWidthAndHeight(activity, activityInfo);
-
- Map properties = activity.getProperties();
- vars.put("任务类型", WorkflowUtils.parseToZhType(properties.get("type").toString()));
-
- ActivityBehavior activityBehavior = activity.getActivityBehavior();
- logger.debug("activityBehavior={}", activityBehavior);
- if (activityBehavior instanceof UserTaskActivityBehavior) {
-
- Task currentTask = null;
+ protected Logger logger = LoggerFactory.getLogger(getClass());
+
+ @Autowired
+ protected RuntimeService runtimeService;
+
+ @Autowired
+ protected TaskService taskService;
+
+ @Autowired
+ protected RepositoryService repositoryService;
+
+ @Autowired
+ protected IdentityService identityService;
+
+ /**
+ * 流程跟踪图
+ *
+ * @param processInstanceId 流程实例ID
+ * @return 封装了各种节点信息
+ */
+ public List> traceProcess(String processInstanceId) throws Exception {
+ Execution execution = runtimeService.createExecutionQuery().executionId(processInstanceId).singleResult();//执行实例
+ Object property = PropertyUtils.getProperty(execution, "activityId");
+ String activityId = "";
+ if (property != null) {
+ activityId = property.toString();
+ }
+ ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId)
+ .singleResult();
+ ProcessDefinitionEntity processDefinition = (ProcessDefinitionEntity) ((RepositoryServiceImpl) repositoryService)
+ .getDeployedProcessDefinition(processInstance.getProcessDefinitionId());
+ List activitiList = processDefinition.getActivities();//获得当前任务的所有节点
+
+ List> activityInfos = new ArrayList>();
+ for (ActivityImpl activity : activitiList) {
+
+ boolean currentActiviti = false;
+ String id = activity.getId();
+
+ // 当前节点
+ if (id.equals(activityId)) {
+ currentActiviti = true;
+ }
+
+ Map activityImageInfo = packageSingleActivitiInfo(activity, processInstance, currentActiviti);
+
+ activityInfos.add(activityImageInfo);
+ }
+
+ return activityInfos;
+ }
+
+ /**
+ * 封装输出信息，包括：当前节点的X、Y坐标、变量信息、任务类型、任务描述
+ *
+ * @param activity
+ * @param processInstance
+ * @param currentActiviti
+ * @return
+ */
+ private Map packageSingleActivitiInfo(ActivityImpl activity, ProcessInstance processInstance,
+ boolean currentActiviti) throws Exception {
+ Map vars = new HashMap();
+ Map activityInfo = new HashMap();
+ activityInfo.put("currentActiviti", currentActiviti);
+ setPosition(activity, activityInfo);
+ setWidthAndHeight(activity, activityInfo);
+
+ Map properties = activity.getProperties();
+ vars.put("任务类型", WorkflowUtils.parseToZhType(properties.get("type").toString()));
+
+ ActivityBehavior activityBehavior = activity.getActivityBehavior();
+ logger.debug("activityBehavior={}", activityBehavior);
+ if (activityBehavior instanceof UserTaskActivityBehavior) {
+
+ Task currentTask = null;
/*
- * 当前节点的task
+ * 当前节点的task
*/
- if (currentActiviti) {
- currentTask = getCurrentTaskInfo(processInstance);
- }
+ if (currentActiviti) {
+ currentTask = getCurrentTaskInfo(processInstance);
+ }
/*
* 当前任务的分配角色
*/
- UserTaskActivityBehavior userTaskActivityBehavior = (UserTaskActivityBehavior) activityBehavior;
- TaskDefinition taskDefinition = userTaskActivityBehavior.getTaskDefinition();
- Set candidateGroupIdExpressions = taskDefinition.getCandidateGroupIdExpressions();
- if (!candidateGroupIdExpressions.isEmpty()) {
-
- // 任务的处理角色
- setTaskGroup(vars, candidateGroupIdExpressions);
-
- // 当前处理人
- if (currentTask != null) {
- setCurrentTaskAssignee(vars, currentTask);
- }
- }
- }
-
- vars.put("节点说明", properties.get("documentation"));
-
- String description = activity.getProcessDefinition().getDescription();
- vars.put("描述", description);
-
- logger.debug("trace variables: {}", vars);
- activityInfo.put("vars", vars);
- return activityInfo;
- }
-
- private void setTaskGroup(Map vars, Set candidateGroupIdExpressions) {
- String roles = "";
- for (Expression expression : candidateGroupIdExpressions) {
- String expressionText = expression.getExpressionText();
- if (expressionText.startsWith("$")) {
- expressionText = expressionText.replace("${insuranceType}", "life");
- }
- String roleName = identityService.createGroupQuery().groupId(expressionText).singleResult().getName();
- roles += roleName;
- }
- vars.put("任务所属角色", roles);
- }
-
- /**
- * 设置当前处理人信息
- * @param vars
- * @param currentTask
- */
- private void setCurrentTaskAssignee(Map vars, Task currentTask) {
- String assignee = currentTask.getAssignee();
- if (assignee != null) {
- User assigneeUser = identityService.createUserQuery().userId(assignee).singleResult();
- String userInfo = assigneeUser.getFirstName() + " " + assigneeUser.getLastName();
- vars.put("当前处理人", userInfo);
- }
- }
-
- /**
- * 获取当前节点信息
- * @param processInstance
- * @return
- */
- private Task getCurrentTaskInfo(ProcessInstance processInstance) {
- Task currentTask = null;
- try {
- String activitiId = (String) PropertyUtils.getProperty(processInstance, "activityId");
- logger.debug("current activity id: {}", activitiId);
-
- currentTask = taskService.createTaskQuery().processInstanceId(processInstance.getId()).taskDefinitionKey(activitiId)
- .singleResult();
- logger.debug("current task for processInstance: {}", ToStringBuilder.reflectionToString(currentTask));
-
- } catch (Exception e) {
- logger.error("can not get property activityId from processInstance: {}", processInstance);
- }
- return currentTask;
- }
-
- /**
- * 设置宽度、高度属性
- * @param activity
- * @param activityInfo
- */
- private void setWidthAndHeight(ActivityImpl activity, Map activityInfo) {
- activityInfo.put("width", activity.getWidth());
- activityInfo.put("height", activity.getHeight());
- }
-
- /**
- * 设置坐标位置
- * @param activity
- * @param activityInfo
- */
- private void setPosition(ActivityImpl activity, Map activityInfo) {
- activityInfo.put("x", activity.getX());
- activityInfo.put("y", activity.getY());
- }
+ UserTaskActivityBehavior userTaskActivityBehavior = (UserTaskActivityBehavior) activityBehavior;
+ TaskDefinition taskDefinition = userTaskActivityBehavior.getTaskDefinition();
+ Set candidateGroupIdExpressions = taskDefinition.getCandidateGroupIdExpressions();
+ if (!candidateGroupIdExpressions.isEmpty()) {
+
+ // 任务的处理角色
+ setTaskGroup(vars, candidateGroupIdExpressions);
+
+ // 当前处理人
+ if (currentTask != null) {
+ setCurrentTaskAssignee(vars, currentTask);
+ }
+ }
+ }
+
+ vars.put("节点说明", properties.get("documentation"));
+
+ String description = activity.getProcessDefinition().getDescription();
+ vars.put("描述", description);
+
+ logger.debug("trace variables: {}", vars);
+ activityInfo.put("vars", vars);
+ return activityInfo;
+ }
+
+ private void setTaskGroup(Map vars, Set candidateGroupIdExpressions) {
+ String roles = "";
+ for (Expression expression : candidateGroupIdExpressions) {
+ String expressionText = expression.getExpressionText();
+ String roleName = identityService.createGroupQuery().groupId(expressionText).singleResult().getName();
+ roles += roleName;
+ }
+ vars.put("任务所属角色", roles);
+ }
+
+ /**
+ * 设置当前处理人信息
+ *
+ * @param vars
+ * @param currentTask
+ */
+ private void setCurrentTaskAssignee(Map vars, Task currentTask) {
+ String assignee = currentTask.getAssignee();
+ if (assignee != null) {
+ User assigneeUser = identityService.createUserQuery().userId(assignee).singleResult();
+ String userInfo = assigneeUser.getFirstName() + " " + assigneeUser.getLastName();
+ vars.put("当前处理人", userInfo);
+ }
+ }
+
+ /**
+ * 获取当前节点信息
+ *
+ * @param processInstance
+ * @return
+ */
+ private Task getCurrentTaskInfo(ProcessInstance processInstance) {
+ Task currentTask = null;
+ try {
+ String activitiId = (String) PropertyUtils.getProperty(processInstance, "activityId");
+ logger.debug("current activity id: {}", activitiId);
+
+ currentTask = taskService.createTaskQuery().processInstanceId(processInstance.getId()).taskDefinitionKey(activitiId)
+ .singleResult();
+ logger.debug("current task for processInstance: {}", ToStringBuilder.reflectionToString(currentTask));
+
+ } catch (Exception e) {
+ logger.error("can not get property activityId from processInstance: {}", processInstance);
+ }
+ return currentTask;
+ }
+
+ /**
+ * 设置宽度、高度属性
+ *
+ * @param activity
+ * @param activityInfo
+ */
+ private void setWidthAndHeight(ActivityImpl activity, Map activityInfo) {
+ activityInfo.put("width", activity.getWidth());
+ activityInfo.put("height", activity.getHeight());
+ }
+
+ /**
+ * 设置坐标位置
+ *
+ * @param activity
+ * @param activityInfo
+ */
+ private void setPosition(ActivityImpl activity, Map activityInfo) {
+ activityInfo.put("x", activity.getX());
+ activityInfo.put("y", activity.getY());
+ }
}
diff --git a/src/main/java/me/kafeitu/demo/activiti/service/oa/dispatch/DispatchWorkflowService.java b/src/main/java/me/kafeitu/demo/activiti/service/oa/dispatch/DispatchWorkflowService.java
index 99712b223f..b5fc327617 100644
--- a/src/main/java/me/kafeitu/demo/activiti/service/oa/dispatch/DispatchWorkflowService.java
+++ b/src/main/java/me/kafeitu/demo/activiti/service/oa/dispatch/DispatchWorkflowService.java
@@ -5,7 +5,7 @@
import org.activiti.engine.RuntimeService;
import org.activiti.engine.TaskService;
import org.activiti.engine.runtime.Execution;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -13,53 +13,53 @@
/**
* 发文会签流程Service
- *
+ *
* @author henryyan
*/
@Service
public class DispatchWorkflowService {
- private Logger logger = LoggerFactory.getLogger(getClass());
+ private Logger logger = LoggerFactory.getLogger(getClass());
- @Autowired
- protected RuntimeService runtimeService;
+ @Autowired
+ protected RuntimeService runtimeService;
- @Autowired
- protected TaskService taskService;
+ @Autowired
+ protected TaskService taskService;
- @Autowired
- protected HistoryService historyService;
+ @Autowired
+ protected HistoryService historyService;
- @Autowired
- private IdentityService identityService;
+ @Autowired
+ private IdentityService identityService;
- /**
- * 是否允许结束会签（多实例）
- * 参数的含义请参考用户手册
- */
- public Boolean canComplete(Execution execution, Integer rate, Integer nrOfInstances, Integer nrOfActiveInstances, Integer nrOfCompletedInstances,
- Integer loopCounter) {
- String agreeCounterName = "agreeCounter";
- Object agreeCounter = runtimeService.getVariable(execution.getId(), agreeCounterName);
-
- if (agreeCounter == null) {
- // 初始化计数器
- runtimeService.setVariable(execution.getId(), agreeCounterName, 1);
- } else {
- // 计数器累加
- Integer integerCounter = (Integer) runtimeService.getVariable(execution.getId(), agreeCounterName);
- runtimeService.setVariable(execution.getId(), agreeCounterName, ++integerCounter);
+ /**
+ * 是否允许结束会签（多实例）
+ * 参数的含义请参考用户手册
+ */
+ public Boolean canComplete(Execution execution, Integer rate, Integer nrOfInstances, Integer nrOfActiveInstances, Integer nrOfCompletedInstances,
+ Integer loopCounter) {
+ String agreeCounterName = "agreeCounter";
+ Object agreeCounter = runtimeService.getVariable(execution.getId(), agreeCounterName);
+
+ if (agreeCounter == null) {
+ // 初始化计数器
+ runtimeService.setVariable(execution.getId(), agreeCounterName, 1);
+ } else {
+ // 计数器累加
+ Integer integerCounter = (Integer) runtimeService.getVariable(execution.getId(), agreeCounterName);
+ runtimeService.setVariable(execution.getId(), agreeCounterName, ++integerCounter);
+ }
+
+ logger.debug("execution: {}" + ToStringBuilder.reflectionToString(execution));
+ logger.debug("rate={}, nrOfInstances={}, nrOfActiveInstances={}, nrOfComptetedInstances={}, loopCounter={}", new Object[]{rate, nrOfInstances,
+ nrOfActiveInstances, nrOfCompletedInstances, loopCounter});
+
+ // 计算通过的比例，以此决定是否结束会签
+ Double completeRate = new Double(nrOfCompletedInstances) / nrOfInstances;
+ boolean canComlete = completeRate * 100 >= rate;
+ logger.debug("rate: {}, completeRate: {}, canComlete={}", new Object[]{rate, completeRate, canComlete});
+ return canComlete;
}
-
- logger.debug("execution: {}" + ToStringBuilder.reflectionToString(execution));
- logger.debug("rate={}, nrOfInstances={}, nrOfActiveInstances={}, nrOfComptetedInstances={}, loopCounter={}", new Object[] { rate, nrOfInstances,
- nrOfActiveInstances, nrOfCompletedInstances, loopCounter });
-
- // 计算通过的比例，以此决定是否结束会签
- Double completeRate = new Double(nrOfCompletedInstances) / nrOfInstances;
- boolean canComlete = completeRate * 100 >= rate;
- logger.debug("rate: {}, completeRate: {}, canComlete={}", new Object[] { rate, completeRate, canComlete });
- return canComlete;
- }
}
diff --git a/src/main/java/me/kafeitu/demo/activiti/service/oa/leave/AfterModifyApplyContentProcessor.java b/src/main/java/me/kafeitu/demo/activiti/service/oa/leave/AfterModifyApplyContentProcessor.java
index d9341970ac..6ba7eea5b2 100644
--- a/src/main/java/me/kafeitu/demo/activiti/service/oa/leave/AfterModifyApplyContentProcessor.java
+++ b/src/main/java/me/kafeitu/demo/activiti/service/oa/leave/AfterModifyApplyContentProcessor.java
@@ -1,9 +1,6 @@
package me.kafeitu.demo.activiti.service.oa.leave;
-import java.util.Date;
-
import me.kafeitu.demo.activiti.entity.oa.Leave;
-
import org.activiti.engine.RuntimeService;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
@@ -12,6 +9,8 @@
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
+import java.util.Date;
+
/**
* 调整请假内容处理器
*
@@ -20,27 +19,29 @@
@Component
@Transactional
public class AfterModifyApplyContentProcessor implements TaskListener {
-
- @Autowired
- LeaveManager leaveManager;
-
- @Autowired
- RuntimeService runtimeService;
-
- /* (non-Javadoc)
- * @see org.activiti.engine.delegate.TaskListener#notify(org.activiti.engine.delegate.DelegateTask)
- */
- public void notify(DelegateTask delegateTask) {
- String processInstanceId = delegateTask.getProcessInstanceId();
- ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
- Leave leave = leaveManager.getLeave(new Long(processInstance.getBusinessKey()));
-
- leave.setLeaveType((String) delegateTask.getVariable("leaveType"));
- leave.setStartTime((Date) delegateTask.getVariable("startTime"));
- leave.setEndTime((Date) delegateTask.getVariable("endTime"));
- leave.setReason((String) delegateTask.getVariable("reason"));
-
- leaveManager.saveLeave(leave);
- }
+
+ private static final long serialVersionUID = 1L;
+
+ @Autowired
+ LeaveManager leaveManager;
+
+ @Autowired
+ RuntimeService runtimeService;
+
+ /* (non-Javadoc)
+ * @see org.activiti.engine.delegate.TaskListener#notify(org.activiti.engine.delegate.DelegateTask)
+ */
+ public void notify(DelegateTask delegateTask) {
+ String processInstanceId = delegateTask.getProcessInstanceId();
+ ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
+ Leave leave = leaveManager.getLeave(new Long(processInstance.getBusinessKey()));
+
+ leave.setLeaveType((String) delegateTask.getVariable("leaveType"));
+ leave.setStartTime((Date) delegateTask.getVariable("startTime"));
+ leave.setEndTime((Date) delegateTask.getVariable("endTime"));
+ leave.setReason((String) delegateTask.getVariable("reason"));
+
+ leaveManager.saveLeave(leave);
+ }
}
diff --git a/src/main/java/me/kafeitu/demo/activiti/service/oa/leave/LeaveEntityManager.java b/src/main/java/me/kafeitu/demo/activiti/service/oa/leave/LeaveEntityManager.java
new file mode 100644
index 0000000000..92846e711c
--- /dev/null
+++ b/src/main/java/me/kafeitu/demo/activiti/service/oa/leave/LeaveEntityManager.java
@@ -0,0 +1,45 @@
+package me.kafeitu.demo.activiti.service.oa.leave;
+
+import java.util.Date;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import me.kafeitu.demo.activiti.entity.oa.LeaveJpaEntity;
+import org.activiti.engine.delegate.DelegateExecution;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 请假实体JPA 实体管理器
+ * @author: Henry Yan
+ */
+@Service
+public class LeaveEntityManager {
+
+ @PersistenceContext
+ private EntityManager entityManager;
+
+ @Transactional
+ public LeaveJpaEntity newLeave(DelegateExecution execution) {
+ LeaveJpaEntity leave = new LeaveJpaEntity();
+ leave.setProcessInstanceId(execution.getProcessInstanceId());
+ leave.setUserId(execution.getVariable("applyUserId").toString());
+ leave.setStartTime((Date) execution.getVariable("startTime"));
+ leave.setEndTime((Date) execution.getVariable("endTime"));
+ leave.setLeaveType(execution.getVariable("leaveType").toString());
+ leave.setReason(execution.getVariable("reason").toString());
+ leave.setApplyTime(new Date());
+ entityManager.persist(leave);
+ return leave;
+ }
+
+ @Transactional
+ public void save(LeaveJpaEntity leave) {
+ entityManager.persist(leave);
+ }
+
+ public LeaveJpaEntity getLeave(Long id) {
+ return entityManager.find(LeaveJpaEntity.class, id);
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/me/kafeitu/demo/activiti/service/oa/leave/LeaveManager.java b/src/main/java/me/kafeitu/demo/activiti/service/oa/leave/LeaveManager.java
index 29afaac02b..d6c0d87b28 100644
--- a/src/main/java/me/kafeitu/demo/activiti/service/oa/leave/LeaveManager.java
+++ b/src/main/java/me/kafeitu/demo/activiti/service/oa/leave/LeaveManager.java
@@ -1,14 +1,13 @@
package me.kafeitu.demo.activiti.service.oa.leave;
-import java.util.Date;
-
import me.kafeitu.demo.activiti.dao.LeaveDao;
import me.kafeitu.demo.activiti.entity.oa.Leave;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
+import java.util.Date;
+
/**
* 请假实体管理
*
@@ -18,23 +17,23 @@
@Transactional(readOnly = true)
public class LeaveManager {
- private LeaveDao leaveDao;
+ private LeaveDao leaveDao;
- public Leave getLeave(Long id) {
- return leaveDao.findOne(id);
- }
+ public Leave getLeave(Long id) {
+ return leaveDao.findOne(id);
+ }
- @Transactional(readOnly = false)
- public void saveLeave(Leave entity) {
- if (entity.getId() == null) {
- entity.setApplyTime(new Date());
- }
- leaveDao.save(entity);
- }
+ @Transactional(readOnly = false)
+ public void saveLeave(Leave entity) {
+ if (entity.getId() == null) {
+ entity.setApplyTime(new Date());
+ }
+ leaveDao.save(entity);
+ }
- @Autowired
- public void setLeaveDao(LeaveDao leaveDao) {
- this.leaveDao = leaveDao;
- }
+ @Autowired
+ public void setLeaveDao(LeaveDao leaveDao) {
+ this.leaveDao = leaveDao;
+ }
}
diff --git a/src/main/java/me/kafeitu/demo/activiti/service/oa/leave/LeaveProcessEndListener.java b/src/main/java/me/kafeitu/demo/activiti/service/oa/leave/LeaveProcessEndListener.java
new file mode 100644
index 0000000000..8c04c7436a
--- /dev/null
+++ b/src/main/java/me/kafeitu/demo/activiti/service/oa/leave/LeaveProcessEndListener.java
@@ -0,0 +1,33 @@
+package me.kafeitu.demo.activiti.service.oa.leave;
+
+import me.kafeitu.demo.activiti.dao.ActivitiDao;
+import org.activiti.engine.delegate.DelegateExecution;
+import org.activiti.engine.delegate.ExecutionListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 请假流程结束监听器
+ *
+ * @author: Henry Yan
+ */
+@Service
+@Transactional
+public class LeaveProcessEndListener implements ExecutionListener {
+
+ protected Logger logger = LoggerFactory.getLogger(getClass());
+
+ @Autowired
+ ActivitiDao activitiDao;
+
+ @Override
+ public void notify(DelegateExecution execution) throws Exception {
+ String processInstanceId = execution.getProcessInstanceId();
+
+ int i = activitiDao.deleteFormPropertyByProcessInstanceId(processInstanceId);
+ logger.debug("清理了 {} 条历史表单数据", i);
+ }
+}
diff --git a/src/main/java/me/kafeitu/demo/activiti/service/oa/leave/LeaveWorkflowService.java b/src/main/java/me/kafeitu/demo/activiti/service/oa/leave/LeaveWorkflowService.java
index d21ebc1ff6..66246b9dc4 100644
--- a/src/main/java/me/kafeitu/demo/activiti/service/oa/leave/LeaveWorkflowService.java
+++ b/src/main/java/me/kafeitu/demo/activiti/service/oa/leave/LeaveWorkflowService.java
@@ -5,16 +5,19 @@
import java.util.Map;
import me.kafeitu.demo.activiti.entity.oa.Leave;
-
+import me.kafeitu.demo.activiti.util.Page;
import org.activiti.engine.HistoryService;
import org.activiti.engine.IdentityService;
import org.activiti.engine.RepositoryService;
import org.activiti.engine.RuntimeService;
import org.activiti.engine.TaskService;
import org.activiti.engine.history.HistoricProcessInstance;
+import org.activiti.engine.history.HistoricProcessInstanceQuery;
import org.activiti.engine.repository.ProcessDefinition;
import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.engine.runtime.ProcessInstanceQuery;
import org.activiti.engine.task.Task;
+import org.activiti.engine.task.TaskQuery;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,160 +33,173 @@
@Transactional
public class LeaveWorkflowService {
- private static Logger logger = LoggerFactory.getLogger(LeaveWorkflowService.class);
-
- private LeaveManager leaveManager;
-
- private RuntimeService runtimeService;
-
- protected TaskService taskService;
-
- protected HistoryService historyService;
-
- protected RepositoryService repositoryService;
-
- @Autowired
- private IdentityService identityService;
-
- /**
- * 启动流程
- * @param entity
- */
- public ProcessInstance startWorkflow(Leave entity, Map variables) {
- leaveManager.saveLeave(entity);
- logger.debug("save entity: {}", entity);
- String businessKey = entity.getId().toString();
-
- // 用来设置启动流程的人员ID，引擎会自动把用户ID保存到activiti:initiator中
- identityService.setAuthenticatedUserId(entity.getUserId());
-
- ProcessInstance processInstance = runtimeService.startProcessInstanceByKey("leave", businessKey, variables);
- String processInstanceId = processInstance.getId();
- entity.setProcessInstanceId(processInstanceId);
- logger.debug("start process of {key={}, bkey={}, pid={}, variables={}}", new Object[] { "leave", businessKey,
- processInstanceId, variables });
- return processInstance;
- }
-
- /**
- * 查询待办任务
- *
- * @param userId 用户ID
- * @return
- */
- @Transactional(readOnly = true)
- public List findTodoTasks(String userId) {
- List results = new ArrayList();
- List tasks = new ArrayList();
-
- // 根据当前人的ID查询
- List todoList = taskService.createTaskQuery().processDefinitionKey("leave").taskAssignee(userId).active().orderByTaskPriority().desc()
- .orderByTaskCreateTime().desc().list();
-
- // 根据当前人未签收的任务
- List unsignedTasks = taskService.createTaskQuery().processDefinitionKey("leave").taskCandidateUser(userId).active().orderByTaskPriority().desc()
- .orderByTaskCreateTime().desc().list();
-
- // 合并
- tasks.addAll(todoList);
- tasks.addAll(unsignedTasks);
-
- // 根据流程的业务ID查询实体并关联
- for (Task task : tasks) {
- String processInstanceId = task.getProcessInstanceId();
- ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).active()
- .singleResult();
- String businessKey = processInstance.getBusinessKey();
- Leave leave = leaveManager.getLeave(new Long(businessKey));
- leave.setTask(task);
- leave.setProcessInstance(processInstance);
- leave.setProcessDefinition(getProcessDefinition(processInstance.getProcessDefinitionId()));
- results.add(leave);
- }
- return results;
- }
-
- /**
- * 读取运行中的流程
- * @return
- */
- @Transactional(readOnly = true)
- public List findRunningProcessInstaces() {
- List results = new ArrayList();
- List list = runtimeService.createProcessInstanceQuery().processDefinitionKey("leave").active().list();
-
- // 关联业务实体
- for (ProcessInstance processInstance : list) {
- String businessKey = processInstance.getBusinessKey();
- Leave leave = leaveManager.getLeave(new Long(businessKey));
- leave.setProcessInstance(processInstance);
- leave.setProcessDefinition(getProcessDefinition(processInstance.getProcessDefinitionId()));
- results.add(leave);
-
- // 设置当前任务信息
- List tasks = taskService.createTaskQuery().processInstanceId(processInstance.getId()).active().orderByTaskCreateTime()
- .desc().listPage(0, 1);
- leave.setTask(tasks.get(0));
-
- }
- return results;
- }
-
- /**
- * 读取运行中的流程
- * @return
- */
- @Transactional(readOnly = true)
- public List findFinishedProcessInstaces() {
- List results = new ArrayList();
- List list = historyService.createHistoricProcessInstanceQuery().processDefinitionKey("leave")
- .finished().list();
-
- // 关联业务实体
- for (HistoricProcessInstance historicProcessInstance : list) {
- String businessKey = historicProcessInstance.getBusinessKey();
- Leave leave = leaveManager.getLeave(new Long(businessKey));
- leave.setProcessDefinition(getProcessDefinition(historicProcessInstance.getProcessDefinitionId()));
- leave.setHistoricProcessInstance(historicProcessInstance);
- results.add(leave);
- }
- return results;
- }
-
- /**
- * 查询流程定义对象
- * @param processDefinitionId 流程定义ID
- * @return
- */
- protected ProcessDefinition getProcessDefinition(String processDefinitionId) {
- ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery()
- .processDefinitionId(processDefinitionId).singleResult();
- return processDefinition;
- }
-
- @Autowired
- public void setLeaveManager(LeaveManager leaveManager) {
- this.leaveManager = leaveManager;
- }
-
- @Autowired
- public void setRuntimeService(RuntimeService runtimeService) {
- this.runtimeService = runtimeService;
- }
-
- @Autowired
- public void setTaskService(TaskService taskService) {
- this.taskService = taskService;
- }
-
- @Autowired
- public void setHistoryService(HistoryService historyService) {
- this.historyService = historyService;
- }
-
- @Autowired
- public void setRepositoryService(RepositoryService repositoryService) {
- this.repositoryService = repositoryService;
- }
+ private static Logger logger = LoggerFactory.getLogger(LeaveWorkflowService.class);
+
+ private LeaveManager leaveManager;
+
+ private RuntimeService runtimeService;
+
+ protected TaskService taskService;
+
+ protected HistoryService historyService;
+
+ protected RepositoryService repositoryService;
+
+ @Autowired
+ private IdentityService identityService;
+
+ /**
+ * 启动流程
+ *
+ * @param entity
+ */
+ public ProcessInstance startWorkflow(Leave entity, Map variables) {
+ leaveManager.saveLeave(entity);
+ logger.debug("save entity: {}", entity);
+ String businessKey = entity.getId().toString();
+
+ ProcessInstance processInstance = null;
+ try {
+ // 用来设置启动流程的人员ID，引擎会自动把用户ID保存到activiti:initiator中
+ identityService.setAuthenticatedUserId(entity.getUserId());
+
+ processInstance = runtimeService.startProcessInstanceByKey("leave", businessKey, variables);
+ String processInstanceId = processInstance.getId();
+ entity.setProcessInstanceId(processInstanceId);
+ logger.debug("start process of {key={}, bkey={}, pid={}, variables={}}", new Object[]{"leave", businessKey, processInstanceId, variables});
+ } finally {
+ identityService.setAuthenticatedUserId(null);
+ }
+ return processInstance;
+ }
+
+ /**
+ * 查询待办任务
+ *
+ * @param userId 用户ID
+ * @return
+ */
+ @Transactional(readOnly = true)
+ public List findTodoTasks(String userId, Page page, int[] pageParams) {
+ List results = new ArrayList();
+
+ // 根据当前人的ID查询
+ TaskQuery taskQuery = taskService.createTaskQuery().taskCandidateOrAssigned(userId);
+ List tasks = taskQuery.list();
+
+ // 根据流程的业务ID查询实体并关联
+ for (Task task : tasks) {
+ String processInstanceId = task.getProcessInstanceId();
+ ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).active().singleResult();
+ if (processInstance == null) {
+ continue;
+ }
+ String businessKey = processInstance.getBusinessKey();
+ if (businessKey == null) {
+ continue;
+ }
+ Leave leave = leaveManager.getLeave(new Long(businessKey));
+ leave.setTask(task);
+ leave.setProcessInstance(processInstance);
+ leave.setProcessDefinition(getProcessDefinition(processInstance.getProcessDefinitionId()));
+ results.add(leave);
+ }
+
+ page.setTotalCount(taskQuery.count());
+ page.setResult(results);
+ return results;
+ }
+
+ /**
+ * 读取运行中的流程
+ *
+ * @return
+ */
+ @Transactional(readOnly = true)
+ public List findRunningProcessInstaces(Page page, int[] pageParams) {
+ List results = new ArrayList();
+ ProcessInstanceQuery query = runtimeService.createProcessInstanceQuery().processDefinitionKey("leave").active().orderByProcessInstanceId().desc();
+ List list = query.listPage(pageParams[0], pageParams[1]);
+
+ // 关联业务实体
+ for (ProcessInstance processInstance : list) {
+ String businessKey = processInstance.getBusinessKey();
+ if (businessKey == null) {
+ continue;
+ }
+ Leave leave = leaveManager.getLeave(new Long(businessKey));
+ leave.setProcessInstance(processInstance);
+ leave.setProcessDefinition(getProcessDefinition(processInstance.getProcessDefinitionId()));
+ results.add(leave);
+
+ // 设置当前任务信息
+ List tasks = taskService.createTaskQuery().processInstanceId(processInstance.getId()).active().orderByTaskCreateTime().desc().listPage(0, 1);
+ leave.setTask(tasks.get(0));
+ }
+
+ page.setTotalCount(query.count());
+ page.setResult(results);
+ return results;
+ }
+
+ /**
+ * 读取已结束中的流程
+ *
+ * @return
+ */
+ @Transactional(readOnly = true)
+ public List findFinishedProcessInstaces(Page page, int[] pageParams) {
+ List results = new ArrayList();
+ HistoricProcessInstanceQuery query = historyService.createHistoricProcessInstanceQuery().processDefinitionKey("leave").finished().orderByProcessInstanceEndTime().desc();
+ List list = query.listPage(pageParams[0], pageParams[1]);
+
+ // 关联业务实体
+ for (HistoricProcessInstance historicProcessInstance : list) {
+ String businessKey = historicProcessInstance.getBusinessKey();
+ Leave leave = leaveManager.getLeave(new Long(businessKey));
+ leave.setProcessDefinition(getProcessDefinition(historicProcessInstance.getProcessDefinitionId()));
+ leave.setHistoricProcessInstance(historicProcessInstance);
+ results.add(leave);
+ }
+ page.setTotalCount(query.count());
+ page.setResult(results);
+ return results;
+ }
+
+ /**
+ * 查询流程定义对象
+ *
+ * @param processDefinitionId 流程定义ID
+ * @return
+ */
+ protected ProcessDefinition getProcessDefinition(String processDefinitionId) {
+ ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(processDefinitionId).singleResult();
+ return processDefinition;
+ }
+
+ @Autowired
+ public void setLeaveManager(LeaveManager leaveManager) {
+ this.leaveManager = leaveManager;
+ }
+
+ @Autowired
+ public void setRuntimeService(RuntimeService runtimeService) {
+ this.runtimeService = runtimeService;
+ }
+
+ @Autowired
+ public void setTaskService(TaskService taskService) {
+ this.taskService = taskService;
+ }
+
+ @Autowired
+ public void setHistoryService(HistoryService historyService) {
+ this.historyService = historyService;
+ }
+
+ @Autowired
+ public void setRepositoryService(RepositoryService repositoryService) {
+ this.repositoryService = repositoryService;
+ }
}
diff --git a/src/main/java/me/kafeitu/demo/activiti/service/oa/leave/ReportBackEndProcessor.java b/src/main/java/me/kafeitu/demo/activiti/service/oa/leave/ReportBackEndProcessor.java
index 21cd662053..cb88f27e35 100644
--- a/src/main/java/me/kafeitu/demo/activiti/service/oa/leave/ReportBackEndProcessor.java
+++ b/src/main/java/me/kafeitu/demo/activiti/service/oa/leave/ReportBackEndProcessor.java
@@ -1,9 +1,6 @@
package me.kafeitu.demo.activiti.service.oa.leave;
-import java.util.Date;
-
import me.kafeitu.demo.activiti.entity.oa.Leave;
-
import org.activiti.engine.RuntimeService;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
@@ -12,6 +9,8 @@
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
+import java.util.Date;
+
/**
* 销假后处理器
* 设置销假时间
@@ -23,26 +22,28 @@
@Transactional
public class ReportBackEndProcessor implements TaskListener {
- @Autowired
- LeaveManager leaveManager;
-
- @Autowired
- RuntimeService runtimeService;
-
- /* (non-Javadoc)
- * @see org.activiti.engine.delegate.TaskListener#notify(org.activiti.engine.delegate.DelegateTask)
- */
- public void notify(DelegateTask delegateTask) {
- String processInstanceId = delegateTask.getProcessInstanceId();
- ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
- Leave leave = leaveManager.getLeave(new Long(processInstance.getBusinessKey()));
-
- Object realityStartTime = delegateTask.getVariable("realityStartTime");
- leave.setRealityStartTime((Date) realityStartTime);
- Object realityEndTime = delegateTask.getVariable("realityEndTime");
- leave.setRealityEndTime((Date) realityEndTime);
-
- leaveManager.saveLeave(leave);
- }
+ private static final long serialVersionUID = 1L;
+
+ @Autowired
+ LeaveManager leaveManager;
+
+ @Autowired
+ RuntimeService runtimeService;
+
+ /* (non-Javadoc)
+ * @see org.activiti.engine.delegate.TaskListener#notify(org.activiti.engine.delegate.DelegateTask)
+ */
+ public void notify(DelegateTask delegateTask) {
+ String processInstanceId = delegateTask.getProcessInstanceId();
+ ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
+ Leave leave = leaveManager.getLeave(new Long(processInstance.getBusinessKey()));
+
+ Object realityStartTime = delegateTask.getVariable("realityStartTime");
+ leave.setRealityStartTime((Date) realityStartTime);
+ Object realityEndTime = delegateTask.getVariable("realityEndTime");
+ leave.setRealityEndTime((Date) realityEndTime);
+
+ leaveManager.saveLeave(leave);
+ }
}
diff --git a/src/main/java/me/kafeitu/demo/activiti/service/oa/leave/VariableCreateListener.java b/src/main/java/me/kafeitu/demo/activiti/service/oa/leave/VariableCreateListener.java
new file mode 100644
index 0000000000..89b11b2663
--- /dev/null
+++ b/src/main/java/me/kafeitu/demo/activiti/service/oa/leave/VariableCreateListener.java
@@ -0,0 +1,39 @@
+package me.kafeitu.demo.activiti.service.oa.leave;
+
+import org.activiti.engine.delegate.event.ActivitiEvent;
+import org.activiti.engine.delegate.event.ActivitiEventListener;
+import org.activiti.engine.delegate.event.ActivitiVariableEvent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 引擎的全局监听器
+ * @author: Henry Yan
+ */
+@Service
+@Transactional
+public class VariableCreateListener implements ActivitiEventListener {
+
+ protected Logger logger = LoggerFactory.getLogger(getClass());
+
+ @Override
+ public void onEvent(ActivitiEvent event) {
+ switch (event.getType()) {
+
+ case VARIABLE_CREATED:
+ ActivitiVariableEvent variableEvent = (ActivitiVariableEvent) event;
+ System.out.println("创建了变量: " + variableEvent.getVariableName() + ", 值：" + variableEvent.getVariableValue());
+ break;
+
+ default:
+ System.out.println("Event received: " + event.getType());
+ }
+ }
+
+ @Override
+ public boolean isFailOnException() {
+ return false;
+ }
+}
diff --git a/src/main/java/me/kafeitu/demo/activiti/util/DateConverter.java b/src/main/java/me/kafeitu/demo/activiti/util/DateConverter.java
index 8b4ca94898..b40a427fd7 100644
--- a/src/main/java/me/kafeitu/demo/activiti/util/DateConverter.java
+++ b/src/main/java/me/kafeitu/demo/activiti/util/DateConverter.java
@@ -1,95 +1,95 @@
package me.kafeitu.demo.activiti.util;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
import org.apache.commons.beanutils.Converter;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateUtils;
import org.apache.log4j.Logger;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
public class DateConverter implements Converter {
- private static final Logger logger = Logger.getLogger(DateConverter.class);
-
- private static final String DATETIME_PATTERN = "yyyy-MM-dd HH:mm:ss";
-
- private static final String DATETIME_PATTERN_NO_SECOND = "yyyy-MM-dd HH:mm";
-
- private static final String DATE_PATTERN = "yyyy-MM-dd";
-
- private static final String MONTH_PATTERN = "yyyy-MM";
-
- @SuppressWarnings("rawtypes")
- public Object convert(Class type, Object value) {
- Object result = null;
- if (type == Date.class) {
- try {
- result = doConvertToDate(value);
- } catch (ParseException e) {
- e.printStackTrace();
- }
- } else if (type == String.class) {
- result = doConvertToString(value);
- }
- return result;
- }
-
- /**
- * Convert String to Date
- *
- * @param value
- * @return
- * @throws ParseException
- */
- private Date doConvertToDate(Object value) throws ParseException {
- Date result = null;
-
- if (value instanceof String) {
- result = DateUtils.parseDate((String) value, new String[] { DATE_PATTERN, DATETIME_PATTERN,
- DATETIME_PATTERN_NO_SECOND, MONTH_PATTERN });
-
- // all patterns failed, try a milliseconds constructor
- if (result == null && StringUtils.isNotEmpty((String) value)) {
-
- try {
- result = new Date(new Long((String) value).longValue());
- } catch (Exception e) {
- logger.error("Converting from milliseconds to Date fails!");
- e.printStackTrace();
- }
-
- }
-
- } else if (value instanceof Object[]) {
- // let's try to convert the first element only
- Object[] array = (Object[]) value;
-
- if ((array != null) && (array.length >= 1)) {
- value = array[0];
- result = doConvertToDate(value);
- }
-
- } else if (Date.class.isAssignableFrom(value.getClass())) {
- result = (Date) value;
- }
- return result;
- }
-
- /**
- * Convert Date to String
- *
- * @param value
- * @return
- */
- private String doConvertToString(Object value) {
- SimpleDateFormat simpleDateFormat = new SimpleDateFormat(DATETIME_PATTERN);
- String result = null;
- if (value instanceof Date) {
- result = simpleDateFormat.format(value);
- }
- return result;
- }
-
-}
\ No newline at end of file
+ private static final Logger logger = Logger.getLogger(DateConverter.class);
+
+ private static final String DATETIME_PATTERN = "yyyy-MM-dd HH:mm:ss";
+
+ private static final String DATETIME_PATTERN_NO_SECOND = "yyyy-MM-dd HH:mm";
+
+ private static final String DATE_PATTERN = "yyyy-MM-dd";
+
+ private static final String MONTH_PATTERN = "yyyy-MM";
+
+ @SuppressWarnings("rawtypes")
+ public Object convert(Class type, Object value) {
+ Object result = null;
+ if (type == Date.class) {
+ try {
+ result = doConvertToDate(value);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ } else if (type == String.class) {
+ result = doConvertToString(value);
+ }
+ return result;
+ }
+
+ /**
+ * Convert String to Date
+ *
+ * @param value
+ * @return
+ * @throws ParseException
+ */
+ private Date doConvertToDate(Object value) throws ParseException {
+ Date result = null;
+
+ if (value instanceof String) {
+ result = DateUtils.parseDate((String) value, new String[]{DATE_PATTERN, DATETIME_PATTERN,
+ DATETIME_PATTERN_NO_SECOND, MONTH_PATTERN});
+
+ // all patterns failed, try a milliseconds constructor
+ if (result == null && StringUtils.isNotEmpty((String) value)) {
+
+ try {
+ result = new Date(new Long((String) value).longValue());
+ } catch (Exception e) {
+ logger.error("Converting from milliseconds to Date fails!");
+ e.printStackTrace();
+ }
+
+ }
+
+ } else if (value instanceof Object[]) {
+ // let's try to convert the first element only
+ Object[] array = (Object[]) value;
+
+ if (array.length >= 1) {
+ value = array[0];
+ result = doConvertToDate(value);
+ }
+
+ } else if (Date.class.isAssignableFrom(value.getClass())) {
+ result = (Date) value;
+ }
+ return result;
+ }
+
+ /**
+ * Convert Date to String
+ *
+ * @param value
+ * @return
+ */
+ private String doConvertToString(Object value) {
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat(DATETIME_PATTERN);
+ String result = null;
+ if (value instanceof Date) {
+ result = simpleDateFormat.format(value);
+ }
+ return result;
+ }
+
+}
diff --git a/src/main/java/me/kafeitu/demo/activiti/util/LinkedProperties.java b/src/main/java/me/kafeitu/demo/activiti/util/LinkedProperties.java
new file mode 100644
index 0000000000..9fcfff00d4
--- /dev/null
+++ b/src/main/java/me/kafeitu/demo/activiti/util/LinkedProperties.java
@@ -0,0 +1,93 @@
+package me.kafeitu.demo.activiti.util;
+
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.util.*;
+
+/**
+ * 有序Properties
+ */
+public class LinkedProperties extends Properties {
+ private static final long serialVersionUID = 1L;
+ private Map linkMap = new LinkedHashMap();
+
+ public void clear() {
+ linkMap.clear();
+ }
+
+ public boolean contains(Object value) {
+ return linkMap.containsValue(value);
+ }
+
+ public boolean containsKey(Object key) {
+ return linkMap.containsKey(key);
+ }
+
+ public boolean containsValue(Object value) {
+ return linkMap.containsValue(value);
+ }
+
+ public Enumeration elements() {
+ throw new RuntimeException("Method elements is not supported in LinkedProperties class");
+ }
+
+ public Set entrySet() {
+ return linkMap.entrySet();
+ }
+
+ public boolean equals(Object o) {
+ return linkMap.equals(o);
+ }
+
+ public Object get(Object key) {
+ return linkMap.get(key);
+ }
+
+ public String getProperty(String key) {
+ Object oval = get(key); //here the class Properties uses super.get()
+ if (oval == null) return null;
+ return (oval instanceof String) ? (String) oval : null; //behavior of standard properties
+ }
+
+ public boolean isEmpty() {
+ return linkMap.isEmpty();
+ }
+
+ public Enumeration keys() {
+ Set keys = linkMap.keySet();
+ return Collections.enumeration(keys);
+ }
+
+ public Set keySet() {
+ return linkMap.keySet();
+ }
+
+ public void list(PrintStream out) {
+ this.list(new PrintWriter(out, true));
+ }
+
+ public void list(PrintWriter out) {
+ out.println("-- listing properties --");
+ for (Map.Entry e : (Set) this.entrySet()) {
+ String key = (String) e.getKey();
+ String val = (String) e.getValue();
+ if (val.length() > 40) {
+ val = val.substring(0, 37) + "...";
+ }
+ out.println(key + "=" + val);
+ }
+ }
+
+ public Object put(Object key, Object value) {
+ return linkMap.put(key, value);
+ }
+
+ public int size() {
+ return linkMap.size();
+ }
+
+ public Collection values() {
+ return linkMap.values();
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/me/kafeitu/demo/activiti/util/Page.java b/src/main/java/me/kafeitu/demo/activiti/util/Page.java
new file mode 100644
index 0000000000..36c2f4f81e
--- /dev/null
+++ b/src/main/java/me/kafeitu/demo/activiti/util/Page.java
@@ -0,0 +1,258 @@
+package me.kafeitu.demo.activiti.util;
+
+import com.google.common.collect.Lists;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.List;
+
+/**
+ * @author HenryYan
+ */
+public class Page {
+
+ // -- 公共变量 --//
+ public static final String ASC = "asc";
+ public static final String DESC = "desc";
+
+ // -- 分页参数 --//
+ protected int pageNo = 1;
+ protected int pageSize = -1;
+ protected String orderBy = null;
+ protected String order = null;
+ protected boolean autoCount = true;
+
+ // -- 返回结果 --//
+ protected List result = Lists.newArrayList();
+ protected long totalCount = -1;
+
+ // -- 构造函数 --//
+ public Page() {
+ }
+
+ public Page(int pageSize) {
+ this.pageSize = pageSize;
+ }
+
+ // -- 分页参数访问函数 --//
+
+ /**
+ * 获得当前页的页号,序号从1开始,默认为1.
+ */
+ public int getPageNo() {
+ return pageNo;
+ }
+
+ /**
+ * 设置当前页的页号,序号从1开始,低于1时自动调整为1.
+ */
+ public void setPageNo(final int pageNo) {
+ this.pageNo = pageNo;
+
+ if (pageNo < 1) {
+ this.pageNo = 1;
+ }
+ }
+
+ /**
+ * 返回Page对象自身的setPageNo函数,可用于连续设置。
+ */
+ public Page pageNo(final int thePageNo) {
+ setPageNo(thePageNo);
+ return this;
+ }
+
+ /**
+ * 获得每页的记录数量, 默认为-1.
+ */
+ public int getPageSize() {
+ return pageSize;
+ }
+
+ /**
+ * 设置每页的记录数量.
+ */
+ public void setPageSize(final int pageSize) {
+ this.pageSize = pageSize;
+ }
+
+ /**
+ * 返回Page对象自身的setPageSize函数,可用于连续设置。
+ */
+ public Page pageSize(final int thePageSize) {
+ setPageSize(thePageSize);
+ return this;
+ }
+
+ /**
+ * 根据pageNo和pageSize计算当前页第一条记录在总结果集中的位置,序号从1开始.
+ */
+ public int getFirst() {
+ return ((pageNo - 1) * pageSize) + 1;
+ }
+
+ /**
+ * 获得排序字段,无默认值. 多个排序字段时用','分隔.
+ */
+ public String getOrderBy() {
+ return orderBy;
+ }
+
+ /**
+ * 设置排序字段,多个排序字段时用','分隔.
+ */
+ public void setOrderBy(final String orderBy) {
+ this.orderBy = orderBy;
+ }
+
+ /**
+ * 返回Page对象自身的setOrderBy函数,可用于连续设置。
+ */
+ public Page orderBy(final String theOrderBy) {
+ setOrderBy(theOrderBy);
+ return this;
+ }
+
+ /**
+ * 获得排序方向, 无默认值.
+ */
+ public String getOrder() {
+ return order;
+ }
+
+ /**
+ * 设置排序方式向.
+ *
+ * @param order 可选值为desc或asc,多个排序字段时用','分隔.
+ */
+ public void setOrder(final String order) {
+ String lowcaseOrder = StringUtils.lowerCase(order);
+
+ // 检查order字符串的合法值
+ String[] orders = StringUtils.split(lowcaseOrder, ',');
+ for (String orderStr : orders) {
+ if (!StringUtils.equals(DESC, orderStr) && !StringUtils.equals(ASC, orderStr)) {
+ throw new IllegalArgumentException("排序方向" + orderStr + "不是合法值");
+ }
+ }
+
+ this.order = lowcaseOrder;
+ }
+
+ /**
+ * 返回Page对象自身的setOrder函数,可用于连续设置。
+ */
+ public Page order(final String theOrder) {
+ setOrder(theOrder);
+ return this;
+ }
+
+ /**
+ * 是否已设置排序字段,无默认值.
+ */
+ public boolean isOrderBySetted() {
+ return (StringUtils.isNotBlank(orderBy) && StringUtils.isNotBlank(order));
+ }
+
+ /**
+ * 获得查询对象时是否先自动执行count查询获取总记录数, 默认为false.
+ */
+ public boolean isAutoCount() {
+ return autoCount;
+ }
+
+ /**
+ * 设置查询对象时是否自动先执行count查询获取总记录数.
+ */
+ public void setAutoCount(final boolean autoCount) {
+ this.autoCount = autoCount;
+ }
+
+ /**
+ * 返回Page对象自身的setAutoCount函数,可用于连续设置。
+ */
+ public Page autoCount(final boolean theAutoCount) {
+ setAutoCount(theAutoCount);
+ return this;
+ }
+
+ // -- 访问查询结果函数 --//
+
+ /**
+ * 获得页内的记录列表.
+ */
+ public List getResult() {
+ return result;
+ }
+
+ /**
+ * 设置页内的记录列表.
+ */
+ public void setResult(final List result) {
+ this.result = result;
+ }
+
+ /**
+ * 获得总记录数, 默认值为-1.
+ */
+ public long getTotalCount() {
+ return totalCount;
+ }
+
+ /**
+ * 设置总记录数.
+ */
+ public void setTotalCount(final long totalCount) {
+ this.totalCount = totalCount;
+ }
+
+ /**
+ * 根据pageSize与totalCount计算总页数, 默认值为-1.
+ */
+ public long getTotalPages() {
+ if (totalCount < 0) {
+ return -1;
+ }
+
+ long count = totalCount / pageSize;
+ if (totalCount % pageSize > 0) {
+ count++;
+ }
+ return count;
+ }
+
+ /**
+ * 是否还有下一页.
+ */
+ public boolean isHasNext() {
+ return (pageNo + 1 <= getTotalPages());
+ }
+
+ /**
+ * 取得下页的页号, 序号从1开始. 当前页为尾页时仍返回尾页序号.
+ */
+ public int getNextPage() {
+ if (isHasNext()) {
+ return pageNo + 1;
+ } else {
+ return pageNo;
+ }
+ }
+
+ /**
+ * 是否还有上一页.
+ */
+ public boolean isHasPre() {
+ return (pageNo - 1 >= 1);
+ }
+
+ /**
+ * 取得上页的页号, 序号从1开始. 当前页为首页时返回首页序号.
+ */
+ public int getPrePage() {
+ if (isHasPre()) {
+ return pageNo - 1;
+ } else {
+ return pageNo;
+ }
+ }
+}
diff --git a/src/main/java/me/kafeitu/demo/activiti/util/PageUtil.java b/src/main/java/me/kafeitu/demo/activiti/util/PageUtil.java
new file mode 100644
index 0000000000..4150d7020a
--- /dev/null
+++ b/src/main/java/me/kafeitu/demo/activiti/util/PageUtil.java
@@ -0,0 +1,26 @@
+package me.kafeitu.demo.activiti.util;
+
+import org.apache.commons.lang3.StringUtils;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 分页工具
+ *
+ * @author henryyan
+ */
+public class PageUtil {
+
+ public static int PAGE_SIZE = 15;
+
+ public static int[] init(Page page, HttpServletRequest request) {
+ int pageNumber = Integer.parseInt(StringUtils.defaultIfBlank(request.getParameter("p"), "1"));
+ page.setPageNo(pageNumber);
+ int pageSize = Integer.parseInt(StringUtils.defaultIfBlank(request.getParameter("ps"), String.valueOf(PAGE_SIZE)));
+ page.setPageSize(pageSize);
+ int firstResult = page.getFirst() - 1;
+ int maxResults = page.getPageSize();
+ return new int[]{firstResult, maxResults};
+ }
+
+}
diff --git a/src/main/java/me/kafeitu/demo/activiti/util/ProcessDefinitionCache.java b/src/main/java/me/kafeitu/demo/activiti/util/ProcessDefinitionCache.java
index f569d20889..acb808ff20 100644
--- a/src/main/java/me/kafeitu/demo/activiti/util/ProcessDefinitionCache.java
+++ b/src/main/java/me/kafeitu/demo/activiti/util/ProcessDefinitionCache.java
@@ -1,8 +1,6 @@
package me.kafeitu.demo.activiti.util;
-import java.util.List;
-import java.util.Map;
-
+import com.google.common.collect.Maps;
import org.activiti.engine.RepositoryService;
import org.activiti.engine.impl.RepositoryServiceImpl;
import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity;
@@ -10,64 +8,65 @@
import org.activiti.engine.repository.ProcessDefinition;
import org.apache.commons.lang3.ObjectUtils;
-import com.google.common.collect.Maps;
+import java.util.List;
+import java.util.Map;
/**
* 流程定义缓存
- *
+ *
* @author henryyan
*/
public class ProcessDefinitionCache {
- private static Map map = Maps.newHashMap();
+ private static Map map = Maps.newHashMap();
- private static Map> activities = Maps.newHashMap();
+ private static Map> activities = Maps.newHashMap();
- private static Map singleActivity = Maps.newHashMap();
+ private static Map singleActivity = Maps.newHashMap();
- private static RepositoryService repositoryService;
+ private static RepositoryService repositoryService;
- public static ProcessDefinition get(String processDefinitionId) {
- ProcessDefinition processDefinition = map.get(processDefinitionId);
- if (processDefinition == null) {
- processDefinition = (ProcessDefinitionEntity) ((RepositoryServiceImpl) repositoryService).getDeployedProcessDefinition(processDefinitionId);
- if (processDefinition != null) {
- put(processDefinitionId, processDefinition);
- }
+ public static ProcessDefinition get(String processDefinitionId) {
+ ProcessDefinition processDefinition = map.get(processDefinitionId);
+ if (processDefinition == null) {
+ processDefinition = (ProcessDefinitionEntity) ((RepositoryServiceImpl) repositoryService).getDeployedProcessDefinition(processDefinitionId);
+ if (processDefinition != null) {
+ put(processDefinitionId, processDefinition);
+ }
+ }
+ return processDefinition;
}
- return processDefinition;
- }
- public static void put(String processDefinitionId, ProcessDefinition processDefinition) {
- map.put(processDefinitionId, processDefinition);
- ProcessDefinitionEntity pde = (ProcessDefinitionEntity) processDefinition;
- activities.put(processDefinitionId, pde.getActivities());
- for (ActivityImpl activityImpl : pde.getActivities()) {
- singleActivity.put(processDefinitionId + "_" + activityImpl.getId(), activityImpl);
+ public static void put(String processDefinitionId, ProcessDefinition processDefinition) {
+ map.put(processDefinitionId, processDefinition);
+ ProcessDefinitionEntity pde = (ProcessDefinitionEntity) processDefinition;
+ activities.put(processDefinitionId, pde.getActivities());
+ for (ActivityImpl activityImpl : pde.getActivities()) {
+ singleActivity.put(processDefinitionId + "_" + activityImpl.getId(), activityImpl);
+ }
}
- }
- public static ActivityImpl getActivity(String processDefinitionId, String activityId) {
- ProcessDefinition processDefinition = get(processDefinitionId);
- if (processDefinition != null) {
- ActivityImpl activityImpl = singleActivity.get(processDefinitionId + "_" + activityId);
- if (activityImpl != null) {
- return activityImpl;
- }
+ public static ActivityImpl getActivity(String processDefinitionId, String activityId) {
+ ProcessDefinition processDefinition = get(processDefinitionId);
+ if (processDefinition != null) {
+ ActivityImpl activityImpl = singleActivity.get(processDefinitionId + "_" + activityId);
+ if (activityImpl != null) {
+ return activityImpl;
+ }
+ }
+ return null;
}
- return null;
- }
- public static String getActivityName(String processDefinitionId, String activityId) {
- ActivityImpl activity = getActivity(processDefinitionId, activityId);
- if (activity != null) {
- return ObjectUtils.toString(activity.getProperty("name"));
+ public static String getActivityName(String processDefinitionId, String activityId) {
+ ActivityImpl activity = getActivity(processDefinitionId, activityId);
+ if (activity != null) {
+ return ObjectUtils.toString(activity.getProperty("name"));
+ }
+ return null;
}
- return null;
- }
- public static void setRepositoryService(RepositoryService repositoryService) {
- ProcessDefinitionCache.repositoryService = repositoryService;
- }
+ public static void setRepositoryService(RepositoryService repositoryService) {
+ ProcessDefinitionCache.repositoryService = repositoryService;
+ }
}
diff --git a/src/main/java/me/kafeitu/demo/activiti/util/PropertyFileUtil.java b/src/main/java/me/kafeitu/demo/activiti/util/PropertyFileUtil.java
index cbc175a0fc..5d1fcdc92b 100644
--- a/src/main/java/me/kafeitu/demo/activiti/util/PropertyFileUtil.java
+++ b/src/main/java/me/kafeitu/demo/activiti/util/PropertyFileUtil.java
@@ -2,128 +2,244 @@
import java.io.IOException;
import java.io.InputStream;
+import java.io.InputStreamReader;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.Properties;
import java.util.Set;
-import me.kafeitu.modules.utils.PropertiesLoader;
-
+import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.core.io.DefaultResourceLoader;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.ResourceLoader;
+import org.springframework.util.DefaultPropertiesPersister;
+import org.springframework.util.PropertiesPersister;
/**
* 系统属性工具类
*
* @author HenryYan
- *
*/
public class PropertyFileUtil {
-
- private static Logger logger = LoggerFactory.getLogger(PropertyFileUtil.class);
-
- private static Properties properties;
-
- /**
- * 初始化读取配置文件，读取的文件列表位于classpath下面的application-files.properties
- *
- * 多个配置文件会用最后面的覆盖相同属性值
- *
- * @throws IOException 读取属性文件时
- */
- public static void init() throws IOException {
- String fileNames = "application-files.properties";
- innerInit(fileNames);
- }
-
- /**
- * 初始化读取配置文件，读取的文件列表位于classpath下面的application-[type]-files.properties
- *
- * 多个配置文件会用最后面的覆盖相同属性值
- *
- * @param type 配置文件类型，application-[type]-files.properties
- *
- * @throws IOException 读取属性文件时
- */
- public static void init(String type) throws IOException {
- String fileNames = "application-" + type + "-files.properties";
- innerInit(fileNames);
- }
-
- /**
- * 内部处理
- * @param fileNames
- * @throws IOException
- */
- private static void innerInit(String fileNames) throws IOException {
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- InputStream resourceAsStream = loader.getResourceAsStream(fileNames);
-
- Properties files = new Properties();
- files.load(resourceAsStream);
-
- Set