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

update - 调整流程相关 Feign Api 地址

Browse Source
This commit is contained in:
wangli 2023-10-05 14:05:35 +08:00
parent 3eb321585a
commit 06bfcb8b54
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
workflow-engine-api/src/main/java/cn/axzo/workflow/client/config/WorkflowEngineClientAutoConfiguration.java
View File

@ -9,8 +9,7 @@ import org.springframework.context.annotation.Configuration;
* @Description:
*/
@EnableFeignClients(basePackages = {"cn.axzo.workflow.client.feign"})
@Configuration
@Configuration(proxyBeanMethods = false)
public class WorkflowEngineClientAutoConfiguration {
}

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

@ -21,7 +21,7 @@ import javax.validation.constraints.NotNull;
* @since 2023/9/21 16:26
*/
@FeignClient(name = "workflowEngine", url = "${axzo.service.workflowEngine:http://workflowEngine/api/process" +
"/definition}")
"/instance}")
public interface ProcessInstanceApi {
/**

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

@ -21,7 +21,7 @@ import javax.validation.constraints.NotBlank;
* @since 2023/9/21 15:47
*/
@FeignClient(name = "workflowEngine", url = "${axzo.service.workflowEngine:http://workflowEngine/api/process" +
"/definition}")
"/model}")
public interface ProcessModelApi {
@Operation(summary = "流程模型列表")

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

@ -26,7 +26,7 @@ import java.util.List;
* @since 2023/9/21 16:26
*/
@FeignClient(name = "workflowEngine", url = "${axzo.service.workflowEngine:http://workflowEngine/api/process" +
"/definition}")
"/task}")
public interface ProcessTaskApi {

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

@ -35,12 +35,14 @@ public class BpmnProcessDefinitionController implements ProcessDefinitionApi {
* 获取活跃的流程定义分页
*/
@GetMapping("/page")
@Override
public CommonResponse<BpmPageResult<BpmnProcessDefinitionVO>> getProcessDefinitionPage(@Validated @RequestBody BpmnProcessDefinitionPageDTO dto) {
log.info("获取活跃的流程定义分页getProcessDefinitionPage===>>>参数：{}", JSON.toJSONString(dto));
return success(bpmnProcessDefinitionService.getProcessDefinitionPage(dto));
}
@PutMapping("/update")
@Override
public CommonResponse<Boolean> updateProcessDefinition(@Validated @RequestBody BpmnProcessDefinitionUpdateDTO dto) {
bpmnProcessDefinitionService.updateProcessDefinition(dto);
return success(true);
@ -49,10 +51,11 @@ public class BpmnProcessDefinitionController implements ProcessDefinitionApi {
/**
* 获得编号对应的 ProcessDefinition
*
* @param id 编号
* @param processDefinitionId 定义编号
* @return 流程定义
*/
@GetMapping("/get")
@Override
public CommonResponse<BpmnProcessDefinitionVO> getProcessDefinition(@NotBlank(message = "流程定义 ID 不能为空") @RequestParam String processDefinitionId) {
log.info("获取活跃的流程定义分页getProcessDefinition===>>>参数：{}", JSON.toJSONString(processDefinitionId));
return success(bpmnProcessDefinitionService.getProcessDefinition(processDefinitionId));
@ -66,6 +69,7 @@ public class BpmnProcessDefinitionController implements ProcessDefinitionApi {
* @return 流程定义
*/
@GetMapping("/getByDeploymentId")
@Override
public CommonResponse<BpmnProcessDefinitionVO> getProcessDefinitionByDeploymentId(
@NotBlank(message = "流程部署 ID 不能为空") @RequestParam String deploymentId) {
log.info(" 获得 deploymentId 对应的 getProcessDefinitionByDeploymentId===>>>参数：{}", JSON.toJSONString(deploymentId));
@ -81,6 +85,7 @@ public class BpmnProcessDefinitionController implements ProcessDefinitionApi {
* @return 流程定义
*/
@GetMapping("/active/getByKey")
@Override
public CommonResponse<BpmnProcessDefinitionVO> getActiveProcessDefinitionByKey(@NotBlank(message =
"模型定义KEY" +
"不能为空") @RequestParam String key) {
@ -96,6 +101,7 @@ public class BpmnProcessDefinitionController implements ProcessDefinitionApi {
* {@link SuspensionState}
*/
@PutMapping("/state/update")
@Override
public CommonResponse<Boolean> getActiveProcessDefinitionByKey(@NotBlank(message = "流程定义ID不能为空") @RequestParam String processDefinitionId,
@NotNull(message = "状态不能为空") @RequestParam Integer state) {
log.info("挂起/激活流程 updateProcessDefinitionSuspendedState===>>>参数：{},{}", processDefinitionId, state);
@ -110,6 +116,7 @@ public class BpmnProcessDefinitionController implements ProcessDefinitionApi {
* @return 流程定义ID
*/
@GetMapping("/active/getByCategory")
@Override
public CommonResponse<String> getActiveProcessDefinitionId(@NotBlank(message = "租户不能为空") @RequestParam String tenantId,
@NotBlank(message = "分类不能为空") @RequestParam String category) {
log.info("挂起/激活流程 getActiveProcessDefinitionId===>>>参数：{},{}", tenantId, category);