hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-10-29 17:28:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

完成流程定义的列表的实现

Browse Source
This commit is contained in:
YunaiV
2022-01-03 11:08:47 +08:00
parent 509e11a7b0
commit f8b34d5b6d
10 changed files with 154 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/ProcessDefinitionController.java
View File

@@ -2,12 +2,11 @@ package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition;
import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.BpmProcessDefinitionPageItemRespVO;
import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.BpmProcessDefinitionPageReqVO;
import cn.iocoder.yudao.adminserver.modules.bpm.controller.workflow.vo.FileResp;
import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmDefinitionService;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
@@ -16,8 +15,6 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -38,6 +35,7 @@ public class ProcessDefinitionController {
return success(bpmDefinitionService.getDefinitionPage(pageReqVO));
}
// TODO 芋艿：需要重写该方法
@GetMapping(value = "/getStartForm")
public CommonResult<String> getStartForm(@RequestParam("processKey") String processKey){
// final ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().
@@ -47,11 +45,12 @@ public class ProcessDefinitionController {
return success("/flow/leave/apply");
}
@GetMapping ("/export")
@ApiOperation(value = "流程定义的bpmnXml导出")
public void getDefinitionPage(@RequestParam String processDefinitionId, HttpServletResponse response) throws IOException {
FileResp fileResp = bpmDefinitionService.export(processDefinitionId);
ServletUtils.writeAttachment(response, fileResp.getFileName(), fileResp.getFileByte());
@GetMapping ("/get-bpmn-xml")
@ApiOperation(value = "获得流程定义的 BPMN XML")
@ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = String.class)
public CommonResult<String> getDefinitionBpmnXML(@RequestParam("id") String id) {
String bpmnXML = bpmDefinitionService.getDefinitionBpmnXML(id);
return success(bpmnXML);
}
}

2
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/definition/BpmDefinitionConvert.java
View File

