Commit 93e02b36dd55fc7c8f4f83343eac67b141e25e00
1 parent
23eda6b1
新增 bpm 基于流程实例的详情 API 接口
Showing
13 changed files
with
256 additions
and
31 deletions
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/BpmProcessInstanceController.http
| @@ -23,7 +23,7 @@ Authorization: Bearer {{token}} | @@ -23,7 +23,7 @@ Authorization: Bearer {{token}} | ||
| 23 | "reason": "我就取消" | 23 | "reason": "我就取消" |
| 24 | } | 24 | } |
| 25 | 25 | ||
| 26 | -### 请求 /bpm/process-instance/my-page 接口 => 成功 | ||
| 27 | -GET {{baseUrl}}/bpm/process-instance/my-page | 26 | +### 请求 /bpm/process-instance/get 接口 => 成功 |
| 27 | +GET {{baseUrl}}/bpm/process-instance/get?id=537cceb3-768c-11ec-afcd-a2380e71991a | ||
| 28 | tenant-id: 1 | 28 | tenant-id: 1 |
| 29 | Authorization: Bearer {{token}} | 29 | Authorization: Bearer {{token}} |
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/BpmProcessInstanceController.java
| 1 | package cn.iocoder.yudao.adminserver.modules.bpm.controller.task; | 1 | package cn.iocoder.yudao.adminserver.modules.bpm.controller.task; |
| 2 | 2 | ||
| 3 | -import cn.iocoder.yudao.adminserver.modules.bpm.controller.task.vo.instance.BpmProcessInstanceCancelReqVO; | ||
| 4 | -import cn.iocoder.yudao.adminserver.modules.bpm.controller.task.vo.instance.BpmProcessInstanceCreateReqVO; | ||
| 5 | -import cn.iocoder.yudao.adminserver.modules.bpm.controller.task.vo.instance.BpmProcessInstanceMyPageReqVO; | ||
| 6 | -import cn.iocoder.yudao.adminserver.modules.bpm.controller.task.vo.instance.BpmProcessInstancePageItemRespVO; | 3 | +import cn.iocoder.yudao.adminserver.modules.bpm.controller.task.vo.instance.*; |
| 7 | import cn.iocoder.yudao.adminserver.modules.bpm.service.task.BpmProcessInstanceService; | 4 | import cn.iocoder.yudao.adminserver.modules.bpm.service.task.BpmProcessInstanceService; |
| 8 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; | 5 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 9 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 6 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 10 | import io.swagger.annotations.Api; | 7 | import io.swagger.annotations.Api; |
| 8 | +import io.swagger.annotations.ApiImplicitParam; | ||
| 11 | import io.swagger.annotations.ApiOperation; | 9 | import io.swagger.annotations.ApiOperation; |
| 12 | import org.springframework.validation.annotation.Validated; | 10 | import org.springframework.validation.annotation.Validated; |
| 13 | import org.springframework.web.bind.annotation.*; | 11 | import org.springframework.web.bind.annotation.*; |
| @@ -49,4 +47,11 @@ public class BpmProcessInstanceController { | @@ -49,4 +47,11 @@ public class BpmProcessInstanceController { | ||
| 49 | return success(processInstanceService.getMyProcessInstancePage(getLoginUserId(), pageReqVO)); | 47 | return success(processInstanceService.getMyProcessInstancePage(getLoginUserId(), pageReqVO)); |
| 50 | } | 48 | } |
| 51 | 49 | ||
| 50 | + @GetMapping("/get") | ||
| 51 | + @ApiOperation(value = "获得指定流程实例", notes = "在【流程详细】界面中,进行调用") | ||
| 52 | + @ApiImplicitParam(name = "id", value = "流程实例的编号", required = true, dataTypeClass = String.class) | ||
| 53 | + public CommonResult<BpmProcessInstanceRespVO> getProcessInstance(@RequestParam("id") String id) { | ||
| 54 | + return success(processInstanceService.getProcessInstanceVO(id)); | ||
| 55 | + } | ||
| 56 | + | ||
| 52 | } | 57 | } |
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/BpmTaskController.java
| @@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult; | @@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult; | ||
| 6 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 6 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 7 | import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils; | 7 | import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils; |
| 8 | import io.swagger.annotations.Api; | 8 | import io.swagger.annotations.Api; |
| 9 | +import io.swagger.annotations.ApiImplicitParam; | ||
| 9 | import io.swagger.annotations.ApiOperation; | 10 | import io.swagger.annotations.ApiOperation; |
| 10 | import org.springframework.validation.annotation.Validated; | 11 | import org.springframework.validation.annotation.Validated; |
| 11 | import org.springframework.web.bind.annotation.*; | 12 | import org.springframework.web.bind.annotation.*; |
| @@ -57,7 +58,8 @@ public class BpmTaskController { | @@ -57,7 +58,8 @@ public class BpmTaskController { | ||
| 57 | } | 58 | } |
| 58 | 59 | ||
| 59 | @GetMapping("/list-by-process-instance-id") | 60 | @GetMapping("/list-by-process-instance-id") |
| 60 | - @ApiOperation(value = "获得指定流程实例的任务列表", notes = "包括完成的、未完成的") // TODO 芋艿:注解 | 61 | + @ApiOperation(value = "获得指定流程实例的任务列表", notes = "包括完成的、未完成的") |
| 62 | + @ApiImplicitParam(name = "processInstanceId", value = "流程实例的编号", required = true, dataTypeClass = String.class) | ||
| 61 | public CommonResult<List<BpmTaskRespVO>> getTaskListByProcessInstanceId( | 63 | public CommonResult<List<BpmTaskRespVO>> getTaskListByProcessInstanceId( |
| 62 | @RequestParam("processInstanceId") String processInstanceId) { | 64 | @RequestParam("processInstanceId") String processInstanceId) { |
| 63 | return success(taskService.getTaskListByProcessInstanceId(processInstanceId)); | 65 | return success(taskService.getTaskListByProcessInstanceId(processInstanceId)); |
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/vo/instance/BpmProcessInstanceRespVO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.adminserver.modules.bpm.controller.task.vo.instance; | ||
| 2 | + | ||
| 3 | +import io.swagger.annotations.ApiModel; | ||
| 4 | +import io.swagger.annotations.ApiModelProperty; | ||
| 5 | +import lombok.Data; | ||
| 6 | + | ||
| 7 | +import java.util.Date; | ||
| 8 | +import java.util.List; | ||
| 9 | +import java.util.Map; | ||
| 10 | + | ||
| 11 | +@ApiModel("流程实例的 Response VO") | ||
| 12 | +@Data | ||
| 13 | +public class BpmProcessInstanceRespVO { | ||
| 14 | + | ||
| 15 | + @ApiModelProperty(value = "流程实例的编号", required = true, example = "1024") | ||
| 16 | + private String id; | ||
| 17 | + | ||
| 18 | + @ApiModelProperty(value = "流程名称", required = true, example = "芋道") | ||
| 19 | + private String name; | ||
| 20 | + | ||
| 21 | + @ApiModelProperty(value = "流程分类", required = true, notes = "参见 bpm_model_category 数据字典", example = "1") | ||
| 22 | + private String category; | ||
| 23 | + | ||
| 24 | + @ApiModelProperty(value = "流程实例的状态", required = true, notes = "参见 bpm_process_instance_status", example = "1") | ||
| 25 | + private Integer status; | ||
| 26 | + | ||
| 27 | + @ApiModelProperty(value = "流程实例的结果", required = true, notes = "参见 bpm_process_instance_result", example = "2") | ||
| 28 | + private Integer result; | ||
| 29 | + | ||
| 30 | + @ApiModelProperty(value = "提交时间", required = true) | ||
| 31 | + private Date createTime; | ||
| 32 | + | ||
| 33 | + @ApiModelProperty(value = "结束时间", required = true) | ||
| 34 | + private Date endTime; | ||
| 35 | + | ||
| 36 | + @ApiModelProperty(value = "提交的表单值", required = true) | ||
| 37 | + private Map<String, Object> formVariables; | ||
| 38 | + | ||
| 39 | + /** | ||
| 40 | + * 发起流程的用户 | ||
| 41 | + */ | ||
| 42 | + private User startUser; | ||
| 43 | + | ||
| 44 | + /** | ||
| 45 | + * 流程定义 | ||
| 46 | + */ | ||
| 47 | + private ProcessDefinition processDefinition; | ||
| 48 | + | ||
| 49 | + @ApiModel("用户信息") | ||
| 50 | + @Data | ||
| 51 | + public static class User { | ||
| 52 | + | ||
| 53 | + @ApiModelProperty(value = "用户编号", required = true, example = "1") | ||
| 54 | + private Long id; | ||
| 55 | + @ApiModelProperty(value = "用户昵称", required = true, example = "芋艿") | ||
| 56 | + private String nickname; | ||
| 57 | + | ||
| 58 | + @ApiModelProperty(value = "部门编号", required = true, example = "1") | ||
| 59 | + private Long deptId; | ||
| 60 | + @ApiModelProperty(value = "部门名称", required = true, example = "研发部") | ||
| 61 | + private String deptName; | ||
| 62 | + | ||
| 63 | + } | ||
| 64 | + | ||
| 65 | + @ApiModel("流程定义信息") | ||
| 66 | + @Data | ||
| 67 | + public static class ProcessDefinition { | ||
| 68 | + | ||
| 69 | + @ApiModelProperty(value = "编号", required = true, example = "1024") | ||
| 70 | + private String id; | ||
| 71 | + | ||
| 72 | + @ApiModelProperty(value = "表单类型", notes = "参见 bpm_model_form_type 数据字典", example = "1") | ||
| 73 | + private Integer formType; | ||
| 74 | + @ApiModelProperty(value = "表单编号", example = "1024", notes = "在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空") | ||
| 75 | + private Long formId; | ||
| 76 | + @ApiModelProperty(value = "表单的配置", required = true, | ||
| 77 | + notes = "JSON 字符串。在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空") | ||
| 78 | + private String formConf; | ||
| 79 | + @ApiModelProperty(value = "表单项的数组", required = true, | ||
| 80 | + notes = "JSON 字符串的数组。在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空") | ||
| 81 | + private List<String> formFields; | ||
| 82 | + @ApiModelProperty(value = "自定义表单的提交路径,使用 Vue 的路由地址", example = "/bpm/oa/leave/create", | ||
| 83 | + notes = "在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空") | ||
| 84 | + private String formCustomCreatePath; | ||
| 85 | + @ApiModelProperty(value = "自定义表单的查看路径,使用 Vue 的路由地址", example = "/bpm/oa/leave/view", | ||
| 86 | + notes = "在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空") | ||
| 87 | + private String formCustomViewPath; | ||
| 88 | + | ||
| 89 | + @ApiModelProperty(value = "BPMN XML", required = true) | ||
| 90 | + private String bpmnXml; | ||
| 91 | + | ||
| 92 | + } | ||
| 93 | + | ||
| 94 | +} |
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/task/BpmProcessInstanceConvert.java
| 1 | package cn.iocoder.yudao.adminserver.modules.bpm.convert.task; | 1 | package cn.iocoder.yudao.adminserver.modules.bpm.convert.task; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.adminserver.modules.bpm.controller.task.vo.instance.BpmProcessInstancePageItemRespVO; | 3 | import cn.iocoder.yudao.adminserver.modules.bpm.controller.task.vo.instance.BpmProcessInstancePageItemRespVO; |
| 4 | +import cn.iocoder.yudao.adminserver.modules.bpm.controller.task.vo.instance.BpmProcessInstanceRespVO; | ||
| 5 | +import cn.iocoder.yudao.adminserver.modules.bpm.controller.task.vo.task.BpmTaskRespVO; | ||
| 6 | +import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO; | ||
| 4 | import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.task.BpmProcessInstanceExtDO; | 7 | import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.task.BpmProcessInstanceExtDO; |
| 8 | +import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.dept.SysDeptDO; | ||
| 9 | +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO; | ||
| 5 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 10 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 11 | +import org.activiti.engine.history.HistoricProcessInstance; | ||
| 6 | import org.activiti.engine.repository.ProcessDefinition; | 12 | import org.activiti.engine.repository.ProcessDefinition; |
| 7 | import org.activiti.engine.runtime.ProcessInstance; | 13 | import org.activiti.engine.runtime.ProcessInstance; |
| 8 | import org.activiti.engine.task.Task; | 14 | import org.activiti.engine.task.Task; |
| 9 | import org.mapstruct.Mapper; | 15 | import org.mapstruct.Mapper; |
| 10 | import org.mapstruct.Mapping; | 16 | import org.mapstruct.Mapping; |
| 17 | +import org.mapstruct.MappingTarget; | ||
| 11 | import org.mapstruct.Mappings; | 18 | import org.mapstruct.Mappings; |
| 12 | import org.mapstruct.factory.Mappers; | 19 | import org.mapstruct.factory.Mappers; |
| 13 | 20 | ||
| @@ -26,15 +33,20 @@ public interface BpmProcessInstanceConvert { | @@ -26,15 +33,20 @@ public interface BpmProcessInstanceConvert { | ||
| 26 | 33 | ||
| 27 | BpmProcessInstanceConvert INSTANCE = Mappers.getMapper(BpmProcessInstanceConvert.class); | 34 | BpmProcessInstanceConvert INSTANCE = Mappers.getMapper(BpmProcessInstanceConvert.class); |
| 28 | 35 | ||
| 36 | + default BpmProcessInstanceExtDO convert3(ProcessInstance instance, ProcessDefinition definition) { | ||
| 37 | + BpmProcessInstanceExtDO ext = new BpmProcessInstanceExtDO(); | ||
| 38 | + copyTo(instance, ext); | ||
| 39 | + copyTo(definition, ext); | ||
| 40 | + return ext; | ||
| 41 | + } | ||
| 42 | + | ||
| 29 | @Mappings({ | 43 | @Mappings({ |
| 30 | - @Mapping(source = "instance.startUserId", target = "startUserId"), | ||
| 31 | - @Mapping(source = "instance.id", target = "processInstanceId"), | ||
| 32 | - @Mapping(source = "instance.startTime", target = "createTime"), | ||
| 33 | - @Mapping(source = "definition.id", target = "processDefinitionId"), | ||
| 34 | - @Mapping(source = "definition.name", target = "name"), | ||
| 35 | - @Mapping(source = "definition.category", target = "category") | 44 | + @Mapping(source = "from.id", target = "id", ignore = true), |
| 45 | + @Mapping(source = "from.startTime", target = "createTime"), | ||
| 36 | }) | 46 | }) |
| 37 | - BpmProcessInstanceExtDO convert(ProcessInstance instance, ProcessDefinition definition); | 47 | + void copyTo(ProcessInstance from, @MappingTarget BpmProcessInstanceExtDO to); |
| 48 | + @Mapping(source = "from.id", target = "id", ignore = true) | ||
| 49 | + void copyTo(ProcessDefinition from, @MappingTarget BpmProcessInstanceExtDO to); | ||
| 38 | 50 | ||
| 39 | default PageResult<BpmProcessInstancePageItemRespVO> convertPage(PageResult<BpmProcessInstanceExtDO> page, | 51 | default PageResult<BpmProcessInstancePageItemRespVO> convertPage(PageResult<BpmProcessInstanceExtDO> page, |
| 40 | Map<String, List<Task>> taskMap) { | 52 | Map<String, List<Task>> taskMap) { |
| @@ -58,4 +70,31 @@ public interface BpmProcessInstanceConvert { | @@ -58,4 +70,31 @@ public interface BpmProcessInstanceConvert { | ||
| 58 | }) | 70 | }) |
| 59 | BpmProcessInstanceExtDO convert(org.activiti.api.process.model.ProcessInstance bean); | 71 | BpmProcessInstanceExtDO convert(org.activiti.api.process.model.ProcessInstance bean); |
| 60 | 72 | ||
| 73 | + default BpmProcessInstanceRespVO convert2(HistoricProcessInstance processInstance, BpmProcessInstanceExtDO processInstanceExt, | ||
| 74 | + ProcessDefinition processDefinition, BpmProcessDefinitionExtDO processDefinitionExt, | ||
| 75 | + String bpmnXml, SysUserDO startUser, SysDeptDO dept) { | ||
| 76 | + BpmProcessInstanceRespVO respVO = convert2(processInstance); | ||
| 77 | + copyTo(processInstanceExt, respVO); | ||
| 78 | + // definition | ||
| 79 | + respVO.setProcessDefinition(convert2(processDefinition)); | ||
| 80 | + copyTo(processDefinitionExt, respVO.getProcessDefinition()); | ||
| 81 | + respVO.getProcessDefinition().setBpmnXml(bpmnXml); | ||
| 82 | + // user | ||
| 83 | + if (startUser != null) { | ||
| 84 | + respVO.setStartUser(convert2(startUser)); | ||
| 85 | + if (dept != null) { | ||
| 86 | + respVO.getStartUser().setDeptName(dept.getName()); | ||
| 87 | + } | ||
| 88 | + } | ||
| 89 | + return respVO; | ||
| 90 | + } | ||
| 91 | + | ||
| 92 | + BpmProcessInstanceRespVO convert2(HistoricProcessInstance bean); | ||
| 93 | + @Mapping(source = "from.id", target = "to.id", ignore = true) | ||
| 94 | + void copyTo(BpmProcessInstanceExtDO from, @MappingTarget BpmProcessInstanceRespVO to); | ||
| 95 | + BpmProcessInstanceRespVO.ProcessDefinition convert2(ProcessDefinition bean); | ||
| 96 | + @Mapping(source = "from.id", target = "to.id", ignore = true) | ||
| 97 | + void copyTo(BpmProcessDefinitionExtDO from, @MappingTarget BpmProcessInstanceRespVO.ProcessDefinition to); | ||
| 98 | + BpmProcessInstanceRespVO.User convert2(SysUserDO bean); | ||
| 99 | + | ||
| 61 | } | 100 | } |
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/task/BpmProcessInstanceExtDO.java
| @@ -4,6 +4,7 @@ import cn.iocoder.yudao.adminserver.modules.bpm.enums.task.BpmProcessInstanceRes | @@ -4,6 +4,7 @@ import cn.iocoder.yudao.adminserver.modules.bpm.enums.task.BpmProcessInstanceRes | ||
| 4 | import cn.iocoder.yudao.adminserver.modules.bpm.enums.task.BpmProcessInstanceStatusEnum; | 4 | import cn.iocoder.yudao.adminserver.modules.bpm.enums.task.BpmProcessInstanceStatusEnum; |
| 5 | import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | 5 | import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; |
| 6 | import com.baomidou.mybatisplus.annotation.TableField; | 6 | import com.baomidou.mybatisplus.annotation.TableField; |
| 7 | +import com.baomidou.mybatisplus.annotation.TableId; | ||
| 7 | import com.baomidou.mybatisplus.annotation.TableName; | 8 | import com.baomidou.mybatisplus.annotation.TableName; |
| 8 | import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; | 9 | import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; |
| 9 | import lombok.Data; | 10 | import lombok.Data; |
| @@ -32,6 +33,11 @@ import java.util.Map; | @@ -32,6 +33,11 @@ import java.util.Map; | ||
| 32 | public class BpmProcessInstanceExtDO extends BaseDO { | 33 | public class BpmProcessInstanceExtDO extends BaseDO { |
| 33 | 34 | ||
| 34 | /** | 35 | /** |
| 36 | + * 编号,自增 | ||
| 37 | + */ | ||
| 38 | + @TableId | ||
| 39 | + private Long id; | ||
| 40 | + /** | ||
| 35 | * 发起流程的用户编号 | 41 | * 发起流程的用户编号 |
| 36 | * | 42 | * |
| 37 | * 冗余 {@link HistoricProcessInstance#getStartUserId()} | 43 | * 冗余 {@link HistoricProcessInstance#getStartUserId()} |
| @@ -82,7 +88,7 @@ public class BpmProcessInstanceExtDO extends BaseDO { | @@ -82,7 +88,7 @@ public class BpmProcessInstanceExtDO extends BaseDO { | ||
| 82 | private Date endTime; | 88 | private Date endTime; |
| 83 | 89 | ||
| 84 | /** | 90 | /** |
| 85 | - * 表单值 | 91 | + * 提交的表单值 |
| 86 | */ | 92 | */ |
| 87 | @TableField(typeHandler = JacksonTypeHandler.class) | 93 | @TableField(typeHandler = JacksonTypeHandler.class) |
| 88 | private Map<String, Object> formVariables; | 94 | private Map<String, Object> formVariables; |
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/mysql/definition/BpmProcessDefinitionExtMapper.java
| 1 | package cn.iocoder.yudao.adminserver.modules.bpm.dal.mysql.definition; | 1 | package cn.iocoder.yudao.adminserver.modules.bpm.dal.mysql.definition; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO; | 3 | import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO; |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | ||
| 4 | import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | 5 | import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
| 5 | import com.baomidou.mybatisplus.core.mapper.BaseMapper; | 6 | import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
| 6 | import org.apache.ibatis.annotations.Mapper; | 7 | import org.apache.ibatis.annotations.Mapper; |
| @@ -9,10 +10,14 @@ import java.util.Collection; | @@ -9,10 +10,14 @@ import java.util.Collection; | ||
| 9 | import java.util.List; | 10 | import java.util.List; |
| 10 | 11 | ||
| 11 | @Mapper | 12 | @Mapper |
| 12 | -public interface BpmProcessDefinitionExtMapper extends BaseMapper<BpmProcessDefinitionExtDO> { | 13 | +public interface BpmProcessDefinitionExtMapper extends BaseMapperX<BpmProcessDefinitionExtDO> { |
| 13 | 14 | ||
| 14 | default List<BpmProcessDefinitionExtDO> selectListByProcessDefinitionIds(Collection<String> processDefinitionIds) { | 15 | default List<BpmProcessDefinitionExtDO> selectListByProcessDefinitionIds(Collection<String> processDefinitionIds) { |
| 15 | - return selectList(new QueryWrapper<BpmProcessDefinitionExtDO>().in("process_definition_id", processDefinitionIds)); | 16 | + return selectList("process_definition_id", processDefinitionIds); |
| 17 | + } | ||
| 18 | + | ||
| 19 | + default BpmProcessDefinitionExtDO selectByProcessDefinitionId(String processDefinitionId) { | ||
| 20 | + return selectOne("process_definition_id", processDefinitionId); | ||
| 16 | } | 21 | } |
| 17 | 22 | ||
| 18 | } | 23 | } |
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/mysql/task/BpmProcessInstanceExtMapper.java
| @@ -23,6 +23,10 @@ public interface BpmProcessInstanceExtMapper extends BaseMapperX<BpmProcessInsta | @@ -23,6 +23,10 @@ public interface BpmProcessInstanceExtMapper extends BaseMapperX<BpmProcessInsta | ||
| 23 | .orderByDesc("id")); | 23 | .orderByDesc("id")); |
| 24 | } | 24 | } |
| 25 | 25 | ||
| 26 | + default BpmProcessInstanceExtDO selectByProcessInstanceId(String processDefinitionId) { | ||
| 27 | + return selectOne("process_instance_id", processDefinitionId); | ||
| 28 | + } | ||
| 29 | + | ||
| 26 | default void updateByProcessInstanceId(BpmProcessInstanceExtDO updateObj) { | 30 | default void updateByProcessInstanceId(BpmProcessInstanceExtDO updateObj) { |
| 27 | update(updateObj, new QueryWrapper<BpmProcessInstanceExtDO>() | 31 | update(updateObj, new QueryWrapper<BpmProcessInstanceExtDO>() |
| 28 | .eq("process_instance_id", updateObj.getProcessInstanceId())); | 32 | .eq("process_instance_id", updateObj.getProcessInstanceId())); |
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/BpmProcessDefinitionService.java
| @@ -4,6 +4,7 @@ import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.process | @@ -4,6 +4,7 @@ import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.process | ||
| 4 | import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.process.BpmProcessDefinitionPageItemRespVO; | 4 | import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.process.BpmProcessDefinitionPageItemRespVO; |
| 5 | import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.process.BpmProcessDefinitionPageReqVO; | 5 | import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.process.BpmProcessDefinitionPageReqVO; |
| 6 | import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.process.BpmProcessDefinitionRespVO; | 6 | import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.process.BpmProcessDefinitionRespVO; |
| 7 | +import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO; | ||
| 7 | import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.dto.BpmDefinitionCreateReqDTO; | 8 | import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.dto.BpmDefinitionCreateReqDTO; |
| 8 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 9 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 9 | import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; | 10 | import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; |
| @@ -75,6 +76,14 @@ public interface BpmProcessDefinitionService { | @@ -75,6 +76,14 @@ public interface BpmProcessDefinitionService { | ||
| 75 | ProcessDefinition getProcessDefinition2(String id); | 76 | ProcessDefinition getProcessDefinition2(String id); |
| 76 | 77 | ||
| 77 | /** | 78 | /** |
| 79 | + * 获得编号对应的 BpmProcessDefinitionExtDO | ||
| 80 | + * | ||
| 81 | + * @param id 编号 | ||
| 82 | + * @return 流程定义拓展 | ||
| 83 | + */ | ||
| 84 | + BpmProcessDefinitionExtDO getProcessDefinitionExt(String id); | ||
| 85 | + | ||
| 86 | + /** | ||
| 78 | * 获得 id 对应的 Deployment | 87 | * 获得 id 对应的 Deployment |
| 79 | * | 88 | * |
| 80 | * @param id 部署编号 | 89 | * @param id 部署编号 |
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/impl/BpmProcessDefinitionServiceImpl.java
| @@ -13,6 +13,7 @@ import cn.iocoder.yudao.adminserver.modules.bpm.dal.mysql.definition.BpmProcessD | @@ -13,6 +13,7 @@ import cn.iocoder.yudao.adminserver.modules.bpm.dal.mysql.definition.BpmProcessD | ||
| 13 | import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmProcessDefinitionService; | 13 | import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmProcessDefinitionService; |
| 14 | import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.dto.BpmDefinitionCreateReqDTO; | 14 | import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.dto.BpmDefinitionCreateReqDTO; |
| 15 | import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmFormService; | 15 | import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmFormService; |
| 16 | +import cn.iocoder.yudao.framework.activiti.core.util.ActivitiUtils; | ||
| 16 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 17 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 17 | import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; | 18 | import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; |
| 18 | import cn.iocoder.yudao.framework.common.util.object.PageUtils; | 19 | import cn.iocoder.yudao.framework.common.util.object.PageUtils; |
| @@ -51,8 +52,6 @@ public class BpmProcessDefinitionServiceImpl implements BpmProcessDefinitionServ | @@ -51,8 +52,6 @@ public class BpmProcessDefinitionServiceImpl implements BpmProcessDefinitionServ | ||
| 51 | 52 | ||
| 52 | private static final String BPMN_FILE_SUFFIX = ".bpmn"; | 53 | private static final String BPMN_FILE_SUFFIX = ".bpmn"; |
| 53 | 54 | ||
| 54 | - private static final BpmnXMLConverter BPMN_XML_CONVERTER = new BpmnXMLConverter(); | ||
| 55 | - | ||
| 56 | @Resource | 55 | @Resource |
| 57 | private RepositoryService repositoryService; | 56 | private RepositoryService repositoryService; |
| 58 | @Resource | 57 | @Resource |
| @@ -122,9 +121,7 @@ public class BpmProcessDefinitionServiceImpl implements BpmProcessDefinitionServ | @@ -122,9 +121,7 @@ public class BpmProcessDefinitionServiceImpl implements BpmProcessDefinitionServ | ||
| 122 | if (bpmnModel == null) { | 121 | if (bpmnModel == null) { |
| 123 | return null; | 122 | return null; |
| 124 | } | 123 | } |
| 125 | - // TODO 芋艿:重构到 activi util 里 | ||
| 126 | - byte[] bpmnBytes = BPMN_XML_CONVERTER.convertToXML(bpmnModel); | ||
| 127 | - return StrUtil.utf8Str(bpmnBytes); | 124 | + return ActivitiUtils.getBpmnXml(bpmnModel); |
| 128 | } | 125 | } |
| 129 | 126 | ||
| 130 | @Override | 127 | @Override |
| @@ -143,6 +140,11 @@ public class BpmProcessDefinitionServiceImpl implements BpmProcessDefinitionServ | @@ -143,6 +140,11 @@ public class BpmProcessDefinitionServiceImpl implements BpmProcessDefinitionServ | ||
| 143 | } | 140 | } |
| 144 | 141 | ||
| 145 | @Override | 142 | @Override |
| 143 | + public BpmProcessDefinitionExtDO getProcessDefinitionExt(String id) { | ||
| 144 | + return processDefinitionMapper.selectByProcessDefinitionId(id); | ||
| 145 | + } | ||
| 146 | + | ||
| 147 | + @Override | ||
| 146 | public Deployment getDeployment(String id) { | 148 | public Deployment getDeployment(String id) { |
| 147 | if (StrUtil.isEmpty(id)) { | 149 | if (StrUtil.isEmpty(id)) { |
| 148 | return null; | 150 | return null; |
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/task/BpmProcessInstanceService.java
| 1 | package cn.iocoder.yudao.adminserver.modules.bpm.service.task; | 1 | package cn.iocoder.yudao.adminserver.modules.bpm.service.task; |
| 2 | 2 | ||
| 3 | -import cn.iocoder.yudao.adminserver.modules.bpm.controller.task.vo.instance.BpmProcessInstanceCancelReqVO; | ||
| 4 | -import cn.iocoder.yudao.adminserver.modules.bpm.controller.task.vo.instance.BpmProcessInstanceCreateReqVO; | ||
| 5 | -import cn.iocoder.yudao.adminserver.modules.bpm.controller.task.vo.instance.BpmProcessInstanceMyPageReqVO; | ||
| 6 | -import cn.iocoder.yudao.adminserver.modules.bpm.controller.task.vo.instance.BpmProcessInstancePageItemRespVO; | 3 | +import cn.iocoder.yudao.adminserver.modules.bpm.controller.task.vo.instance.*; |
| 7 | import cn.iocoder.yudao.adminserver.modules.bpm.enums.task.BpmProcessInstanceDeleteReasonEnum; | 4 | import cn.iocoder.yudao.adminserver.modules.bpm.enums.task.BpmProcessInstanceDeleteReasonEnum; |
| 8 | import cn.iocoder.yudao.adminserver.modules.bpm.enums.task.BpmProcessInstanceResultEnum; | 5 | import cn.iocoder.yudao.adminserver.modules.bpm.enums.task.BpmProcessInstanceResultEnum; |
| 9 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 6 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| @@ -69,6 +66,14 @@ public interface BpmProcessInstanceService { | @@ -69,6 +66,14 @@ public interface BpmProcessInstanceService { | ||
| 69 | @Valid BpmProcessInstanceMyPageReqVO pageReqVO); | 66 | @Valid BpmProcessInstanceMyPageReqVO pageReqVO); |
| 70 | 67 | ||
| 71 | /** | 68 | /** |
| 69 | + * 获得流程实例 VO 信息 | ||
| 70 | + * | ||
| 71 | + * @param id 流程实例的编号 | ||
| 72 | + * @return 流程实例 | ||
| 73 | + */ | ||
| 74 | + BpmProcessInstanceRespVO getProcessInstanceVO(String id); | ||
| 75 | + | ||
| 76 | + /** | ||
| 72 | * 获得流程实例 | 77 | * 获得流程实例 |
| 73 | * | 78 | * |
| 74 | * @param id 流程实例的编号 | 79 | * @param id 流程实例的编号 |
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/task/impl/BpmProcessInstanceServiceImpl.java
| 1 | package cn.iocoder.yudao.adminserver.modules.bpm.service.task.impl; | 1 | package cn.iocoder.yudao.adminserver.modules.bpm.service.task.impl; |
| 2 | 2 | ||
| 3 | import cn.hutool.core.collection.CollUtil; | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | -import cn.iocoder.yudao.adminserver.modules.bpm.controller.task.vo.instance.BpmProcessInstanceCancelReqVO; | ||
| 5 | -import cn.iocoder.yudao.adminserver.modules.bpm.controller.task.vo.instance.BpmProcessInstanceCreateReqVO; | ||
| 6 | -import cn.iocoder.yudao.adminserver.modules.bpm.controller.task.vo.instance.BpmProcessInstanceMyPageReqVO; | ||
| 7 | -import cn.iocoder.yudao.adminserver.modules.bpm.controller.task.vo.instance.BpmProcessInstancePageItemRespVO; | 4 | +import cn.hutool.core.lang.Assert; |
| 5 | +import cn.hutool.core.util.NumberUtil; | ||
| 6 | +import cn.hutool.core.util.StrUtil; | ||
| 7 | +import cn.iocoder.yudao.adminserver.modules.bpm.controller.task.vo.instance.*; | ||
| 8 | import cn.iocoder.yudao.adminserver.modules.bpm.convert.task.BpmProcessInstanceConvert; | 8 | import cn.iocoder.yudao.adminserver.modules.bpm.convert.task.BpmProcessInstanceConvert; |
| 9 | +import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO; | ||
| 9 | import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.task.BpmProcessInstanceExtDO; | 10 | import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.task.BpmProcessInstanceExtDO; |
| 10 | import cn.iocoder.yudao.adminserver.modules.bpm.dal.mysql.task.BpmProcessInstanceExtMapper; | 11 | import cn.iocoder.yudao.adminserver.modules.bpm.dal.mysql.task.BpmProcessInstanceExtMapper; |
| 11 | import cn.iocoder.yudao.adminserver.modules.bpm.enums.task.BpmProcessInstanceDeleteReasonEnum; | 12 | import cn.iocoder.yudao.adminserver.modules.bpm.enums.task.BpmProcessInstanceDeleteReasonEnum; |
| @@ -14,8 +15,12 @@ import cn.iocoder.yudao.adminserver.modules.bpm.enums.task.BpmProcessInstanceSta | @@ -14,8 +15,12 @@ import cn.iocoder.yudao.adminserver.modules.bpm.enums.task.BpmProcessInstanceSta | ||
| 14 | import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmProcessDefinitionService; | 15 | import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmProcessDefinitionService; |
| 15 | import cn.iocoder.yudao.adminserver.modules.bpm.service.task.BpmProcessInstanceService; | 16 | import cn.iocoder.yudao.adminserver.modules.bpm.service.task.BpmProcessInstanceService; |
| 16 | import cn.iocoder.yudao.adminserver.modules.bpm.service.task.BpmTaskService; | 17 | import cn.iocoder.yudao.adminserver.modules.bpm.service.task.BpmTaskService; |
| 18 | +import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.dept.SysDeptDO; | ||
| 19 | +import cn.iocoder.yudao.adminserver.modules.system.service.dept.SysDeptService; | ||
| 17 | import cn.iocoder.yudao.adminserver.modules.system.service.user.SysUserService; | 20 | import cn.iocoder.yudao.adminserver.modules.system.service.user.SysUserService; |
| 21 | +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO; | ||
| 18 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 22 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 23 | +import cn.iocoder.yudao.framework.common.util.number.NumberUtils; | ||
| 19 | import lombok.extern.slf4j.Slf4j; | 24 | import lombok.extern.slf4j.Slf4j; |
| 20 | import org.activiti.engine.HistoryService; | 25 | import org.activiti.engine.HistoryService; |
| 21 | import org.activiti.engine.RuntimeService; | 26 | import org.activiti.engine.RuntimeService; |
| @@ -23,6 +28,7 @@ import org.activiti.engine.history.HistoricProcessInstance; | @@ -23,6 +28,7 @@ import org.activiti.engine.history.HistoricProcessInstance; | ||
| 23 | import org.activiti.engine.repository.ProcessDefinition; | 28 | import org.activiti.engine.repository.ProcessDefinition; |
| 24 | import org.activiti.engine.runtime.ProcessInstance; | 29 | import org.activiti.engine.runtime.ProcessInstance; |
| 25 | import org.activiti.engine.task.Task; | 30 | import org.activiti.engine.task.Task; |
| 31 | +import org.mapstruct.ap.shaded.freemarker.template.utility.StringUtil; | ||
| 26 | import org.springframework.context.annotation.Lazy; | 32 | import org.springframework.context.annotation.Lazy; |
| 27 | import org.springframework.stereotype.Service; | 33 | import org.springframework.stereotype.Service; |
| 28 | import org.springframework.transaction.annotation.Transactional; | 34 | import org.springframework.transaction.annotation.Transactional; |
| @@ -60,6 +66,8 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService | @@ -60,6 +66,8 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService | ||
| 60 | @Resource | 66 | @Resource |
| 61 | private SysUserService userService; | 67 | private SysUserService userService; |
| 62 | @Resource | 68 | @Resource |
| 69 | + private SysDeptService deptService; | ||
| 70 | + @Resource | ||
| 63 | @Lazy // 解决循环依赖 | 71 | @Lazy // 解决循环依赖 |
| 64 | private BpmTaskService taskService; | 72 | private BpmTaskService taskService; |
| 65 | @Resource | 73 | @Resource |
| @@ -153,6 +161,37 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService | @@ -153,6 +161,37 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService | ||
| 153 | } | 161 | } |
| 154 | 162 | ||
| 155 | @Override | 163 | @Override |
| 164 | + public BpmProcessInstanceRespVO getProcessInstanceVO(String id) { | ||
| 165 | + // 获得流程实例 | ||
| 166 | + HistoricProcessInstance processInstance = getHistoricProcessInstance(id); | ||
| 167 | + if (processInstance == null) { | ||
| 168 | + return null; | ||
| 169 | + } | ||
| 170 | + BpmProcessInstanceExtDO processInstanceExt = processInstanceExtMapper.selectByProcessInstanceId(id); | ||
| 171 | + Assert.notNull(processInstanceExt, "流程实例拓展({}) 不存在", id); | ||
| 172 | + | ||
| 173 | + // 获得流程定义 | ||
| 174 | + ProcessDefinition processDefinition = processDefinitionService.getProcessDefinition( | ||
| 175 | + processInstance.getProcessDefinitionId()); | ||
| 176 | + Assert.notNull(processDefinition, "流程定义({}) 不存在", processInstance.getProcessDefinitionId()); | ||
| 177 | + BpmProcessDefinitionExtDO processDefinitionExt = processDefinitionService.getProcessDefinitionExt( | ||
| 178 | + processInstance.getProcessDefinitionId()); | ||
| 179 | + Assert.notNull(processDefinitionExt, "流程定义拓展({}) 不存在", id); | ||
| 180 | + String bpmnXml = processDefinitionService.getProcessDefinitionBpmnXML(processInstance.getProcessDefinitionId()); | ||
| 181 | + | ||
| 182 | + // 获得 User | ||
| 183 | + SysUserDO startUser = userService.getUser(NumberUtils.parseLong(processInstance.getStartUserId())); | ||
| 184 | + SysDeptDO dept = null; | ||
| 185 | + if (startUser != null) { | ||
| 186 | + dept = deptService.getDept(startUser.getDeptId()); | ||
| 187 | + } | ||
| 188 | + | ||
| 189 | + // 拼接结果 | ||
| 190 | + return BpmProcessInstanceConvert.INSTANCE.convert2(processInstance, processInstanceExt, | ||
| 191 | + processDefinition, processDefinitionExt, bpmnXml, startUser, dept); | ||
| 192 | + } | ||
| 193 | + | ||
| 194 | + @Override | ||
| 156 | public List<ProcessInstance> getProcessInstances(Set<String> ids) { | 195 | public List<ProcessInstance> getProcessInstances(Set<String> ids) { |
| 157 | return runtimeService.createProcessInstanceQuery().processInstanceIds(ids).list(); | 196 | return runtimeService.createProcessInstanceQuery().processInstanceIds(ids).list(); |
| 158 | } | 197 | } |
yudao-framework/yudao-spring-boot-starter-activiti/src/main/java/cn/iocoder/yudao/framework/activiti/core/util/ActivitiUtils.java
| 1 | package cn.iocoder.yudao.framework.activiti.core.util; | 1 | package cn.iocoder.yudao.framework.activiti.core.util; |
| 2 | 2 | ||
| 3 | import cn.hutool.core.util.ReflectUtil; | 3 | import cn.hutool.core.util.ReflectUtil; |
| 4 | +import cn.hutool.core.util.StrUtil; | ||
| 4 | import com.alibaba.ttl.TransmittableThreadLocal; | 5 | import com.alibaba.ttl.TransmittableThreadLocal; |
| 5 | import org.activiti.bpmn.converter.BpmnXMLConverter; | 6 | import org.activiti.bpmn.converter.BpmnXMLConverter; |
| 6 | import org.activiti.bpmn.model.BpmnModel; | 7 | import org.activiti.bpmn.model.BpmnModel; |
| @@ -46,7 +47,6 @@ public class ActivitiUtils { | @@ -46,7 +47,6 @@ public class ActivitiUtils { | ||
| 46 | 47 | ||
| 47 | // ========== BPMN XML 相关 ========== | 48 | // ========== BPMN XML 相关 ========== |
| 48 | 49 | ||
| 49 | - | ||
| 50 | /** | 50 | /** |
| 51 | * 构建对应的 BPMN Model | 51 | * 构建对应的 BPMN Model |
| 52 | * | 52 | * |
| @@ -59,6 +59,13 @@ public class ActivitiUtils { | @@ -59,6 +59,13 @@ public class ActivitiUtils { | ||
| 59 | return converter.convertToBpmnModel(new BytesStreamSource(bpmnBytes), true, true); | 59 | return converter.convertToBpmnModel(new BytesStreamSource(bpmnBytes), true, true); |
| 60 | } | 60 | } |
| 61 | 61 | ||
| 62 | + /** | ||
| 63 | + * 获得 BPMN 流程中,指定的元素们 | ||
| 64 | + * | ||
| 65 | + * @param model | ||
| 66 | + * @param clazz 指定元素。例如说,{@link org.activiti.bpmn.model.UserTask}、{@link org.activiti.bpmn.model.Gateway} 等等 | ||
| 67 | + * @return 元素们 | ||
| 68 | + */ | ||
| 62 | public static <T extends FlowElement> List<T> getBpmnModelElements(BpmnModel model, Class<T> clazz) { | 69 | public static <T extends FlowElement> List<T> getBpmnModelElements(BpmnModel model, Class<T> clazz) { |
| 63 | List<T> result = new ArrayList<>(); | 70 | List<T> result = new ArrayList<>(); |
| 64 | model.getProcesses().forEach(process -> { | 71 | model.getProcesses().forEach(process -> { |
| @@ -71,4 +78,12 @@ public class ActivitiUtils { | @@ -71,4 +78,12 @@ public class ActivitiUtils { | ||
| 71 | return result; | 78 | return result; |
| 72 | } | 79 | } |
| 73 | 80 | ||
| 81 | + public static String getBpmnXml(BpmnModel model) { | ||
| 82 | + if (model == null) { | ||
| 83 | + return null; | ||
| 84 | + } | ||
| 85 | + BpmnXMLConverter converter = new BpmnXMLConverter(); | ||
| 86 | + return StrUtil.utf8Str(converter.convertToXML(model)); | ||
| 87 | + } | ||
| 88 | + | ||
| 74 | } | 89 | } |