add -- 添加“新建流程”页面,发起流程操作从“我的流程”页面分离。
This commit is contained in:
@@ -122,7 +122,7 @@ public class WfDefinitionController extends BaseController {
|
||||
return R.ok("导入成功");
|
||||
}
|
||||
|
||||
|
||||
@Deprecated
|
||||
@ApiOperation(value = "根据流程定义id启动流程实例")
|
||||
@SaCheckPermission("workflow:definition:start")
|
||||
@PostMapping("/start/{procDefId}")
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
package com.ruoyi.web.controller.workflow;
|
||||
|
||||
import com.ruoyi.common.core.controller.BaseController;
|
||||
import com.ruoyi.common.core.domain.R;
|
||||
import com.ruoyi.common.utils.JsonUtils;
|
||||
import com.ruoyi.workflow.domain.vo.WfFormVo;
|
||||
import com.ruoyi.workflow.service.IWfDeployFormService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
* @author KonBAI
|
||||
* @createTime 2022/3/24 20:57
|
||||
*/
|
||||
@Slf4j
|
||||
@Api(tags = "流程部署")
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/workflow/deploy")
|
||||
public class WfDeployController extends BaseController {
|
||||
|
||||
private final IWfDeployFormService deployFormService;
|
||||
|
||||
/**
|
||||
*
|
||||
* @param deployId
|
||||
* @return
|
||||
*/
|
||||
@ApiOperation(value = "查询流程部署关联表单信息")
|
||||
@GetMapping("/form/{deployId}")
|
||||
public R<?> start(@ApiParam(value = "流程部署id") @PathVariable(value = "deployId") String deployId) {
|
||||
WfFormVo formVo = deployFormService.selectSysDeployFormByDeployId(deployId);
|
||||
if (Objects.isNull(formVo)) {
|
||||
return R.fail("请先配置流程表单");
|
||||
}
|
||||
return R.ok(JsonUtils.parseObject(formVo.getContent(), Map.class));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
package com.ruoyi.web.controller.workflow;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import com.ruoyi.common.core.controller.BaseController;
|
||||
import com.ruoyi.common.core.domain.PageQuery;
|
||||
import com.ruoyi.common.core.domain.R;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import com.ruoyi.workflow.domain.vo.WfDefinitionVo;
|
||||
import com.ruoyi.workflow.service.IWfProcessService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 工作流流程管理
|
||||
*
|
||||
* @author KonBAI
|
||||
* @createTime 2022/3/24 18:54
|
||||
*/
|
||||
@Slf4j
|
||||
@Api(tags = "工作流流程管理")
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/workflow/process")
|
||||
public class WfProcessController extends BaseController {
|
||||
|
||||
private final IWfProcessService processService;
|
||||
|
||||
@GetMapping(value = "/list")
|
||||
@SaCheckPermission("workflow:process:startList")
|
||||
@ApiOperation(value = "查询可发起流程列表", response = WfDefinitionVo.class)
|
||||
public TableDataInfo<WfDefinitionVo> list(PageQuery pageQuery) {
|
||||
return processService.processList(pageQuery);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "根据流程定义id启动流程实例")
|
||||
@SaCheckPermission("workflow:process:start")
|
||||
@PostMapping("/start/{processDefId}")
|
||||
public R<Void> start(@ApiParam(value = "流程定义id") @PathVariable(value = "processDefId") String processDefId,
|
||||
@ApiParam(value = "变量集合,json对象") @RequestBody Map<String, Object> variables) {
|
||||
processService.startProcess(processDefId, variables);
|
||||
return R.ok("流程启动成功");
|
||||
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user