From 6b13839488edcd06046e26a41fe897358176689c Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期五, 13 十二月 2024 17:56:41 +0800
Subject: [PATCH] 采集质量
---
iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/convert/definition/BpmModelConvert.java | 118 ++++++++++++++++++++++++++--------------------------------
1 files changed, 53 insertions(+), 65 deletions(-)
diff --git a/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/convert/definition/BpmModelConvert.java b/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/convert/definition/BpmModelConvert.java
index 6ad20c0..1f9e2ea 100644
--- a/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/convert/definition/BpmModelConvert.java
+++ b/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/convert/definition/BpmModelConvert.java
@@ -1,19 +1,18 @@
package com.iailab.module.bpm.convert.definition;
import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.StrUtil;
-import com.iailab.framework.common.pojo.PageResult;
-import com.iailab.framework.common.util.collection.CollectionUtils;
import com.iailab.framework.common.util.date.DateUtils;
import com.iailab.framework.common.util.json.JsonUtils;
import com.iailab.framework.common.util.object.BeanUtils;
-import com.iailab.module.bpm.controller.admin.definition.vo.model.BpmModelCreateReqVO;
+import com.iailab.module.bpm.controller.admin.base.user.UserSimpleBaseVO;
+import com.iailab.module.bpm.controller.admin.definition.vo.model.BpmModelMetaInfoVO;
import com.iailab.module.bpm.controller.admin.definition.vo.model.BpmModelRespVO;
-import com.iailab.module.bpm.controller.admin.definition.vo.model.BpmModelUpdateReqVO;
+import com.iailab.module.bpm.controller.admin.definition.vo.model.BpmModelSaveReqVO;
import com.iailab.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionRespVO;
import com.iailab.module.bpm.dal.dataobject.definition.BpmCategoryDO;
import com.iailab.module.bpm.dal.dataobject.definition.BpmFormDO;
-import com.iailab.module.bpm.service.definition.dto.BpmModelMetaInfoRespDTO;
+import com.iailab.module.bpm.framework.flowable.core.util.BpmnModelUtils;
+import com.iailab.module.system.api.user.dto.AdminUserRespDTO;
import org.flowable.common.engine.impl.db.SuspensionState;
import org.flowable.engine.repository.Deployment;
import org.flowable.engine.repository.Model;
@@ -21,60 +20,64 @@
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
import java.util.Map;
-import java.util.Objects;
+
+import static com.iailab.framework.common.util.collection.CollectionUtils.convertList;
/**
* 流程模型 Convert
*
- * @author yunlongn
+ * @author hou
*/
@Mapper
public interface BpmModelConvert {
BpmModelConvert INSTANCE = Mappers.getMapper(BpmModelConvert.class);
- default PageResult<BpmModelRespVO> buildModelPage(PageResult<Model> pageResult,
- Map<Long, BpmFormDO> formMap,
- Map<String, BpmCategoryDO> categoryMap, Map<String, Deployment> deploymentMap,
- Map<String, ProcessDefinition> processDefinitionMap) {
- List<BpmModelRespVO> list = CollectionUtils.convertList(pageResult.getList(), model -> {
- BpmModelMetaInfoRespDTO metaInfo = buildMetaInfo(model);
+ default List<BpmModelRespVO> buildModelList(List<Model> list,
+ Map<Long, BpmFormDO> formMap,
+ Map<String, BpmCategoryDO> categoryMap,
+ Map<String, Deployment> deploymentMap,
+ Map<String, ProcessDefinition> processDefinitionMap,
+ Map<Long, AdminUserRespDTO> userMap) {
+ List<BpmModelRespVO> result = convertList(list, model -> {
+ BpmModelMetaInfoVO metaInfo = parseMetaInfo(model);
BpmFormDO form = metaInfo != null ? formMap.get(metaInfo.getFormId()) : null;
BpmCategoryDO category = categoryMap.get(model.getCategory());
Deployment deployment = model.getDeploymentId() != null ? deploymentMap.get(model.getDeploymentId()) : null;
- ProcessDefinition processDefinition = model.getDeploymentId() != null ? processDefinitionMap.get(model.getDeploymentId()) : null;
- return buildModel0(model, metaInfo, form, category, deployment, processDefinition);
+ ProcessDefinition processDefinition = model.getDeploymentId() != null ?
+ processDefinitionMap.get(model.getDeploymentId()) : null;
+ List<AdminUserRespDTO> startUsers = metaInfo != null ? convertList(metaInfo.getStartUserIds(), userMap::get) : null;
+ return buildModel0(model, metaInfo, form, category, deployment, processDefinition, startUsers);
});
- return new PageResult<>(list, pageResult.getTotal());
+ // 排序
+ result.sort(Comparator.comparing(BpmModelMetaInfoVO::getSort));
+ return result;
}
- default BpmModelRespVO buildModel(Model model,
- byte[] bpmnBytes) {
- BpmModelMetaInfoRespDTO metaInfo = buildMetaInfo(model);
- BpmModelRespVO modelVO = buildModel0(model, metaInfo, null, null, null, null);
+ default BpmModelRespVO buildModel(Model model, byte[] bpmnBytes) {
+ BpmModelMetaInfoVO metaInfo = parseMetaInfo(model);
+ BpmModelRespVO modelVO = buildModel0(model, metaInfo, null, null, null, null, null);
if (ArrayUtil.isNotEmpty(bpmnBytes)) {
- modelVO.setBpmnXml(new String(bpmnBytes));
+ modelVO.setBpmnXml(BpmnModelUtils.getBpmnXml(bpmnBytes));
}
return modelVO;
}
default BpmModelRespVO buildModel0(Model model,
- BpmModelMetaInfoRespDTO metaInfo, BpmFormDO form, BpmCategoryDO category,
- Deployment deployment, ProcessDefinition processDefinition) {
+ BpmModelMetaInfoVO metaInfo, BpmFormDO form, BpmCategoryDO category,
+ Deployment deployment, ProcessDefinition processDefinition,
+ List<AdminUserRespDTO> startUsers) {
BpmModelRespVO modelRespVO = new BpmModelRespVO().setId(model.getId()).setName(model.getName())
.setKey(model.getKey()).setCategory(model.getCategory())
.setCreateTime(DateUtils.of(model.getCreateTime()));
// Form
- if (metaInfo != null) {
- modelRespVO.setFormType(metaInfo.getFormType()).setFormId(metaInfo.getFormId())
- .setFormCustomCreatePath(metaInfo.getFormCustomCreatePath())
- .setFormCustomViewPath(metaInfo.getFormCustomViewPath());
- modelRespVO.setIcon(metaInfo.getIcon()).setDescription(metaInfo.getDescription());
- }
+ BeanUtils.copyProperties(metaInfo, modelRespVO);
if (form != null) {
- modelRespVO.setFormId(form.getId()).setFormName(form.getName());
+ modelRespVO.setFormName(form.getName());
}
// Category
if (category != null) {
@@ -89,49 +92,34 @@
modelRespVO.getProcessDefinition().setDeploymentTime(DateUtils.of(deployment.getDeploymentTime()));
}
}
+ // User
+ modelRespVO.setStartUsers(BeanUtils.toBean(startUsers, UserSimpleBaseVO.class));
return modelRespVO;
}
- default void copyToCreateModel(Model model, BpmModelCreateReqVO bean) {
- model.setName(bean.getName());
- model.setKey(bean.getKey());
- model.setMetaInfo(buildMetaInfoStr(null,
- null, bean.getDescription(),
- null, null, null, null));
+ default void copyToModel(Model model, BpmModelSaveReqVO reqVO) {
+ model.setName(reqVO.getName());
+ model.setKey(reqVO.getKey());
+ model.setCategory(reqVO.getCategory());
+ model.setMetaInfo(JsonUtils.toJsonString(BeanUtils.toBean(reqVO, BpmModelMetaInfoVO.class)));
}
- default void copyToUpdateModel(Model model, BpmModelUpdateReqVO bean) {
- model.setName(bean.getName());
- model.setCategory(bean.getCategory());
- model.setMetaInfo(buildMetaInfoStr(buildMetaInfo(model),
- bean.getIcon(), bean.getDescription(),
- bean.getFormType(), bean.getFormId(), bean.getFormCustomCreatePath(), bean.getFormCustomViewPath()));
- }
-
- default String buildMetaInfoStr(BpmModelMetaInfoRespDTO metaInfo,
- String icon, String description,
- Integer formType, Long formId, String formCustomCreatePath, String formCustomViewPath) {
- if (metaInfo == null) {
- metaInfo = new BpmModelMetaInfoRespDTO();
+ default BpmModelMetaInfoVO parseMetaInfo(Model model) {
+ BpmModelMetaInfoVO vo = JsonUtils.parseObject(model.getMetaInfo(), BpmModelMetaInfoVO.class);
+ if (vo == null) {
+ return null;
}
- // 只有非空，才进行设置，避免更新时的覆盖
- if (StrUtil.isNotEmpty(icon)) {
- metaInfo.setIcon(icon);
+ if (vo.getManagerUserIds() == null) {
+ vo.setManagerUserIds(Collections.emptyList());
}
- if (StrUtil.isNotEmpty(description)) {
- metaInfo.setDescription(description);
+ if (vo.getStartUserIds() == null) {
+ vo.setStartUserIds(Collections.emptyList());
}
- if (Objects.nonNull(formType)) {
- metaInfo.setFormType(formType);
- metaInfo.setFormId(formId);
- metaInfo.setFormCustomCreatePath(formCustomCreatePath);
- metaInfo.setFormCustomViewPath(formCustomViewPath);
+ // 如果为空，兜底处理，使用 createTime 创建时间
+ if (vo.getSort() == null) {
+ vo.setSort(model.getCreateTime().getTime());
}
- return JsonUtils.toJsonString(metaInfo);
- }
-
- default BpmModelMetaInfoRespDTO buildMetaInfo(Model model) {
- return JsonUtils.parseObject(model.getMetaInfo(), BpmModelMetaInfoRespDTO.class);
+ return vo;
}
}
--
Gitblit v1.9.3