@@ -5,6 +5,7 @@ import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmPro
import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.form.BpmFormDO;
import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.dto.BpmDefinitionCreateReqDTO;
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import org.activiti.engine.impl.persistence.entity.SuspensionState;
import org.activiti.engine.repository.Deployment;
import org.activiti.engine.repository.ProcessDefinition;
import org.mapstruct.Mapper;
@@ -36,6 +37,7 @@ public interface BpmDefinitionConvert {
default BpmProcessDefinitionPageItemRespVO convert(ProcessDefinition bean, Deployment deployment,
BpmProcessDefinitionDO processDefinitionDO, BpmFormDO form) {
BpmProcessDefinitionPageItemRespVO respVO = convert(bean);
respVO.setSuspensionState(bean.isSuspended() ? SuspensionState.SUSPENDED.getStateCode() : SuspensionState.ACTIVE.getStateCode());
if (deployment != null) {
respVO.setDeploymentTime(deployment.getDeploymentTime());
}

20
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/BpmDefinitionService.java
View File

@@ -1,11 +1,11 @@
package cn.iocoder.yudao.adminserver.modules.bpm.service.definition;
import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.BpmProcessDefinitionPageItemRespVO;
import cn.iocoder.yudao.adminserver.modules.bpm.controller.workflow.vo.FileResp;
import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.BpmProcessDefinitionPageReqVO;
import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.dto.BpmDefinitionCreateReqDTO;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import org.activiti.bpmn.model.BpmnModel;
import org.activiti.engine.repository.Deployment;
import org.activiti.engine.repository.ProcessDefinition;
@@ -31,12 +31,20 @@ public interface BpmDefinitionService {
PageResult<BpmProcessDefinitionPageItemRespVO> getDefinitionPage(BpmProcessDefinitionPageReqVO pageReqVO);
/**
* 导出流程 bpmn 模型
* @param processDefinitionId 分页入参
* @return 分页model
* 获得流程定义对应的 BPMN XML
*
* @param id 流程定义编号
* @return BPMN XML
*/
// TODO 芋艿：考虑下重写
FileResp export(String processDefinitionId);
String getDefinitionBpmnXML(String id);
/**
* 获得 Bpmn 模型
*
* @param processDefinitionId 流程定义的编号
* @return Bpmn 模型
*/
BpmnModel getBpmnModel(String processDefinitionId);
/**
* 获得编号对应的 ProcessDefinition

20
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/impl/BpmDefinitionServiceImpl.java
View File

@@ -48,6 +48,8 @@ public class BpmDefinitionServiceImpl implements BpmDefinitionService {
private static final String BPMN_FILE_SUFFIX = ".bpmn";
private static final BpmnXMLConverter BPMN_XML_CONVERTER = new BpmnXMLConverter();
@Resource
private RepositoryService repositoryService;
@Resource
@@ -92,14 +94,18 @@ public class BpmDefinitionServiceImpl implements BpmDefinitionService {
}
@Override
public FileResp export(String processDefinitionId) {
BpmnModel bpmnModel = repositoryService.getBpmnModel(processDefinitionId);
public String getDefinitionBpmnXML(String id) {
BpmnModel bpmnModel = repositoryService.getBpmnModel(id);
if (bpmnModel == null) {
return null;
}
byte[] bpmnBytes = BPMN_XML_CONVERTER.convertToXML(bpmnModel);
return StrUtil.utf8Str(bpmnBytes);
}
byte[] bpmnBytes = new BpmnXMLConverter().convertToXML(bpmnModel);
FileResp fileResp = new FileResp();
fileResp.setFileName( "export");
fileResp.setFileByte(bpmnBytes);
return fileResp;
@Override
public BpmnModel getBpmnModel(String processDefinitionId) {
return repositoryService.getBpmnModel(processDefinitionId);
}
@Override

8
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/form/impl/BpmFormServiceImpl.java
View File

@@ -20,8 +20,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static cn.iocoder.yudao.adminserver.modules.bpm.enums.BpmErrorCodeConstants.BPM_FORM_FIELD_REPEAT;
import static cn.iocoder.yudao.adminserver.modules.bpm.enums.BpmErrorCodeConstants.BPM_FORM_NOT_EXISTS;
import static cn.iocoder.yudao.adminserver.modules.bpm.enums.BpmErrorCodeConstants.FORM_FIELD_REPEAT;
import static cn.iocoder.yudao.adminserver.modules.bpm.enums.BpmErrorCodeConstants.FORM_NOT_EXISTS;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
/**
@@ -66,7 +66,7 @@ public class BpmFormServiceImpl implements BpmFormService {
private void validateFormExists(Long id) {
if (formMapper.selectById(id) == null) {
throw exception(BPM_FORM_NOT_EXISTS);
throw exception(FORM_NOT_EXISTS);
}
}
@@ -106,7 +106,7 @@ public class BpmFormServiceImpl implements BpmFormService {
continue;
}
// 如果存在，则报错
throw exception(BPM_FORM_FIELD_REPEAT, oldLabel, fieldDTO.getLabel(), fieldDTO.getVModel());
throw exception(FORM_FIELD_REPEAT, oldLabel, fieldDTO.getLabel(), fieldDTO.getVModel());
}
}

12
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/model/impl/BpmModelServiceImpl.java
View File

@@ -109,7 +109,7 @@ public class BpmModelServiceImpl implements BpmModelService {
// 校验流程标识已经存在
Model keyModel = this.getModelByKey(createReqVO.getKey());
if (keyModel != null) {
throw exception(BPM_MODEL_KEY_EXISTS, createReqVO.getKey());
throw exception(MODEL_KEY_EXISTS, createReqVO.getKey());
}
// 创建流程定义
@@ -129,7 +129,7 @@ public class BpmModelServiceImpl implements BpmModelService {
// 校验流程模型存在
Model model = repositoryService.getModel(updateReqVO.getId());
if (model == null) {
throw exception(BPMN_MODEL_NOT_EXISTS);
throw exception(MODEL_NOT_EXISTS);
}
// 修改流程定义
@@ -146,11 +146,11 @@ public class BpmModelServiceImpl implements BpmModelService {
// 校验流程模型存在
Model model = repositoryService.getModel(id);
if (ObjectUtils.isEmpty(model)) {
throw exception(BPMN_MODEL_NOT_EXISTS);
throw exception(MODEL_NOT_EXISTS);
}
byte[] bpmnBytes = repositoryService.getModelEditorSource(model.getId());
if (bpmnBytes == null) {
throw exception(BPMN_MODEL_NOT_EXISTS);
throw exception(MODEL_NOT_EXISTS);
}
// 创建流程定义
@@ -169,7 +169,7 @@ public class BpmModelServiceImpl implements BpmModelService {
// 校验流程模型存在
Model model = repositoryService.getModel(id);
if (model == null) {
throw exception(BPMN_MODEL_NOT_EXISTS);
throw exception(MODEL_NOT_EXISTS);
}
// 执行删除
repositoryService.deleteModel(id);
@@ -181,7 +181,7 @@ public class BpmModelServiceImpl implements BpmModelService {
private void checkKeyNCName(String key) {
if (!ValidationUtils.isXmlNCName(key)) {
throw exception(BPMN_MODEL_KEY_VALID);
throw exception(MODEL_KEY_VALID);
}
}

6
yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/bpm/service/form/BpmFormServiceTest.java
View File

@@ -13,7 +13,7 @@ import org.springframework.context.annotation.Import;
import javax.annotation.Resource;
import static cn.iocoder.yudao.adminserver.modules.bpm.enums.BpmErrorCodeConstants.BPM_FORM_NOT_EXISTS;
import static cn.iocoder.yudao.adminserver.modules.bpm.enums.BpmErrorCodeConstants.FORM_NOT_EXISTS;
import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
@@ -72,7 +72,7 @@ public class BpmFormServiceTest extends BaseDbUnitTest {
BpmFormUpdateReqVO reqVO = randomPojo(BpmFormUpdateReqVO.class);
// 调用, 并断言异常
assertServiceException(() -> formService.updateForm(reqVO), BPM_FORM_NOT_EXISTS);
assertServiceException(() -> formService.updateForm(reqVO), FORM_NOT_EXISTS);
}
@Test
@@ -95,7 +95,7 @@ public class BpmFormServiceTest extends BaseDbUnitTest {
Long id = randomLongId();
// 调用, 并断言异常
assertServiceException(() -> formService.deleteForm(id), BPM_FORM_NOT_EXISTS);
assertServiceException(() -> formService.deleteForm(id), FORM_NOT_EXISTS);
}
@Test