Commit 0506c1b6 by chenweisong

更新

parent 337690db
...@@ -20,9 +20,9 @@ spring: ...@@ -20,9 +20,9 @@ spring:
# hibernate: # hibernate:
# ddl-auto: update # ddl-auto: update
datasource: datasource:
url: jdbc:mysql://47.105.193.165:3306/dev0?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8 url: jdbc:mysql://192.168.0.192:3306/cmb_dev?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
username: root username: test
password: 123456 password: test
hikari: hikari:
maximum-pool-size: 3 maximum-pool-size: 3
servlet: servlet:
...@@ -30,8 +30,8 @@ spring: ...@@ -30,8 +30,8 @@ spring:
max-file-size: 20Mb max-file-size: 20Mb
max-request-size: 100Mb max-request-size: 100Mb
redis: redis:
# host: 192.168.0.192 host: 192.168.0.192
host: 127.0.0.1 # host: 127.0.0.1
port: 6379 port: 6379
session: session:
store-type: redis store-type: redis
......
package com.keymobile; package com.keymobile;
import com.google.common.collect.ImmutableMap;
import com.keymobile.rest.model.Process;
import com.keymobile.rest.service.ActivityService; import com.keymobile.rest.service.ActivityService;
import org.activiti.engine.*; import org.activiti.engine.*;
import org.activiti.engine.history.HistoricProcessInstance; import org.activiti.engine.history.HistoricProcessInstance;
import org.activiti.engine.history.HistoricProcessInstanceQuery; import org.activiti.engine.history.HistoricProcessInstanceQuery;
import org.activiti.engine.repository.Deployment;
import org.activiti.engine.repository.ProcessDefinition; import org.activiti.engine.repository.ProcessDefinition;
import org.activiti.engine.runtime.ProcessInstance;
import org.activiti.engine.task.Task;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.junit4.SpringRunner;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest @SpringBootTest
...@@ -27,9 +36,11 @@ public class ProcessTest { ...@@ -27,9 +36,11 @@ public class ProcessTest {
private TaskService taskService; private TaskService taskService;
@Resource @Resource
private HistoryService historyService; private HistoryService historyService;
// 默认启动的固化流程
@Value("${app.active-process}")
private String process;
// @Test
@Test
public void createActivitiTask() { public void createActivitiTask() {
// 加载的我们创建好的demo.bpmn 文件还有png文件 // 加载的我们创建好的demo.bpmn 文件还有png文件
// 获取流的引擎 // 获取流的引擎
...@@ -39,18 +50,62 @@ public class ProcessTest { ...@@ -39,18 +50,62 @@ public class ProcessTest {
// .addClasspathResource("MoreSubProcessTest.bpmn") // .addClasspathResource("MoreSubProcessTest.bpmn")
// .deploy(); // .deploy();
// 部署补录流程
Deployment deploy = repositoryService
.createDeployment()
.addClasspathResource(process)
.deploy();
// 获取流程定义
ProcessDefinition processDefinition = repositoryService.
createProcessDefinitionQuery().
deploymentId(deploy.getId()).
singleResult();
// 指定发起人
Map<String, Object> variables = new HashMap<>();
variables.put("inputUser", "发起人chenws");
//启动流程
ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(processDefinition.getKey(), variables);
// 发起人把流程发送到下一个人
Task resultTask = taskService.createTaskQuery().processInstanceId(processInstance.getId()).
taskInvolvedUser("发起人chenws").singleResult();
//直接提交标准到下个节点
taskService.claim(resultTask.getId(), "发起人chenws");
//保存审批意见
taskService.addComment(resultTask.getId(), processInstance.getId(), "发起人chenws启动分发任务");
Map<String, Object> vars = new HashMap<>();
// 分发录入任务
vars.put("candidateUsers", Arrays.asList("chenws1", "chenws2"));
// 提交任务,并把补录人任务划分好
taskService.complete(resultTask.getId(), vars);
} }
@Test // @Test
public void start() { public void start() {
// Job job = jobService.findByProcessId("115005");
// TwinkleValidator.notNull(job, "22"); // 65046
// ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
// processEngine.getTaskService() Task resultTask = taskService.createTaskQuery().taskId("162506").singleResult();
// .complete("32502"); taskService.complete(resultTask.getId());
// taskService.complete(resultTask.getId(), ImmutableMap.of("needDataAudit", "false", "needConfirm", "true"));
// taskService.complete(resultTask.getId(), ImmutableMap.of("signConfirm", "false"));
// taskService.complete(resultTask.getId(), ImmutableMap.of("needDataAudit", "true", "auditUser", "肥仔'"));
// 最后一条需要传递 ${needConfirm == 'true'}
// taskService.complete(resultTask.getId(), ImmutableMap.of("signConfirm", "true", "needDataBackflow", "true"));
// System.out.println(resultTask);
} }
// @Test @Test
public void zhuguan() { public void zhuguan() {
// try { // try {
...@@ -58,7 +113,7 @@ public class ProcessTest { ...@@ -58,7 +113,7 @@ public class ProcessTest {
ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine(); ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
// //
List<ProcessDefinition> processDefList = processEngine.getRepositoryService().createProcessDefinitionQuery() List<ProcessDefinition> processDefList = processEngine.getRepositoryService().createProcessDefinitionQuery()
.orderByProcessDefinitionVersion().asc()//按照版本的升序排列 .orderByProcessDefinitionVersion().desc()//按照版本的升序排列
.list(); .list();
for (ProcessDefinition processDefinition : processDefList) { for (ProcessDefinition processDefinition : processDefList) {
// System.out.println(processDefinition.getName()); // System.out.println(processDefinition.getName());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment