update - 调整部分 restapi 写法

2023-07-11 20:37:18 +08:00 · 2023-07-11 20:37:18 +08:00 · f44762e338
commit f44762e338
parent 922c9ac878
9 changed files with 53 additions and 60 deletions
--- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/repository/entity/BpmProcessInstanceExtDO.java
+++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/repository/entity/BpmProcessInstanceExtDO.java
@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.ToString;

 import java.util.Date;
@ -64,10 +63,9 @@ public class BpmProcessInstanceExtDO {
    private Integer result;

    /**
-     *
     * 创建时间
-     * */
-    private Date createTime;
+     */
+    private Date createAt;

    /**
     * 结束时间
--- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/repository/mapper/BpmProcessInstanceExtMapper.java
+++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/repository/mapper/BpmProcessInstanceExtMapper.java
@ -3,7 +3,6 @@ package cn.axzo.workflow.core.repository.mapper;
 import cn.axzo.workflow.core.repository.entity.BpmProcessInstanceExtDO;
 import cn.axzo.workflow.core.service.dto.request.process.BpmProcessInstanceMyPageReqVO;
 import cn.axzo.workflow.core.service.dto.response.BpmPageResult;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.util.StringUtils;
@ -25,10 +24,10 @@ public interface BpmProcessInstanceExtMapper extends BaseMapperX<BpmProcessInsta
                .eqIfPresent(BpmProcessInstanceExtDO::getStartCompanyId, reqVO.getCompanyId())
                .eqIfPresent(BpmProcessInstanceExtDO::getStartIdentityId, reqVO.getIdentityId())
                .eqIfPresent(BpmProcessInstanceExtDO::getResult, reqVO.getResult())
-                .betweenIfPresent(BpmProcessInstanceExtDO::getCreateTime, reqVO.getBeginCreateTime(),
+                .betweenIfPresent(BpmProcessInstanceExtDO::getCreateAt, reqVO.getBeginCreateTime(),
                        reqVO.getEndCreateTime())
                .orderByAsc(BpmProcessInstanceExtDO::getStatus)
-                .orderByDesc(BpmProcessInstanceExtDO::getCreateTime));
+                .orderByDesc(BpmProcessInstanceExtDO::getCreateAt));
    }

    default BpmProcessInstanceExtDO selectByProcessInstanceId(String processInstanceId,
--- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/converter/BpmProcessInstanceConvert.java
+++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/converter/BpmProcessInstanceConvert.java
@ -4,7 +4,6 @@ import cn.axzo.workflow.core.repository.entity.BpmProcessInstanceExtDO;
 import cn.axzo.workflow.core.service.dto.response.BpmPageResult;
 import cn.axzo.workflow.core.service.dto.response.process.BpmProcessInstancePageItemVO;
 import org.flowable.task.api.Task;
-import org.mapstruct.factory.Mappers;

 import java.util.ArrayList;
 import java.util.List;
@ -45,9 +44,9 @@ public class BpmProcessInstanceConvert {
        bpmProcessInstancePageItemRespVO.setProcessDefinitionId( bean.getProcessDefinitionId() );
        bpmProcessInstancePageItemRespVO.setCategory( bean.getCategory() );
        bpmProcessInstancePageItemRespVO.setStatus( bean.getStatus() );
-        bpmProcessInstancePageItemRespVO.setResult( bean.getResult() );
-        bpmProcessInstancePageItemRespVO.setCreateTime( bean.getCreateTime() );
-        bpmProcessInstancePageItemRespVO.setEndTime( bean.getEndTime() );
+        bpmProcessInstancePageItemRespVO.setResult(bean.getResult());
+        bpmProcessInstancePageItemRespVO.setCreateTime(bean.getCreateAt());
+        bpmProcessInstancePageItemRespVO.setEndTime(bean.getEndTime());
        bpmProcessInstancePageItemRespVO.setStartUserName( bean.getStartUserName() );

        return bpmProcessInstancePageItemRespVO;
--- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/converter/BpmTaskConvert.java
+++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/converter/BpmTaskConvert.java
@ -86,8 +86,7 @@ public class BpmTaskConvert {
                String startUserId = processInstance.getStartUserId();
                Long startIdentityId = null;
                if (StringUtils.isNotBlank(startUserId)) {
-                    String[] s = startUserId.split("_");
-                    startIdentityId = Long.valueOf(s[1]);
+                    startIdentityId = Long.valueOf(startUserId);
                }

                //convert
--- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmTaskServiceImpl.java
+++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmTaskServiceImpl.java
@ -119,7 +119,7 @@ public class BpmTaskServiceImpl implements BpmTaskService {
            processInstance.setCustomProInstId(instanceExtDO.getCustomProInstId());
            processInstance.setCategory(instanceExtDO.getCategory());
            processInstance.setStartUserName(instanceExtDO.getStartUserName());
-            processInstance.setStartTime(instanceExtDO.getCreateTime());
+            processInstance.setStartTime(instanceExtDO.getCreateAt());
        });
        return new BpmPageResult<>(bpmTaskTodoPageItemRespVOS, taskQuery.count());
    }
@ -186,7 +186,7 @@ public class BpmTaskServiceImpl implements BpmTaskService {
            processInstance.setCustomProInstId(instanceExtDO.getCustomProInstId());
            processInstance.setCategory(instanceExtDO.getCategory());
            processInstance.setStartUserName(instanceExtDO.getStartUserName());
-            processInstance.setStartTime(instanceExtDO.getCreateTime());
+            processInstance.setStartTime(instanceExtDO.getCreateAt());
        });
        return new BpmPageResult(bpmTaskDonePageItemRespVOS, taskQuery.count());

--- a/workflow-engine-server/src/main/java/cn/axzo/server/controller/web/BpmModelController.java
+++ b/workflow-engine-server/src/main/java/cn/axzo/server/controller/web/BpmModelController.java
@ -18,7 +18,7 @@ import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;

@Slf4j
-@RequestMapping("/web/v1/api/BpmModel")
+@RequestMapping("/web/v1/api/bpm/model")
@RestController
@Validated
 public class BpmModelController {
--- a/workflow-engine-server/src/main/java/cn/axzo/server/controller/web/BpmProcessDefinitionController.java
+++ b/workflow-engine-server/src/main/java/cn/axzo/server/controller/web/BpmProcessDefinitionController.java
@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;

@Slf4j
-@RequestMapping("/web/v1/api/BpmProcessDefinition")
+@RequestMapping("/web/v1/api/bpm/process/definition")
@RestController
 public class BpmProcessDefinitionController {
    @Autowired
@ -26,7 +26,7 @@ public class BpmProcessDefinitionController {
     * 创建流程定义
     * 模型发布时，会自动调用，通常情况无需手动创建
     * */
-    @PostMapping("/createProcessDeinition")
+    @PostMapping("/create")
    public CommonResponse<String> createProcessDeinition(@RequestBody Model model, byte[] bpmnBytes) {
        log.info("创建流程定义createProcessDeinition===>>>参数：{}", JSON.toJSONString(model));
        String result = bpmProcessDefinitionService.createProcessDefinition(model, bpmnBytes);
@ -36,7 +36,7 @@ public class BpmProcessDefinitionController {
    /**
     * 获取活跃的流程定义分页
     * */
-    @GetMapping("/getProcessDefinitionPage")
+    @GetMapping("/page")
    public CommonResponse<BpmPageResult<BpmProcessDefinitionPageItemRespVO>> getProcessDefinitionPage(@Valid @RequestBody BpmProcessDefinitionPageDTO dto) {
        log.info("获取活跃的流程定义分页getProcessDefinitionPage===>>>参数：{}", JSON.toJSONString(dto));
        BpmPageResult<BpmProcessDefinitionPageItemRespVO> result=bpmProcessDefinitionService.getProcessDefinitionPage(dto);
@ -50,7 +50,7 @@ public class BpmProcessDefinitionController {
     * @param id 编号
     * @return 流程定义
     */
-    @GetMapping("/getProcessDefinition")
+    @GetMapping("/get")
    public CommonResponse<ProcessDefinition> getProcessDefinition( @RequestBody String id) {
        log.info("获取活跃的流程定义分页getProcessDefinition===>>>参数：{}", JSON.toJSONString(id));
        ProcessDefinition result=bpmProcessDefinitionService.getProcessDefinition(id);
@ -64,7 +64,7 @@ public class BpmProcessDefinitionController {
     * @param deploymentId 部署编号
     * @return 流程定义
     */
-    @GetMapping("/getProcessDefinitionByDeploymentId")
+    @GetMapping("/getByDeploymentId")
    public CommonResponse<ProcessDefinition> getProcessDefinitionByDeploymentId( @RequestBody String deploymentId) {
        log.info(" 获得 deploymentId 对应的 getProcessDefinitionByDeploymentId===>>>参数：{}", JSON.toJSONString(deploymentId));
        ProcessDefinition result=bpmProcessDefinitionService.getProcessDefinitionByDeploymentId(deploymentId);
@ -78,7 +78,7 @@ public class BpmProcessDefinitionController {
     * @param key 流程定义的标识
     * @return 流程定义
     */
-    @GetMapping("/getActiveProcessDefinitionByKey")
+    @GetMapping("/active/getByKey")
    public CommonResponse<ProcessDefinition> getActiveProcessDefinitionByKey( @RequestBody String key) {
        log.info("获得流程定义标识对应的激活的流程定义 getActiveProcessDefinitionByKey===>>>参数：{}", JSON.toJSONString(key));
        ProcessDefinition result=bpmProcessDefinitionService.getActiveProcessDefinitionByKey(key);
@ -92,7 +92,7 @@ public class BpmProcessDefinitionController {
     * 挂起：SuspensionState.SUSPENDED.getStateCode()
     * {@link SuspensionState}
     * */
-    @GetMapping("/updateProcessDefinitionSuspendedState")
+    @GetMapping("/state/update")
    public CommonResponse getActiveProcessDefinitionByKey( @RequestBody String processDefinitionId, Integer state) {
        log.info("挂起/激活流程 updateProcessDefinitionSuspendedState===>>>参数：{},{}", processDefinitionId,state);
        bpmProcessDefinitionService.updateProcessDefinitionSuspendedState(processDefinitionId,state);
@ -104,7 +104,7 @@ public class BpmProcessDefinitionController {
     * 获取指定模型激活的定义 ID
     * @return 流程定义ID
     */
-    @GetMapping("/getActiveProcessDefinitionId")
+    @GetMapping("/active/getById")
    public CommonResponse<String> getActiveProcessDefinitionId( @RequestBody String tenantId, String category) {
        log.info("挂起/激活流程 getActiveProcessDefinitionId===>>>参数：{},{}", tenantId,category);
        String result=bpmProcessDefinitionService.getActiveProcessDefinitionId(tenantId,category);
--- a/workflow-engine-server/src/main/java/cn/axzo/server/controller/web/BpmProcessInstanceController.java
+++ b/workflow-engine-server/src/main/java/cn/axzo/server/controller/web/BpmProcessInstanceController.java
@ -3,13 +3,10 @@ package cn.axzo.server.controller.web;
 import cn.axzo.workflow.core.service.BpmProcessInstanceService;
 import cn.axzo.workflow.core.service.dto.request.process.BpmProcessInstanceCreateDTO;
 import cn.axzo.workflow.core.service.dto.request.process.BpmProcessInstanceMyPageReqVO;
-import cn.axzo.workflow.core.service.dto.request.task.BpmTaskTodoBpmPageDTO;
+import cn.axzo.workflow.core.service.dto.request.process.BpmProcessInstanceWithdrawDTO;
 import cn.axzo.workflow.core.service.dto.response.BpmPageResult;
 import cn.axzo.workflow.core.service.dto.response.process.BpmProcessInstancePageItemVO;
 import cn.axzo.workflow.core.service.dto.response.process.BpmProcessInstanceVO;
-import cn.axzo.workflow.core.service.dto.request.process.BpmProcessInstanceWithdrawDTO;
-import cn.axzo.workflow.core.service.dto.response.process.BpmProcessInstanceVO;
-import cn.axzo.workflow.core.service.dto.response.task.BpmTaskTodoPageItemRespVO;
 import cn.azxo.framework.common.model.CommonResponse;
 import com.alibaba.fastjson.JSON;
 import lombok.extern.slf4j.Slf4j;
@ -21,7 +18,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;

@Slf4j
-@RequestMapping("/web/v1/api/BpmProcessInstance")
+@RequestMapping("/web/v1/api/bpm/processInstance")
@RestController
 public class BpmProcessInstanceController {

@ -31,21 +28,21 @@ public class BpmProcessInstanceController {

    /**
     * 我发起的审批列表
-     * */
+     */
    @GetMapping("/getOwnTaskPage")
    public CommonResponse<BpmPageResult<BpmProcessInstancePageItemVO>> getMyProcessInstancePage(@RequestBody BpmProcessInstanceMyPageReqVO dto) {
        log.info("我发起的审批列表 getOwnTaskPage===>>>参数：{}", dto);
-        BpmPageResult<BpmProcessInstancePageItemVO> result=bpmProcessInstanceService.getMyProcessInstancePage(dto);
+        BpmPageResult<BpmProcessInstancePageItemVO> result = bpmProcessInstanceService.getMyProcessInstancePage(dto);
        return CommonResponse.success(result);
    }

    /**
     * 发起审核
-     * */
+     */
    @PutMapping("/create")
-    public CommonResponse<String> createProcessInstance(@Valid  @RequestBody BpmProcessInstanceCreateDTO dto) {
+    public CommonResponse<String> createProcessInstance(@Valid @RequestBody BpmProcessInstanceCreateDTO dto) {
        log.info("发起审核createProcessInstance===>>>参数：{}", JSON.toJSONString(dto));
-        String result=bpmProcessInstanceService.createProcessInstance(dto);
+        String result = bpmProcessInstanceService.createProcessInstance(dto);
        return CommonResponse.success(result);
    }

@ -57,24 +54,25 @@ public class BpmProcessInstanceController {
     * @return 流程实例, 租户Id不必传
     */
    @GetMapping("/get")
-    public CommonResponse<ProcessInstance> getProcessInstance( @RequestBody String id, String tenantId) {
-        log.info("获得流程实例 getProcessInstance===>>>参数：{},{}", id,tenantId);
-        ProcessInstance result=bpmProcessInstanceService.getProcessInstance(id,tenantId);
+    public CommonResponse<ProcessInstance> getProcessInstance(@RequestBody String id, String tenantId) {
+        log.info("获得流程实例 getProcessInstance===>>>参数：{},{}", id, tenantId);
+        ProcessInstance result = bpmProcessInstanceService.getProcessInstance(id, tenantId);
        return CommonResponse.success(result);
    }

    /**
     * 获得流程实例
     *
-     * @param id 流程实例的编号
-     * @param tenantId 租户Id
+     * @param id          流程实例的编号
+     * @param tenantId    租户Id
     * @param hasVariable 查询结果是否包含流程参数，
     * @return 流程实例, 租户Id不必传
     */
    @GetMapping("/hasVariable/get")
-    public CommonResponse<ProcessInstance> getProcessInstances( @RequestBody String id, String tenantId, boolean hasVariable) {
-        log.info("获得流程实例 getProcessInstances===>>>参数：{},{}", id,tenantId);
-        ProcessInstance result=bpmProcessInstanceService.getProcessInstance(id,tenantId,hasVariable);
+    public CommonResponse<ProcessInstance> getProcessInstances(@RequestBody String id, String tenantId,
+                                                               boolean hasVariable) {
+        log.info("获得流程实例 getProcessInstances===>>>参数：{},{}", id, tenantId);
+        ProcessInstance result = bpmProcessInstanceService.getProcessInstance(id, tenantId, hasVariable);
        return CommonResponse.success(result);
    }

@ -83,12 +81,12 @@ public class BpmProcessInstanceController {
     * 获得流程实例
     *
     * @param processInstanceId 流程实例的编号
-     * @param status 租户Id
+     * @param status            租户Id
     */
    @GetMapping("/updateProcessStatus")
-    public CommonResponse<Boolean> updateProcessStatus( @RequestBody String processInstanceId, String status) {
-        log.info("获得流程实例 updateProcessStatus===>>>参数：{},{}", processInstanceId,status);
-        Boolean result=bpmProcessInstanceService.updateProcessStatus(processInstanceId,status);
+    public CommonResponse<Boolean> updateProcessStatus(@RequestBody String processInstanceId, String status) {
+        log.info("获得流程实例 updateProcessStatus===>>>参数：{},{}", processInstanceId, status);
+        Boolean result = bpmProcessInstanceService.updateProcessStatus(processInstanceId, status);
        return CommonResponse.success(result);
    }

@ -100,9 +98,9 @@ public class BpmProcessInstanceController {
     * @return 历史的流程实例
     */
    @GetMapping("/getHistoricProcessInstance")
-    public CommonResponse<HistoricProcessInstance> getHistoricProcessInstance( @RequestBody String id, String tenantId) {
-        log.info("获得历史的流程实例 getHistoricProcessInstance===>>>参数：{},{}", id,tenantId);
-        HistoricProcessInstance result=bpmProcessInstanceService.getHistoricProcessInstance(id,tenantId);
+    public CommonResponse<HistoricProcessInstance> getHistoricProcessInstance(@RequestBody String id, String tenantId) {
+        log.info("获得历史的流程实例 getHistoricProcessInstance===>>>参数：{},{}", id, tenantId);
+        HistoricProcessInstance result = bpmProcessInstanceService.getHistoricProcessInstance(id, tenantId);
        return CommonResponse.success(result);
    }

@ -114,9 +112,9 @@ public class BpmProcessInstanceController {
     * @return 流程实例
     */
    @GetMapping("/getProcessInstanceVO")
-    public CommonResponse<BpmProcessInstanceVO> getProcessInstanceVO( @RequestBody String id, String tenantId) {
-        log.info("获得历史的流程实例 getProcessInstanceVO===>>>参数：{},{}", id,tenantId);
-        BpmProcessInstanceVO result=bpmProcessInstanceService.getProcessInstanceVO(id,tenantId);
+    public CommonResponse<BpmProcessInstanceVO> getProcessInstanceVO(@RequestBody String id, String tenantId) {
+        log.info("获得历史的流程实例 getProcessInstanceVO===>>>参数：{},{}", id, tenantId);
+        BpmProcessInstanceVO result = bpmProcessInstanceService.getProcessInstanceVO(id, tenantId);
        return CommonResponse.success(result);
    }

@ -124,7 +122,7 @@ public class BpmProcessInstanceController {
    @GetMapping("/getWithdrawProcessInstance")
    public CommonResponse<Boolean> getWithdrawProcessInstance(@Valid @RequestBody BpmProcessInstanceWithdrawDTO dto) {
        log.info("withdrawProcessInstance===>>>参数：{}", dto);
-        Boolean result=bpmProcessInstanceService.withdrawProcessInstance(dto);
+        Boolean result = bpmProcessInstanceService.withdrawProcessInstance(dto);
        return CommonResponse.success(result);
    }
 }
--- a/workflow-engine-server/src/main/java/cn/axzo/server/controller/web/BpmTaskController.java
+++ b/workflow-engine-server/src/main/java/cn/axzo/server/controller/web/BpmTaskController.java
@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;

@Slf4j
-@RequestMapping("/web/v1/api/BpmTask")
+@RequestMapping("/web/v1/api/bpm/task")
@RestController
 public class BpmTaskController {

@ -27,7 +27,7 @@ public class BpmTaskController {
    /**
     * 待审核列表
     * */
-    @GetMapping("/getTodoTaskPage")
+    @GetMapping("/getTodoPage")
    public CommonResponse<BpmPageResult<BpmTaskTodoPageItemRespVO>> getTodoTaskPage(@RequestBody BpmTaskTodoBpmPageDTO dto) {
        log.info("待审核列表 getTodoTaskPage===>>>参数：{}", dto);
        BpmPageResult<BpmTaskTodoPageItemRespVO> result=bpmTaskService.getTodoTaskPage(dto);
@ -37,7 +37,7 @@ public class BpmTaskController {
    /**
     * 已完成的审批列表
     * */
-    @GetMapping("/getDoneTaskPage")
+    @GetMapping("/getDonePage")
    public CommonResponse<BpmPageResult<BpmTaskTodoPageItemRespVO>> getDoneTaskPage(@RequestBody BpmTaskTodoBpmPageDTO dto) {
        log.info("已完成的审批列表 getDoneTaskPage===>>>参数：{}", dto);
        BpmPageResult<BpmTaskTodoPageItemRespVO> result=bpmTaskService.getDoneTaskPage(dto);
@ -50,7 +50,7 @@ public class BpmTaskController {
    /**
     * 同意
     * */
-    @PostMapping("/approveTask")
+    @PostMapping("/approve")
    public CommonResponse approveTask(@RequestBody BpmTaskAuditDTO  dto) {
        log.info("同意 approveTask===>>>参数：{}", dto);
        bpmTaskService.approveTask(dto);
@ -60,7 +60,7 @@ public class BpmTaskController {
    /**
     * 拒绝
     * */
-    @PostMapping("/rejectTask")
+    @PostMapping("/reject")
    public CommonResponse rejectTask(@RequestBody BpmTaskAuditDTO  dto) {
        log.info("拒绝 rejectTask===>>>参数：{}", dto);
        bpmTaskService.rejectTask(dto);
@ -71,7 +71,7 @@ public class BpmTaskController {
    /**
     * 获取历史已审批的列表详情
     */
-    @GetMapping("/getTaskListByProcessInstanceId")
+    @GetMapping("/listByProcessInstanceId")
    public CommonResponse<List<HistoricTaskInstance>> getTaskListByProcessInstanceId(@RequestBody String processInstanceId) {
        log.info("获取历史已审批的列表详情 getTaskListByProcessInstanceId===>>>参数：{}", processInstanceId);
        List<HistoricTaskInstance> result=bpmTaskService.getTaskListByProcessInstanceId(processInstanceId);
@ -81,7 +81,7 @@ public class BpmTaskController {
    /**
     * 获取实例正在审核的人列表
     * */
-    @GetMapping("/getActiveTasksByProcessInstanceId")
+    @GetMapping("/active/listTasksByProcessInstanceId")
    public CommonResponse<List<Task>> getActiveTasksByProcessInstanceId(@RequestBody String processInstanceId) {
        log.info(" 获取实例正在审核的人列表 getActiveTasksByProcessInstanceId===>>>参数：{}", processInstanceId);
        List<Task> result=bpmTaskService.getActiveTasksByProcessInstanceId(processInstanceId);