From ed8fc5f674544d3af63c6f68093ffc038385c493 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期一, 16 十二月 2024 09:30:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/controller/admin/definition/BpmModelController.java | 113 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 72 insertions(+), 41 deletions(-)
diff --git a/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/controller/admin/definition/BpmModelController.java b/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/controller/admin/definition/BpmModelController.java
index 0be0d1b..43d6863 100644
--- a/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/controller/admin/definition/BpmModelController.java
+++ b/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/controller/admin/definition/BpmModelController.java
@@ -2,12 +2,9 @@
import cn.hutool.core.collection.CollUtil;
import com.iailab.framework.common.pojo.CommonResult;
-import com.iailab.framework.common.pojo.PageResult;
-import com.iailab.framework.common.util.collection.CollectionUtils;
-import com.iailab.framework.common.util.io.IoUtils;
-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.*;
+import com.iailab.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO;
+import com.iailab.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelUpdateReqVO;
import com.iailab.module.bpm.convert.definition.BpmModelConvert;
import com.iailab.module.bpm.dal.dataobject.definition.BpmCategoryDO;
import com.iailab.module.bpm.dal.dataobject.definition.BpmFormDO;
@@ -16,6 +13,8 @@
import com.iailab.module.bpm.service.definition.BpmModelService;
import com.iailab.module.bpm.service.definition.BpmProcessDefinitionService;
import com.iailab.module.bpm.service.definition.dto.BpmModelMetaInfoRespDTO;
+import com.iailab.module.system.api.user.AdminUserApi;
+import com.iailab.module.system.api.user.dto.AdminUserRespDTO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -28,15 +27,12 @@
import javax.annotation.Resource;
import javax.validation.Valid;
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
+import java.util.stream.Stream;
import static com.iailab.framework.common.pojo.CommonResult.success;
-import static com.iailab.framework.common.util.collection.CollectionUtils.convertMap;
-import static com.iailab.framework.common.util.collection.CollectionUtils.convertSet;
+import static com.iailab.framework.common.util.collection.CollectionUtils.*;
+import static com.iailab.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
@Tag(name = "管理后台 - 流程模型")
@RestController
@@ -53,32 +49,42 @@
@Resource
private BpmProcessDefinitionService processDefinitionService;
- @GetMapping("/page")
+ @Resource
+ private AdminUserApi adminUserApi;
+
+ @GetMapping("/list")
@Operation(summary = "获得模型分页")
- public CommonResult<PageResult<BpmModelRespVO>> getModelPage(BpmModelPageReqVO pageVO) {
- PageResult<Model> pageResult = modelService.getModelPage(pageVO);
- if (CollUtil.isEmpty(pageResult.getList())) {
- return success(PageResult.empty(pageResult.getTotal()));
+ @Parameter(name = "name", description = "模型名称", example = "芋艿")
+ public CommonResult<List<BpmModelRespVO>> getModelPage(@RequestParam(value = "name", required = false) String name) {
+ List<Model> list = modelService.getModelList(name);
+ if (CollUtil.isEmpty(list)) {
+ return success(Collections.emptyList());
}
- // 拼接数据
// 获得 Form 表单
- Set<Long> formIds = convertSet(pageResult.getList(), model -> {
- BpmModelMetaInfoRespDTO metaInfo = JsonUtils.parseObject(model.getMetaInfo(), BpmModelMetaInfoRespDTO.class);
+ Set<Long> formIds = convertSet(list, model -> {
+ BpmModelMetaInfoVO metaInfo = BpmModelConvert.INSTANCE.parseMetaInfo(model);
return metaInfo != null ? metaInfo.getFormId() : null;
});
Map<Long, BpmFormDO> formMap = formService.getFormMap(formIds);
// 获得 Category Map
Map<String, BpmCategoryDO> categoryMap = categoryService.getCategoryMap(
- convertSet(pageResult.getList(), Model::getCategory));
+ convertSet(list, Model::getCategory));
// 获得 Deployment Map
- Set<String> deploymentIds = new HashSet<>();
- pageResult.getList().forEach(model -> CollectionUtils.addIfNotNull(deploymentIds, model.getDeploymentId()));
- Map<String, Deployment> deploymentMap = processDefinitionService.getDeploymentMap(deploymentIds);
+ Map<String, Deployment> deploymentMap = processDefinitionService.getDeploymentMap(
+ convertSet(list, Model::getDeploymentId));
// 获得 ProcessDefinition Map
- List<ProcessDefinition> processDefinitions = processDefinitionService.getProcessDefinitionListByDeploymentIds(deploymentIds);
+ List<ProcessDefinition> processDefinitions = processDefinitionService.getProcessDefinitionListByDeploymentIds(
+ deploymentMap.keySet());
Map<String, ProcessDefinition> processDefinitionMap = convertMap(processDefinitions, ProcessDefinition::getDeploymentId);
- return success(BpmModelConvert.INSTANCE.buildModelPage(pageResult, formMap, categoryMap, deploymentMap, processDefinitionMap));
+ // 获得 User Map
+ Set<Long> userIds = convertSetByFlatMap(list, model -> {
+ BpmModelMetaInfoVO metaInfo = BpmModelConvert.INSTANCE.parseMetaInfo(model);
+ return metaInfo != null ? metaInfo.getStartUserIds().stream() : Stream.empty();
+ });
+ Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(userIds);
+ return success(BpmModelConvert.INSTANCE.buildModelList(list,
+ formMap, categoryMap, deploymentMap, processDefinitionMap, userMap));
}
@GetMapping("/get")
@@ -97,26 +103,25 @@
@PostMapping("/create")
@Operation(summary = "新建模型")
@PreAuthorize("@ss.hasPermission('bpm:model:create')")
- public CommonResult<String> createModel(@Valid @RequestBody BpmModelCreateReqVO createRetVO) {
- return success(modelService.createModel(createRetVO, null));
+ public CommonResult<String> createModel(@Valid @RequestBody BpmModelSaveReqVO createRetVO) {
+ return success(modelService.createModel(createRetVO));
}
+
@PutMapping("/update")
@Operation(summary = "修改模型")
@PreAuthorize("@ss.hasPermission('bpm:model:update')")
- public CommonResult<Boolean> updateModel(@Valid @RequestBody BpmModelUpdateReqVO modelVO) {
- modelService.updateModel(modelVO);
+ public CommonResult<Boolean> updateModel(@Valid @RequestBody BpmModelSaveReqVO modelVO) {
+ modelService.updateModel(getLoginUserId(), modelVO);
return success(true);
}
- @PostMapping("/import")
- @Operation(summary = "导入模型")
- @PreAuthorize("@ss.hasPermission('bpm:model:import')")
- public CommonResult<String> importModel(@Valid BpmModeImportReqVO importReqVO) throws IOException {
- BpmModelCreateReqVO createReqVO = BeanUtils.toBean(importReqVO, BpmModelCreateReqVO.class);
- // 读取文件
- String bpmnXml = IoUtils.readUtf8(importReqVO.getBpmnFile().getInputStream(), false);
- return success(modelService.createModel(createReqVO, bpmnXml));
+ @PutMapping("/update-sort-batch")
+ @Operation(summary = "批量修改模型排序")
+ @Parameter(name = "ids", description = "编号数组", required = true, example = "1,2,3")
+ public CommonResult<Boolean> updateModelSortBatch(@RequestParam("ids") List<String> ids) {
+ modelService.updateModelSortBatch(getLoginUserId(), ids);
+ return success(true);
}
@PostMapping("/deploy")
@@ -124,7 +129,7 @@
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('bpm:model:deploy')")
public CommonResult<Boolean> deployModel(@RequestParam("id") String id) {
- modelService.deployModel(id);
+ modelService.deployModel(getLoginUserId(), id);
return success(true);
}
@@ -132,7 +137,15 @@
@Operation(summary = "修改模型的状态", description = "实际更新的部署的流程定义的状态")
@PreAuthorize("@ss.hasPermission('bpm:model:update')")
public CommonResult<Boolean> updateModelState(@Valid @RequestBody BpmModelUpdateStateReqVO reqVO) {
- modelService.updateModelState(reqVO.getId(), reqVO.getState());
+ modelService.updateModelState(getLoginUserId(), reqVO.getId(), reqVO.getState());
+ return success(true);
+ }
+
+ @PutMapping("/update-bpmn")
+ @Operation(summary = "修改模型的 BPMN")
+ @PreAuthorize("@ss.hasPermission('bpm:model:update')")
+ public CommonResult<Boolean> updateModelBpmn(@Valid @RequestBody BpmModeUpdateBpmnReqVO reqVO) {
+ modelService.updateModelBpmnXml(reqVO.getId(), reqVO.getBpmnXml());
return success(true);
}
@@ -141,8 +154,26 @@
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('bpm:model:delete')")
public CommonResult<Boolean> deleteModel(@RequestParam("id") String id) {
- modelService.deleteModel(id);
+ modelService.deleteModel(getLoginUserId(), id);
return success(true);
}
+ // ========== 仿钉钉/飞书的精简模型 =========
+
+ @GetMapping("/simple/get")
+ @Operation(summary = "获得仿钉钉流程设计模型")
+ @Parameter(name = "modelId", description = "流程模型编号", required = true, example = "a2c5eee0-eb6c-11ee-abf4-0c37967c420a")
+ public CommonResult<BpmSimpleModelNodeVO> getSimpleModel(@RequestParam("id") String modelId){
+ return success(modelService.getSimpleModel(modelId));
+ }
+
+ @PostMapping("/simple/update")
+ @Operation(summary = "保存仿钉钉流程设计模型")
+ @PreAuthorize("@ss.hasPermission('bpm:model:update')")
+ public CommonResult<Boolean> updateSimpleModel(@Valid @RequestBody BpmSimpleModelUpdateReqVO reqVO) {
+ modelService.updateSimpleModel(getLoginUserId(), reqVO);
+ return success(Boolean.TRUE);
+ }
+
+
}
--
Gitblit v1.9.3