|
@@ -4,12 +4,12 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
|
|
import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
|
|
|
import cn.iocoder.yudao.framework.common.util.number.NumberUtils;
|
|
|
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
|
|
|
-import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.FlowableUtils;
|
|
|
-import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstancePageItemRespVO;
|
|
|
+import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionRespVO;
|
|
|
import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceRespVO;
|
|
|
import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmCategoryDO;
|
|
|
import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionInfoDO;
|
|
|
-import cn.iocoder.yudao.module.bpm.event.BpmProcessInstanceResultEvent;
|
|
|
+import cn.iocoder.yudao.module.bpm.event.BpmProcessInstanceStatusEvent;
|
|
|
+import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.FlowableUtils;
|
|
|
import cn.iocoder.yudao.module.bpm.service.message.dto.BpmMessageSendWhenProcessInstanceApproveReqDTO;
|
|
|
import cn.iocoder.yudao.module.bpm.service.message.dto.BpmMessageSendWhenProcessInstanceRejectReqDTO;
|
|
|
import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
|
|
@@ -18,6 +18,7 @@ import org.flowable.engine.history.HistoricProcessInstance;
|
|
|
import org.flowable.engine.repository.ProcessDefinition;
|
|
|
import org.flowable.engine.runtime.ProcessInstance;
|
|
|
import org.flowable.task.api.Task;
|
|
|
+import org.mapstruct.Mapper;
|
|
|
import org.mapstruct.Mapping;
|
|
|
import org.mapstruct.MappingTarget;
|
|
|
import org.mapstruct.factory.Mappers;
|
|
@@ -30,39 +31,43 @@ import java.util.Map;
|
|
|
*
|
|
|
* @author 芋道源码
|
|
|
*/
|
|
|
+@Mapper
|
|
|
public interface BpmProcessInstanceConvert {
|
|
|
|
|
|
BpmProcessInstanceConvert INSTANCE = Mappers.getMapper(BpmProcessInstanceConvert.class);
|
|
|
|
|
|
- default PageResult<BpmProcessInstancePageItemRespVO> convertPage(PageResult<HistoricProcessInstance> pageResult,
|
|
|
- Map<String, ProcessDefinition> processDefinitionMap,
|
|
|
- Map<String, BpmCategoryDO> categoryMap,
|
|
|
- Map<String, List<Task>> taskMap) {
|
|
|
- PageResult<BpmProcessInstancePageItemRespVO> vpPageResult = BeanUtils.toBean(pageResult, BpmProcessInstancePageItemRespVO.class);
|
|
|
+ default PageResult<BpmProcessInstanceRespVO> buildMyProcessInstancePage(PageResult<HistoricProcessInstance> pageResult,
|
|
|
+ Map<String, ProcessDefinition> processDefinitionMap,
|
|
|
+ Map<String, BpmCategoryDO> categoryMap,
|
|
|
+ Map<String, List<Task>> taskMap) {
|
|
|
+ PageResult<BpmProcessInstanceRespVO> vpPageResult = BeanUtils.toBean(pageResult, BpmProcessInstanceRespVO.class);
|
|
|
for (int i = 0; i < pageResult.getList().size(); i++) {
|
|
|
- BpmProcessInstancePageItemRespVO respVO = vpPageResult.getList().get(i);
|
|
|
+ BpmProcessInstanceRespVO respVO = vpPageResult.getList().get(i);
|
|
|
respVO.setStatus(FlowableUtils.getProcessInstanceStatus(pageResult.getList().get(i)));
|
|
|
MapUtils.findAndThen(processDefinitionMap, respVO.getProcessDefinitionId(),
|
|
|
processDefinition -> respVO.setCategory(processDefinition.getCategory()));
|
|
|
MapUtils.findAndThen(categoryMap, respVO.getCategory(), category -> respVO.setCategoryName(category.getName()));
|
|
|
- respVO.setTasks(BeanUtils.toBean(taskMap.get(respVO.getId()), BpmProcessInstancePageItemRespVO.Task.class));
|
|
|
+ respVO.setTasks(BeanUtils.toBean(taskMap.get(respVO.getId()), BpmProcessInstanceRespVO.Task.class));
|
|
|
}
|
|
|
return vpPageResult;
|
|
|
}
|
|
|
|
|
|
- default BpmProcessInstanceRespVO convert2(HistoricProcessInstance processInstance,
|
|
|
- ProcessDefinition processDefinition, BpmProcessDefinitionInfoDO processDefinitionExt,
|
|
|
- String bpmnXml, AdminUserRespDTO startUser, DeptRespDTO dept) {
|
|
|
- BpmProcessInstanceRespVO respVO = convert2(processInstance);
|
|
|
+ default BpmProcessInstanceRespVO buildProcessInstance(HistoricProcessInstance processInstance,
|
|
|
+ ProcessDefinition processDefinition,
|
|
|
+ BpmProcessDefinitionInfoDO processDefinitionExt,
|
|
|
+ String bpmnXml,
|
|
|
+ AdminUserRespDTO startUser,
|
|
|
+ DeptRespDTO dept) {
|
|
|
+ BpmProcessInstanceRespVO respVO = BeanUtils.toBean(processInstance, BpmProcessInstanceRespVO.class);
|
|
|
respVO.setStatus(FlowableUtils.getProcessInstanceStatus(processInstance));
|
|
|
respVO.setFormVariables(FlowableUtils.filterProcessInstanceFormVariable(processInstance.getProcessVariables()));
|
|
|
// definition
|
|
|
- respVO.setProcessDefinition(convert2(processDefinition));
|
|
|
+ respVO.setProcessDefinition(BeanUtils.toBean(processDefinition, BpmProcessDefinitionRespVO.class));
|
|
|
copyTo(processDefinitionExt, respVO.getProcessDefinition());
|
|
|
respVO.getProcessDefinition().setBpmnXml(bpmnXml);
|
|
|
// user
|
|
|
if (startUser != null) {
|
|
|
- respVO.setStartUser(convert2(startUser));
|
|
|
+ respVO.setStartUser(BeanUtils.toBean(startUser, BpmProcessInstanceRespVO.User.class));
|
|
|
if (dept != null) {
|
|
|
respVO.getStartUser().setDeptName(dept.getName());
|
|
|
}
|
|
@@ -70,42 +75,27 @@ public interface BpmProcessInstanceConvert {
|
|
|
return respVO;
|
|
|
}
|
|
|
|
|
|
- BpmProcessInstanceRespVO convert2(HistoricProcessInstance bean);
|
|
|
-
|
|
|
- BpmProcessInstanceRespVO.ProcessDefinition convert2(ProcessDefinition bean);
|
|
|
-
|
|
|
@Mapping(source = "from.id", target = "to.id", ignore = true)
|
|
|
- void copyTo(BpmProcessDefinitionInfoDO from, @MappingTarget BpmProcessInstanceRespVO.ProcessDefinition to);
|
|
|
-
|
|
|
- BpmProcessInstanceRespVO.User convert2(AdminUserRespDTO bean);
|
|
|
+ void copyTo(BpmProcessDefinitionInfoDO from, @MappingTarget BpmProcessDefinitionRespVO to);
|
|
|
|
|
|
- default BpmProcessInstanceResultEvent convert(Object source, HistoricProcessInstance instance, Integer result) {
|
|
|
- BpmProcessInstanceResultEvent event = new BpmProcessInstanceResultEvent(source);
|
|
|
- event.setId(instance.getId());
|
|
|
- event.setProcessDefinitionKey(instance.getProcessDefinitionKey());
|
|
|
- event.setBusinessKey(instance.getBusinessKey());
|
|
|
- event.setResult(result);
|
|
|
- return event;
|
|
|
+ default BpmProcessInstanceStatusEvent buildProcessInstanceStatusEvent(Object source, HistoricProcessInstance instance, Integer status) {
|
|
|
+ return new BpmProcessInstanceStatusEvent(source).setId(instance.getId()).setStatus(status)
|
|
|
+ .setProcessDefinitionKey(instance.getProcessDefinitionKey()).setBusinessKey(instance.getBusinessKey());
|
|
|
}
|
|
|
|
|
|
- // TODO @芋艿:需要改下 key!
|
|
|
- default BpmProcessInstanceResultEvent convert(Object source, ProcessInstance instance, Integer result) {
|
|
|
- BpmProcessInstanceResultEvent event = new BpmProcessInstanceResultEvent(source);
|
|
|
- event.setId(instance.getId());
|
|
|
- event.setProcessDefinitionKey(instance.getProcessDefinitionKey());
|
|
|
- event.setBusinessKey(instance.getBusinessKey());
|
|
|
- event.setResult(result);
|
|
|
- return event;
|
|
|
+ default BpmProcessInstanceStatusEvent buildProcessInstanceStatusEvent(Object source, ProcessInstance instance, Integer status) {;
|
|
|
+ return new BpmProcessInstanceStatusEvent(source).setId(instance.getId()).setStatus(status)
|
|
|
+ .setProcessDefinitionKey(instance.getProcessDefinitionKey()).setBusinessKey(instance.getBusinessKey());
|
|
|
}
|
|
|
|
|
|
- default BpmMessageSendWhenProcessInstanceApproveReqDTO convert2ApprovedReq(ProcessInstance instance){
|
|
|
- return new BpmMessageSendWhenProcessInstanceApproveReqDTO()
|
|
|
+ default BpmMessageSendWhenProcessInstanceApproveReqDTO buildProcessInstanceApproveMessage(ProcessInstance instance) {
|
|
|
+ return new BpmMessageSendWhenProcessInstanceApproveReqDTO()
|
|
|
.setStartUserId(NumberUtils.parseLong(instance.getStartUserId()))
|
|
|
.setProcessInstanceId(instance.getId())
|
|
|
.setProcessInstanceName(instance.getName());
|
|
|
}
|
|
|
|
|
|
- default BpmMessageSendWhenProcessInstanceRejectReqDTO convert2RejectReq(ProcessInstance instance, String reason) {
|
|
|
+ default BpmMessageSendWhenProcessInstanceRejectReqDTO buildProcessInstanceRejectMessage(ProcessInstance instance, String reason) {
|
|
|
return new BpmMessageSendWhenProcessInstanceRejectReqDTO()
|
|
|
.setProcessInstanceName(instance.getName())
|
|
|
.setProcessInstanceId(instance.getId())
|