wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update - 调整查询模型时 tenantId 字段的定义

Browse Source
This commit is contained in:
wangli 2023-11-23 10:31:38 +08:00
parent e35901c748
commit fccdca5020
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/bpmn/ProcessDefinitionApi.java
View File

@ -92,6 +92,6 @@ public interface ProcessDefinitionApi {
* @return 流程定义ID * @return 流程定义ID
*/ */
@GetMapping("/api/process/definition/active/json/model") @GetMapping("/api/process/definition/active/json/model")
CommonResponse<BpmnJsonModel> getActiveProcessDefinitionJsonModel(@NotBlank(message = "租户不能为空") @RequestParam String tenantId, CommonResponse<BpmnJsonModel> getActiveProcessDefinitionJsonModel(@NotBlank(message = "租户不能为空") @RequestParam(required = false) String tenantId,
@NotBlank(message = "分类不能为空") @RequestParam String category); @RequestParam(required = false) String category);
} }

2
workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/model/BpmnModelCreateDTO.java
View File

@ -49,5 +49,5 @@ public class BpmnModelCreateDTO {
* 租户Id * 租户Id
*/ */
@ApiModelProperty(value = "租户Id", example = "1") @ApiModelProperty(value = "租户Id", example = "1")
private String tenantId = "0";//0 代表公共模型 private String tenantId = "";
} }

4
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessDefinitionController.java
View File

@ -16,6 +16,7 @@ import org.flowable.bpmn.model.BpmnModel;
import org.flowable.common.engine.impl.db.SuspensionState; import org.flowable.common.engine.impl.db.SuspensionState;
import org.flowable.engine.impl.util.ProcessDefinitionUtil; import org.flowable.engine.impl.util.ProcessDefinitionUtil;
import org.flowable.engine.repository.ProcessDefinition; import org.flowable.engine.repository.ProcessDefinition;
import org.springframework.util.StringUtils;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.PutMapping;
@ -153,7 +154,8 @@ public class BpmnProcessDefinitionController implements ProcessDefinitionApi {
@GetMapping("/api/process/definition/active/json/model") @GetMapping("/api/process/definition/active/json/model")
@Override @Override
public CommonResponse<BpmnJsonModel> getActiveProcessDefinitionJsonModel(String tenantId, String category) { public CommonResponse<BpmnJsonModel> getActiveProcessDefinitionJsonModel(String tenantId, String category) {
String activeProcessDefinitionId = bpmnProcessDefinitionService.getActiveProcessDefinitionId(tenantId, String finalTenantId = StringUtils.hasLength(tenantId) ? tenantId : "";
String activeProcessDefinitionId = bpmnProcessDefinitionService.getActiveProcessDefinitionId(finalTenantId,
category); category);
BpmnModel bpmnModel = ProcessDefinitionUtil.getBpmnModel(activeProcessDefinitionId); BpmnModel bpmnModel = ProcessDefinitionUtil.getBpmnModel(activeProcessDefinitionId);
return success(BpmnJsonConverterUtil.convertToJson(bpmnModel)); return success(BpmnJsonConverterUtil.convertToJson(bpmnModel));