Skip to content

D
datacollector
Commit 5475c19a by chenweisong
Options

更新

parent 8b029989
Showing with 369 additions and 96 deletions
src/main/java/com/keymobile/rest/controller/ExcelController.java
package com.keymobile.rest.controller;
import com.google.common.collect.ImmutableMap;
import com.keymobile.rest.common.bean.ApiResponse;
import com.keymobile.rest.common.utils.DateUtil;
import com.keymobile.rest.model.DataInfo;
import com.keymobile.rest.model.Mission;
import com.keymobile.rest.model.Template;
import com.keymobile.rest.service.DataInfoService;
import com.keymobile.rest.service.TemplateService;
import com.keymobile.rest.service.MissionService;
import com.keymobile.rest.service.UserService;
import io.swagger.annotations.*;
import org.activiti.engine.*;
import org.activiti.engine.task.Task;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.sql.Timestamp;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Api(description = "模板 控制器")
@RestController
@RequestMapping(path = "/api")
......@@ -17,6 +29,8 @@ public class ExcelController {
@Autowired
private TemplateService templateService;
@Autowired
private DataInfoService dataInfoService;
@Autowired
private MissionService missionService;
@Autowired
private UserService userService;
......@@ -31,24 +45,35 @@ public class ExcelController {
})
@PostMapping(value = "/excel/saveData")
public ApiResponse saveRecordData(long excelId, String dataStr) {
// User curUser = userService.getNormalUser();
// Template template = excelService.get(form.getExcelId());
// ProcessInfo processInfo = jobInfoService.findByExcelIdAndUserId(form.getExcelId(), curUser.getId());
// DataInfo dataInfo;
// if (form.getDataId() != null) {
// dataInfo = recordDataService.update(form);
// } else {
// form.setProcessInfo(processInfo);
// dataInfo = recordDataService.save(form);
// }
// Assignment assignment = template.getAssignment();
// String processId = assignment.getProcessId();
// // 发起人把流程发送到下一个人
// List<Task> taskList = taskService.createTaskQuery().processInstanceId(processId)
// .taskAssignee(curUser.getUsername()).list();
// Task task = taskList.get(0);
// User judge = userService.getAudit();
// taskService.complete(task.getId(), ImmutableMap.of("judgeId", judge.getUsername()));
// excelId 其实就是当前得missionId
Mission mission = missionService.findById(excelId);
Template template = mission.getTemplate();
DataInfo dataInfo = new DataInfo();
Timestamp now = Timestamp.valueOf(DateUtil.getDateTime());
dataInfo.setCreateAt(now);
dataInfo.setData(dataStr);
dataInfo.setMission(mission);
dataInfoService.save(dataInfo);
String processId = mission.getProcess().getProcessId();
String taskId = mission.getTaskId();
// 发起人把流程发送到下一个人
Task task = taskService.createTaskQuery().processInstanceId(processId).taskId(taskId)
.singleResult();
Map vars = new HashMap<>();
if (template.getNeedAudit() == Template.NEED_AUDIT) {
vars.put("sign", true);
vars.put("inputDataApply", "审核人");
vars.put("applySign", template.getNeedConfirm() == Template.NEED_CONFIRM);
} else {
vars.put("_ACTIVITI_SKIP_EXPRESSION_ENABLED", true);
vars.put("sign", false);
vars.put("inputDataApply", "");
vars.put("applySign", template.getNeedConfirm() == Template.NEED_CONFIRM);
}
taskService.complete(task.getId(), vars);
return ApiResponse.ok();
}
......
src/main/java/com/keymobile/rest/controller/TaskController.java
......@@ -112,21 +112,31 @@ public class TaskController {
for (Task task : tasks) {
String processId = task.getProcessInstanceId();
List<Process> processList = processService.findAllByProcessId(processId);
// Process process = processService.findByProcessIdAndStatus(processId, Process.STATUS_RECORDING);
if (processList.size() != 0) {
Map mission = new HashMap();
mission.put("1", 1);
if (task.getTaskDefinitionKey().equals("addData")) {
Process process = processService.findByProcessId(processId);
List<Mission> missionList = process.getMissionList();
if (process != null && missionList.size() > 0) {
missionList.forEach(mission -> {
// 只能查看得时候更新这个人属于这个进行得任务id
mission.setTaskId(task.getId());
missionService.save(mission);
} else {
Map map = new HashMap();
map.put("id", mission.getId());
map.put("userId", mission.getUser().getId());
map.put("username", mission.getUser().getUsername());
map.put("excelList", Arrays.asList(mission.getTemplate()));
}
missions.add(mission);
if (task.getTaskDefinitionKey().equals("dataEntrySubTask")) {
map.put("kind", 1);
} else {
map.put("kind", 2);
}
missions.add(map);
});
}
return ApiResponse.ok();
}
return ApiResponse.ok(missions);
}
......@@ -150,11 +160,17 @@ public class TaskController {
// 新建excel实例
List<ExcelForm> excelFormList = form.getExcels();
excelFormList.forEach(excelForm -> {
TwinkleValidator.isNotNULL(excelForm.getScopeId(), "模板scopeId不能为空");
TwinkleValidator.isTrue(excelForm.getName() != null, "模板名称不能为空");
TwinkleValidator.isTrue(excelForm.getConfig() != null, "模板配置config不能为空");
TwinkleValidator.isTrue(excelForm.getScopeId() != null && excelForm.getScopeId() != 0, "模板scopeId不能为空");
TwinkleValidator.isTrue(excelForm.getNeedAudit() != null && excelForm.getNeedAudit() != 0, "模板needAudit不能为空");
TwinkleValidator.isTrue(excelForm.getNeedConfirm() != null && excelForm.getNeedConfirm() != 0, "模板needConfirm不能为空");
RecordScope scope = recordScopeService.findById(excelForm.getScopeId());
TwinkleValidator.isNotNULL(scope, "补录范围不能为空");
TwinkleValidator.isTrue(scope != null, "补录范围不能为空");
TwinkleValidator.isFalse((StringUtils.isEmpty(excelForm.getUpStreamAddr()) && StringUtils.isNotEmpty(excelForm.getBackStreamAddr())
|| (StringUtils.isNotEmpty(excelForm.getUpStreamAddr()) && StringUtils.isEmpty(excelForm.getBackStreamAddr()))), "上游地址和回流地址需同时填写或者同时为空");
excelForm.setActivity(finalActivity);
Template template = BeanUtils.convertTo(excelForm, new Template());
template.setCreateAt(now);
......@@ -187,7 +203,7 @@ public class TaskController {
Activity activity = activityService.get(taskId);
TwinkleValidator.notNull(activity, "活动不存在");
// 根据活动查找需要填写的人 目前只支持一人
List<Template> templateList = activity.getTemplateList();
List<Template> templateList = activity.getExcelList();
TwinkleValidator.notLessThan(templateList.size(), 1, "补录模板不存在");
// 部署补录流程
......@@ -206,12 +222,14 @@ public class TaskController {
String inputUser = activity.getUser().getUsername();
Map<String, Object> variables = new HashMap<>();
variables.put("inputUser", inputUser);
//启动流程
ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(processDefinition.getKey(), variables);
Process process = new Process();
process.setProcessId(processInstance.getId());
process.setActivity(activity);
// 新建当前任务进程，但是先不绑定missions
process.setMissionList(null);
process.setStatus(Process.STATUS_BEGIN);
processService.save(process);
......@@ -224,18 +242,18 @@ public class TaskController {
//直接提交标准到下个节点
taskService.claim(resultTask.getId(), inputUser);
//保存审批意见
taskService.addComment(resultTask.getId(), processInstance.getId(), "");
taskService.addComment(resultTask.getId(), processInstance.getId(), "发起人启动分发任务");
List<String> userNameList = new ArrayList<>();
List<Mission> allMissions = new ArrayList<>();
// 所有模板绑定的人查找任务， 现在基本都是补录任务
templateList.forEach(template -> {
List<Mission> missionList = missionService.findAllByTemplateIdAndStatus(template.getId(), Mission.STATUS_BEGIN);
// 当前所有任务的参与人员
missionList.forEach(mission -> {
mission.setProcess(process);
// 更新mission
missionService.save(mission);
User user = mission.getUser();
userNameList.add(user.getUsername());
......@@ -245,13 +263,12 @@ public class TaskController {
process.setMissionList(allMissions);
processService.save(process);
Map<String, Object> vars = new HashMap<>();
// 如果是开始录入环节，需要给出子任务录入人员
// 分发录入任务
if (resultTask.getTaskDefinitionKey().contains("startEntry")) {
vars.put("candiateUserList", userNameList);
}
//审批任务
// 提交任务，并把补录人任务划分好
taskService.complete(resultTask.getId(), vars);
return ApiResponse.ok();
}
......
src/main/java/com/keymobile/rest/controller/UserController.java
......@@ -44,6 +44,12 @@ public class UserController {
map.put("desc", recordScope.getDesc());
map.put("groupId", recordScope.getGroup().getId());
map.put("groupName", recordScope.getGroup().getId());
List<User> existUsers = recordScope.getUserList();
User user = null;
if (existUsers.size() >= 1) {
user = existUsers.get(0);
}
map.put("bindedUser", user);
List<User> users = userService.findAllByGroupId(recordScope.getGroup().getId());
map.put("userList", users);
userList.add(map);
......@@ -56,22 +62,7 @@ public class UserController {
@PostMapping(value = "/scope/list")
public ApiResponse getScopeList() {
List<RecordScope> recordScopeList = recordScopeService.findAll();
List<Map> result = new ArrayList<>();
recordScopeList.forEach(recordScope -> {
Map map = new HashMap();
map.put("id", recordScope.getId());
map.put("desc", recordScope.getDesc());
map.put("groupId", recordScope.getGroup().getId());
map.put("groupName", recordScope.getGroup().getId());
List<User> users = recordScope.getUserList();
User user = null;
if (users.size() >= 1) {
user = users.get(0);
}
map.put("user", user);
result.add(map);
});
return ApiResponse.ok(result);
return ApiResponse.ok(recordScopeList);
}
@ApiOperation(value = "补录范围绑定人员")
......@@ -99,7 +90,6 @@ public class UserController {
return ApiResponse.ok(getGroupTree());
}
public Group getGroupTree() {
List<Group> children = groupService.findAllByParentId(root.getId());
root.setChildren(children);
......
src/main/java/com/keymobile/rest/dao/ProcessDao.java
......@@ -7,7 +7,6 @@ import java.util.List;
public interface ProcessDao extends JpaRepository<Process, Long> {
List<Process> findAllByProcessId(String processId);
Process findByProcessIdAndStatus(String processId, int status);
Process findByProcessId(String processId);
}
src/main/java/com/keymobile/rest/model/Activity.java
......@@ -53,7 +53,7 @@ public class Activity implements Serializable {
private Timestamp createAt;
@OneToMany(fetch = FetchType.EAGER, mappedBy = "activity")
private List<Template> templateList;
private List<Template> excelList;
/*
发送人
......
src/main/java/com/keymobile/rest/model/Mission.java
......@@ -36,10 +36,12 @@ public class Mission implements Serializable {
@CreationTimestamp
private Timestamp createAt;
@Column(nullable = false, columnDefinition = ("integer(2) default 1 COMMENT '类型'"))
private int type;
@Column(columnDefinition = ("varchar(20) COMMENT '当前activiti任务id'"))
private String taskId;
@Column(nullable = false, columnDefinition = ("integer(2) default 1 COMMENT '状态'"))
private int status;
......
src/main/java/com/keymobile/rest/model/Process.java
......@@ -33,7 +33,7 @@ public class Process implements Serializable {
/*
activiti运行中的流程实例id
*/
@Column(name = "process_id", columnDefinition = ("varchar(100) comment '当前活动在跑进程 id'"))
@Column(name = "process_id", unique = true, columnDefinition = ("varchar(100) comment '当前活动在跑进程 id'"))
private String processId;
@Column(nullable = false, columnDefinition = ("integer(2) default 0 comment '进程状态'"))
......
src/main/java/com/keymobile/rest/model/Template.java
......@@ -20,14 +20,14 @@ import java.sql.Timestamp;
@Table(name = "t_template")
public class Template implements Serializable {
public static int NEED_AUDIT = 1;
public static int NO_NEED_AUDIT = 2;
public static int NEED_AUDIT = 2;
public static int NO_NEED_AUDIT = 1;
public static int NEED_CONFIRM = 1;
public static int NO_NEED_CONFIRM = 2;
public static int NEED_CONFIRM = 2;
public static int NO_NEED_CONFIRM = 1;
public static int NEED_MERGE = 1;
public static int NO_NEED_MERGE = 2;
public static int NEED_MERGE = 2;
public static int NO_NEED_MERGE = 1;
@Id
......@@ -43,13 +43,13 @@ public class Template implements Serializable {
@Column(name = "data_at", columnDefinition = ("integer(20) default 1 comment '数据开始行数'"))
private Integer dataAt;
@Column(name = "need_audit", columnDefinition = ("integer(2) default 0 comment '需要审核'"))
@Column(name = "need_audit", columnDefinition = ("integer(2) default 1 comment '需要审核'"))
private Integer needAudit;
@Column(name = "need_confirm", columnDefinition = ("integer(2) default 0 comment '需要负责人确认'"))
@Column(name = "need_confirm", columnDefinition = ("integer(2) default 1 comment '需要负责人确认'"))
private Integer needConfirm;
@Column(name = "need_merge", columnDefinition = ("integer(2) default 0 comment '需要数据合并'"))
@Column(name = "need_merge", columnDefinition = ("integer(2) default 1 comment '需要数据合并'"))
private Integer needMerge;
@Column(name = "up_stream_addr", columnDefinition = ("varchar(100) comment '上游地址'"))
......
src/main/java/com/keymobile/rest/service/DataInfoService.java
......@@ -18,18 +18,8 @@ public class DataInfoService {
return dataInfoDao.getOne(id);
}
// public DataInfo save(RecordDataForm form) {
// DataInfo data = new DataInfo();
// data.setMission(form.getMission());
// Timestamp now = Timestamp.valueOf(DateUtil.getDateTime());
// data.setCreateAt(now);
// data = dataInfoDao.save(data);
// return data;
// }
// public DataInfo update(RecordDataForm form) {
// DataInfo data = this.get(form.getDataId());
// data = dataInfoDao.save(data);
// return data;
// }
public DataInfo save(DataInfo dataInfo) {
dataInfoDao.save(dataInfo);
return dataInfo;
}
}
src/main/java/com/keymobile/rest/service/MissionService.java
......@@ -34,6 +34,10 @@ public class MissionService {
return mission;
}
public Mission findById(long missionId) {
return missionDao.getOne(missionId);
}
public List<Mission> findAllByTemplateIdAndStatus(long templateId, int status) {
return missionDao.findAllByTemplateIdAndStatus(templateId, status);
}
......
src/main/java/com/keymobile/rest/service/ProcessService.java
......@@ -13,19 +13,13 @@ public class ProcessService {
@Autowired
private ProcessDao processDao;
public Process save(Process process) {
processDao.save(process);
return process;
}
public List<Process> findAllByProcessId(String processId) {
return processDao.findAllByProcessId(processId);
}
public Process findByProcessIdAndStatus(String processId, int status) {
return processDao.findByProcessIdAndStatus(processId, status);
public Process findByProcessId(String processId) {
return processDao.findByProcessId(processId);
}
}
src/main/java/com/keymobile/rest/vo/ExcelForm.java
......@@ -30,16 +30,16 @@ public class ExcelForm {
@ApiModelProperty(name = "remark", value = "表格描述")
private String remark;
@ApiModelProperty(name = "dataAt", value = "数据开始行数", example = "1")
@ApiModelProperty(name = "dataAt", value = "数据开始行数 列如 1", example = "1")
private Integer dataAt;
@ApiModelProperty(name = "needAudit", value = "需要审核", required = true, example = "1")
@ApiModelProperty(name = "needAudit", value = "需要审核 1 不需要 2 需要", required = true, example = "1")
private Integer needAudit;
@ApiModelProperty(name = "needConfirm", value = "需要负责人确认", required = true, example = "1")
@ApiModelProperty(name = "needConfirm", value = "需要负责人确认 1 不需要 2 需要", required = true, example = "1")
private Integer needConfirm;
@ApiModelProperty(name = "needMerge", value = "需要数据合并", example = "1")
@ApiModelProperty(name = "needMerge", value = "需要数据合并 1 不需要 2 需要", example = "1")
private Integer needMerge;
@ApiModelProperty(name = "upStreamAddr", value = "上游地址 与 回流地址 同时填写")
......
src/main/resources/MoreSubProcessTest.bpmn
......@@ -15,6 +15,7 @@
<subProcess activiti:exclusive="true" id="entrySubprocess" name="录入子流程" triggeredByEvent="false">
<multiInstanceLoopCharacteristics activiti:collection="candiateUserList" activiti:elementVariable="candiateUser" isSequential="false">
<completionCondition>
<!-- 这里表示当完成数和总数相等的时候到下一步 -->
<![CDATA[${nrOfCompletedInstances/nrOfInstances >= 1}]]>
</completionCondition>
</multiInstanceLoopCharacteristics>
......
src/main/resources/MoreSubProcessTestV2.bpmn 0 → 100644
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" xmlns:tns="http://www.activiti.org/test" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" expressionLanguage="http://www.w3.org/1999/XPath" id="m1585034942112" name="" targetNamespace="http://www.activiti.org/test" typeLanguage="http://www.w3.org/2001/XMLSchema">
<process id="moreSubProcess" isClosed="false" isExecutable="true" name="moreSubProcess" processType="None">
<startEvent id="startevent1" name="Start"/>
<userTask activiti:assignee="${inputUser}" activiti:exclusive="true" id="startEntry" name="开始录入"/>
<userTask activiti:candidateUsers="${groupDataStandardServiceImpl.findAssigneesForProcess(execution,&quot;group5&quot;)}" activiti:exclusive="true" id="headApply" name="负责人审核"/>
<exclusiveGateway gatewayDirection="Unspecified" id="exclusivegateway2" name="Exclusive Gateway"/>
<endEvent id="endevent2" name="End"/>
<userTask activiti:candidateUsers="${groupDataStandardServiceImpl.findAssigneesForProcess(execution,&quot;group4&quot;)}" activiti:exclusive="true" id="dataBackFlow" name="数据回流"/>
<sequenceFlow id="flow1" sourceRef="startevent1" targetRef="startEntry"/>
<sequenceFlow id="flow11" sourceRef="headApply" targetRef="exclusivegateway2"/>
<sequenceFlow id="flow12" name="N" skipExpression="${sign=='false'}" sourceRef="exclusivegateway2" targetRef="endevent2"/>
<sequenceFlow id="flow13" name="Y" skipExpression="${sign=='true'}" sourceRef="exclusivegateway2" targetRef="dataBackFlow"/>
<sequenceFlow id="flow14" sourceRef="dataBackFlow" targetRef="endevent2"/>
<subProcess activiti:exclusive="true" id="entrySubprocess" name="录入子流程" triggeredByEvent="false">
<multiInstanceLoopCharacteristics activiti:collection="candiateUserList" activiti:elementVariable="candiateUser" isSequential="false">
<completionCondition>
<!-- 这里表示当完成数和总数相等的时候到下一步 -->
<![CDATA[${nrOfCompletedInstances/nrOfInstances == 1}]]>
</completionCondition>
</multiInstanceLoopCharacteristics>
<startEvent id="startevent2" name="Start"/>
<userTask activiti:assignee="${candiateUser}" activiti:async="true" activiti:exclusive="true" id="dataEntrySubTask" name="数据录入子任务"/>
<userTask activiti:assignee="${inputDataApply}" activiti:exclusive="true" id="dataApply" name="数据审核人员"/>
<endEvent id="endevent3" name="End"/>
<exclusiveGateway gatewayDirection="Unspecified" id="exclusivegateway3" name="Exclusive Gateway"/>
<sequenceFlow id="flow17" sourceRef="startevent2" targetRef="dataEntrySubTask"/>
<sequenceFlow id="flow21" sourceRef="dataApply" targetRef="exclusivegateway3"/>
<sequenceFlow id="flow22" name="N" skipExpression="${sign=='false'}" sourceRef="exclusivegateway3" targetRef="dataEntrySubTask"/>
<sequenceFlow id="flow23" name="Y" skipExpression="${sign=='true'}" sourceRef="exclusivegateway3" targetRef="endevent3"/>
<exclusiveGateway gatewayDirection="Unspecified" id="exclusivegateway4" name="Exclusive Gateway"/>
<sequenceFlow id="flow24" sourceRef="dataEntrySubTask" targetRef="exclusivegateway4"/>
<sequenceFlow id="flow25" name="Y" skipExpression="${sign=='true'}" sourceRef="exclusivegateway4" targetRef="dataApply"/>
<sequenceFlow id="flow26" name="N" skipExpression="${sign=='false'}" sourceRef="exclusivegateway4" targetRef="endevent3"/>
</subProcess>
<sequenceFlow id="flow15" sourceRef="startEntry" targetRef="entrySubprocess"/>
<exclusiveGateway gatewayDirection="Unspecified" id="exclusivegateway5" name="Exclusive Gateway"/>
<sequenceFlow id="flow27" name="Y" skipExpression="${applySign=='true'}" sourceRef="exclusivegateway5" targetRef="headApply"/>
<sequenceFlow id="flow28" sourceRef="entrySubprocess" targetRef="exclusivegateway5"/>
<sequenceFlow id="flow29" name="N" skipExpression="${applySign=='false'}" sourceRef="exclusivegateway5" targetRef="dataBackFlow"/>
</process>
<bpmndi:BPMNDiagram documentation="background=#3C3F41;count=1;horizontalcount=1;orientation=0;width=842.4;height=1195.2;imageableWidth=832.4;imageableHeight=1185.2;imageableX=5.0;imageableY=5.0" id="Diagram-_1" name="New Diagram">
<bpmndi:BPMNPlane bpmnElement="moreSubProcess">
<bpmndi:BPMNShape bpmnElement="startevent1" id="Shape-startevent1">
<omgdc:Bounds height="32.0" width="32.0" x="40.0" y="5.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="startEntry" id="Shape-startEntry">
<omgdc:Bounds height="55.0" width="105.0" x="15.0" y="150.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="55.0" width="105.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="headApply" id="Shape-headApply">
<omgdc:Bounds height="55.0" width="105.0" x="710.0" y="310.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="55.0" width="105.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="exclusivegateway2" id="Shape-exclusivegateway2" isMarkerVisible="false">
<omgdc:Bounds height="32.0" width="32.0" x="916.0" y="167.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="endevent2" id="Shape-endevent2">
<omgdc:Bounds height="32.0" width="32.0" x="1040.0" y="168.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="dataBackFlow" id="Shape-dataBackFlow">
<omgdc:Bounds height="55.0" width="105.0" x="880.0" y="-5.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="55.0" width="105.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="entrySubprocess" id="Shape-entrySubprocess" isExpanded="true">
<omgdc:Bounds height="205.0" width="421.0" x="200.0" y="77.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="205.0" width="421.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="exclusivegateway5" id="Shape-exclusivegateway5" isMarkerVisible="false">
<omgdc:Bounds height="32.0" width="32.0" x="760.0" y="160.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="startevent2" id="Shape-startevent2">
<omgdc:Bounds height="32.0" width="32.0" x="210.0" y="200.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="dataEntrySubTask" id="Shape-dataEntrySubTask">
<omgdc:Bounds height="55.0" width="105.0" x="270.0" y="190.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="55.0" width="105.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="dataApply" id="Shape-dataApply">
<omgdc:Bounds height="55.0" width="105.0" x="380.0" y="120.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="55.0" width="105.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="endevent3" id="Shape-endevent3">
<omgdc:Bounds height="32.0" width="32.0" x="570.0" y="200.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="exclusivegateway3" id="Shape-exclusivegateway3" isMarkerVisible="false">
<omgdc:Bounds height="32.0" width="32.0" x="510.0" y="127.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="exclusivegateway4" id="Shape-exclusivegateway4" isMarkerVisible="false">
<omgdc:Bounds height="32.0" width="32.0" x="412.0" y="200.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge bpmnElement="flow28" id="BPMNEdge_flow28" sourceElement="entrySubprocess" targetElement="exclusivegateway5">
<omgdi:waypoint x="621.0" y="179.5"/>
<omgdi:waypoint x="760.0" y="176.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="-1.0" width="-1.0" x="-1.0" y="-1.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow29" id="BPMNEdge_flow29" sourceElement="exclusivegateway5" targetElement="dataBackFlow">
<omgdi:waypoint x="775.0" y="161.0"/>
<omgdi:waypoint x="775.0" y="90.0"/>
<omgdi:waypoint x="880.0" y="22.5"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="14.0" width="7.0" x="700.0" y="166.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow24" id="BPMNEdge_flow24" sourceElement="dataEntrySubTask" targetElement="exclusivegateway4">
<omgdi:waypoint x="375.0" y="217.5"/>
<omgdi:waypoint x="412.0" y="216.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="-1.0" width="-1.0" x="-1.0" y="-1.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow25" id="BPMNEdge_flow25" sourceElement="exclusivegateway4" targetElement="dataApply">
<omgdi:waypoint x="428.0" y="200.0"/>
<omgdi:waypoint x="428.0" y="175.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="14.0" width="8.0" x="432.0" y="200.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow26" id="BPMNEdge_flow26" sourceElement="exclusivegateway4" targetElement="endevent3">
<omgdi:waypoint x="444.0" y="216.0"/>
<omgdi:waypoint x="570.0" y="216.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="14.0" width="7.0" x="452.0" y="220.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow27" id="BPMNEdge_flow27" sourceElement="exclusivegateway5" targetElement="headApply">
<omgdi:waypoint x="776.0" y="192.0"/>
<omgdi:waypoint x="776.0" y="310.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="14.0" width="8.0" x="720.0" y="186.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow1" id="BPMNEdge_flow1" sourceElement="startevent1" targetElement="startEntry">
<omgdi:waypoint x="56.0" y="37.0"/>
<omgdi:waypoint x="56.0" y="150.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="-1.0" width="-1.0" x="-1.0" y="-1.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow21" id="BPMNEdge_flow21" sourceElement="dataApply" targetElement="exclusivegateway3">
<omgdi:waypoint x="485.0" y="147.5"/>
<omgdi:waypoint x="510.0" y="143.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="-1.0" width="-1.0" x="-1.0" y="-1.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow22" id="BPMNEdge_flow22" sourceElement="exclusivegateway3" targetElement="dataEntrySubTask">
<omgdi:waypoint x="529.0" y="130.0"/>
<omgdi:waypoint x="529.0" y="89.0"/>
<omgdi:waypoint x="452.0" y="89.0"/>
<omgdi:waypoint x="322.0" y="89.0"/>
<omgdi:waypoint x="322.5" y="190.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="14.0" width="7.0" x="530.0" y="127.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow23" id="BPMNEdge_flow23" sourceElement="exclusivegateway3" targetElement="endevent3">
<omgdi:waypoint x="538.0" y="147.0"/>
<omgdi:waypoint x="587.0" y="147.0"/>
<omgdi:waypoint x="587.0" y="200.0312805773287"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="14.0" width="8.0" x="550.0" y="147.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow17" id="BPMNEdge_flow17" sourceElement="startevent2" targetElement="dataEntrySubTask">
<omgdi:waypoint x="242.0" y="216.0"/>
<omgdi:waypoint x="270.0" y="217.5"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="-1.0" width="-1.0" x="-1.0" y="-1.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow13" id="BPMNEdge_flow13" sourceElement="exclusivegateway2" targetElement="dataBackFlow">
<omgdi:waypoint x="935.0" y="170.0"/>
<omgdi:waypoint x="935.0" y="95.0"/>
<omgdi:waypoint x="935.0" y="50.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="14.0" width="8.0" x="936.0" y="167.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow14" id="BPMNEdge_flow14" sourceElement="dataBackFlow" targetElement="endevent2">
<omgdi:waypoint x="985.0" y="30.0"/>
<omgdi:waypoint x="1060.0" y="30.0"/>
<omgdi:waypoint x="1060.0" y="-32.0"/>
<omgdi:waypoint x="1240.0" y="-32.0"/>
<omgdi:waypoint x="1060.0" y="168.50806661517032"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="-1.0" width="-1.0" x="-1.0" y="-1.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow15" id="BPMNEdge_flow15" sourceElement="startEntry" targetElement="entrySubprocess">
<omgdi:waypoint x="120.0" y="177.5"/>
<omgdi:waypoint x="200.0" y="179.5"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="-1.0" width="-1.0" x="-1.0" y="-1.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow11" id="BPMNEdge_flow11" sourceElement="headApply" targetElement="exclusivegateway2">
<omgdi:waypoint x="815.0" y="337.5"/>
<omgdi:waypoint x="916.0" y="183.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="-1.0" width="-1.0" x="-1.0" y="-1.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow12" id="BPMNEdge_flow12" sourceElement="exclusivegateway2" targetElement="endevent2">
<omgdi:waypoint x="948.0" y="183.0"/>
<omgdi:waypoint x="1040.0" y="184.0"/>
<bpmndi:BPMNLabel>
<omgdc:Bounds height="14.0" width="7.0" x="956.0" y="187.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</definitions>
src/main/resources/application-test.yml
......@@ -15,7 +15,7 @@ spring:
application:
name: activiti
jpa:
show-sql: true
show-sql: false
database-platform: org.hibernate.dialect.MySQL5Dialect
hibernate:
ddl-auto: update
......@@ -43,7 +43,7 @@ server:
port: 8110
app:
active-process: MoreSubProcessTest.bpmn
active-process: MoreSubProcessTestV2.bpmn
swagger2:
host: localhost:8110
......
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