|
|
@@ -1,24 +1,23 @@
|
|
|
package cn.iocoder.yudao.adminserver.modules.bpm.service.definition.impl;
|
|
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
+import cn.hutool.core.util.ObjectUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.process.BpmProcessDefinitionListReqVO;
|
|
|
import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.process.BpmProcessDefinitionPageItemRespVO;
|
|
|
import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.process.BpmProcessDefinitionPageReqVO;
|
|
|
import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.process.BpmProcessDefinitionRespVO;
|
|
|
import cn.iocoder.yudao.adminserver.modules.bpm.convert.definition.BpmProcessDefinitionConvert;
|
|
|
-import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO;
|
|
|
import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmFormDO;
|
|
|
+import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO;
|
|
|
import cn.iocoder.yudao.adminserver.modules.bpm.dal.mysql.definition.BpmProcessDefinitionExtMapper;
|
|
|
-import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmProcessDefinitionService;
|
|
|
-import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.dto.BpmDefinitionCreateReqDTO;
|
|
|
import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmFormService;
|
|
|
+import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmProcessDefinitionService;
|
|
|
+import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.dto.BpmProcessDefinitionCreateReqDTO;
|
|
|
import cn.iocoder.yudao.framework.activiti.core.util.ActivitiUtils;
|
|
|
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
|
|
-import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
|
|
|
import cn.iocoder.yudao.framework.common.util.object.PageUtils;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
-import org.activiti.bpmn.converter.BpmnXMLConverter;
|
|
|
import org.activiti.bpmn.model.BpmnModel;
|
|
|
import org.activiti.engine.RepositoryService;
|
|
|
import org.activiti.engine.impl.persistence.entity.SuspensionState;
|
|
|
@@ -32,8 +31,7 @@ import org.springframework.validation.annotation.Validated;
|
|
|
import javax.annotation.Resource;
|
|
|
import java.util.*;
|
|
|
|
|
|
-import static cn.iocoder.yudao.adminserver.modules.bpm.enums.BpmErrorCodeConstants.PROCESS_DEFINITION_KEY_NOT_MATCH;
|
|
|
-import static cn.iocoder.yudao.adminserver.modules.bpm.enums.BpmErrorCodeConstants.PROCESS_DEFINITION_NAME_NOT_MATCH;
|
|
|
+import static cn.iocoder.yudao.adminserver.modules.bpm.enums.BpmErrorCodeConstants.*;
|
|
|
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
|
|
|
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
|
|
|
import static java.util.Collections.emptyList;
|
|
|
@@ -139,6 +137,16 @@ public class BpmProcessDefinitionServiceImpl implements BpmProcessDefinitionServ
|
|
|
return repositoryService.createProcessDefinitionQuery().processDefinitionId(id).singleResult();
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 获得流程定义标识对应的激活的流程定义
|
|
|
+ *
|
|
|
+ * @param processDefinitionKey 流程定义的标识
|
|
|
+ * @return 流程定义
|
|
|
+ */
|
|
|
+ private ProcessDefinition getActiveProcessDefinition(String processDefinitionKey) {
|
|
|
+ return repositoryService.createProcessDefinitionQuery().processDefinitionKey(processDefinitionKey).active().singleResult();
|
|
|
+ }
|
|
|
+
|
|
|
@Override
|
|
|
public BpmProcessDefinitionExtDO getProcessDefinitionExt(String id) {
|
|
|
return processDefinitionMapper.selectByProcessDefinitionId(id);
|
|
|
@@ -166,6 +174,9 @@ public class BpmProcessDefinitionServiceImpl implements BpmProcessDefinitionServ
|
|
|
|
|
|
@Override
|
|
|
public ProcessDefinition getProcessDefinitionByDeploymentId(String deploymentId) {
|
|
|
+ if (StrUtil.isEmpty(deploymentId)) {
|
|
|
+ return null;
|
|
|
+ }
|
|
|
return repositoryService.createProcessDefinitionQuery().deploymentId(deploymentId).singleResult();
|
|
|
}
|
|
|
|
|
|
@@ -177,13 +188,45 @@ public class BpmProcessDefinitionServiceImpl implements BpmProcessDefinitionServ
|
|
|
return repositoryService.createProcessDefinitionQuery().deploymentIds(deploymentIds).list();
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public boolean isProcessDefinitionEquals(BpmProcessDefinitionCreateReqDTO createReqDTO) {
|
|
|
+ // 校验 name、description 是否更新
|
|
|
+ ProcessDefinition oldProcessDefinition = getActiveProcessDefinition(createReqDTO.getKey());
|
|
|
+ if (oldProcessDefinition == null) {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ BpmProcessDefinitionExtDO oldProcessDefinitionExt = getProcessDefinitionExt(oldProcessDefinition.getId());
|
|
|
+ if (!StrUtil.equals(createReqDTO.getName(), oldProcessDefinition.getName())
|
|
|
+ || !StrUtil.equals(createReqDTO.getDescription(), oldProcessDefinitionExt.getDescription())
|
|
|
+ || !StrUtil.equals(createReqDTO.getCategory(), oldProcessDefinition.getCategory())) {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ // 校验 form 信息是否更新
|
|
|
+ if (!ObjectUtil.equal(createReqDTO.getFormType(), oldProcessDefinitionExt.getFormType())
|
|
|
+ || !ObjectUtil.equal(createReqDTO.getFormId(), oldProcessDefinitionExt.getFormId())
|
|
|
+ || !ObjectUtil.equal(createReqDTO.getFormConf(), oldProcessDefinitionExt.getFormConf())
|
|
|
+ || !ObjectUtil.equal(createReqDTO.getFormFields(), oldProcessDefinitionExt.getFormFields())
|
|
|
+ || !ObjectUtil.equal(createReqDTO.getFormCustomCreatePath(), oldProcessDefinitionExt.getFormCustomCreatePath())
|
|
|
+ || !ObjectUtil.equal(createReqDTO.getFormCustomViewPath(), oldProcessDefinitionExt.getFormCustomViewPath())) {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ // 校验 BPMN XML 信息
|
|
|
+ BpmnModel newModel = ActivitiUtils.buildBpmnModel(createReqDTO.getBpmnBytes());
|
|
|
+ BpmnModel oldModel = getBpmnModel(oldProcessDefinition.getId());
|
|
|
+ if (!ActivitiUtils.equals(oldModel, newModel)) {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ // 最终发现都一致，则返回 true
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class) // 因为进行多个 activiti 操作，所以开启事务
|
|
|
- public String createProcessDefinition(BpmDefinitionCreateReqDTO createReqDTO) {
|
|
|
+ public String createProcessDefinition(BpmProcessDefinitionCreateReqDTO createReqDTO) {
|
|
|
// 创建 Deployment 部署
|
|
|
Deployment deploy = repositoryService.createDeployment()
|
|
|
.key(createReqDTO.getKey()).name(createReqDTO.getName()).category(createReqDTO.getCategory())
|
|
|
- .addString(createReqDTO.getKey() + BPMN_FILE_SUFFIX, createReqDTO.getBpmnXml())
|
|
|
+ .addBytes(createReqDTO.getKey() + BPMN_FILE_SUFFIX, createReqDTO.getBpmnBytes())
|
|
|
.deploy();
|
|
|
|
|
|
// 设置 ProcessDefinition 的 category 分类
|
YunaiV