fix -- 重命名工作流相关的类，删除未使用的代码。
This commit is contained in:
konbai
@@ -12,9 +12,9 @@ import com.ruoyi.common.core.validate.EditGroup;
|
||||
import com.ruoyi.common.core.validate.QueryGroup;
|
||||
import com.ruoyi.common.enums.BusinessType;
|
||||
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||
import com.ruoyi.workflow.domain.bo.FlowCategoryBo;
|
||||
import com.ruoyi.workflow.domain.vo.FlowCategoryVo;
|
||||
import com.ruoyi.workflow.service.IFlowCategoryService;
|
||||
import com.ruoyi.workflow.domain.bo.WfCategoryBo;
|
||||
import com.ruoyi.workflow.domain.vo.WfCategoryVo;
|
||||
import com.ruoyi.workflow.service.IWfCategoryService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
@@ -31,17 +31,17 @@ import java.util.List;
|
||||
/**
|
||||
* 流程分类Controller
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2022-01-15
|
||||
* @author KonBAI
|
||||
* @createTime 2022/3/10 00:12
|
||||
*/
|
||||
@Validated
|
||||
@Api(value = "流程分类控制器", tags = {"流程分类管理"})
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/workflow/category")
|
||||
public class FlowCategoryController extends BaseController {
|
||||
public class WfCategoryController extends BaseController {
|
||||
|
||||
private final IFlowCategoryService flowCategoryService;
|
||||
private final IWfCategoryService flowCategoryService;
|
||||
|
||||
/**
|
||||
* 查询流程分类列表
|
||||
@@ -49,7 +49,7 @@ public class FlowCategoryController extends BaseController {
|
||||
@ApiOperation("查询流程分类列表")
|
||||
@SaCheckPermission("workflow:category:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<FlowCategoryVo> list(@Validated(QueryGroup.class) FlowCategoryBo bo, PageQuery pageQuery) {
|
||||
public TableDataInfo<WfCategoryVo> list(@Validated(QueryGroup.class) WfCategoryBo bo, PageQuery pageQuery) {
|
||||
return flowCategoryService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
@@ -60,9 +60,9 @@ public class FlowCategoryController extends BaseController {
|
||||
@SaCheckPermission("workflow:category:export")
|
||||
@Log(title = "流程分类", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(@Validated FlowCategoryBo bo, HttpServletResponse response) {
|
||||
List<FlowCategoryVo> list = flowCategoryService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "流程分类", FlowCategoryVo.class, response);
|
||||
public void export(@Validated WfCategoryBo bo, HttpServletResponse response) {
|
||||
List<WfCategoryVo> list = flowCategoryService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "流程分类", WfCategoryVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -71,7 +71,7 @@ public class FlowCategoryController extends BaseController {
|
||||
@ApiOperation("获取流程分类详细信息")
|
||||
@SaCheckPermission("workflow:category:query")
|
||||
@GetMapping("/{categoryId}")
|
||||
public R<FlowCategoryVo> getInfo(@ApiParam("主键")
|
||||
public R<WfCategoryVo> getInfo(@ApiParam("主键")
|
||||
@NotNull(message = "主键不能为空")
|
||||
@PathVariable("categoryId") Long categoryId) {
|
||||
return R.ok(flowCategoryService.queryById(categoryId));
|
||||
@@ -85,7 +85,7 @@ public class FlowCategoryController extends BaseController {
|
||||
@Log(title = "流程分类", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody FlowCategoryBo bo) {
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody WfCategoryBo bo) {
|
||||
return toAjax(flowCategoryService.insertByBo(bo) ? 1 : 0);
|
||||
}
|
||||
|
||||
@@ -97,7 +97,7 @@ public class FlowCategoryController extends BaseController {
|
||||
@Log(title = "流程分类", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody FlowCategoryBo bo) {
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody WfCategoryBo bo) {
|
||||
return toAjax(flowCategoryService.updateByBo(bo) ? 1 : 0);
|
||||
}
|
||||
|
||||
@@ -7,9 +7,9 @@ import com.ruoyi.common.core.domain.R;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import com.ruoyi.system.service.ISysRoleService;
|
||||
import com.ruoyi.system.service.ISysUserService;
|
||||
import com.ruoyi.workflow.domain.dto.FlowSaveXmlVo;
|
||||
import com.ruoyi.workflow.domain.vo.FlowDefinitionVo;
|
||||
import com.ruoyi.workflow.service.IFlowDefinitionService;
|
||||
import com.ruoyi.workflow.domain.bo.WfDesignerBo;
|
||||
import com.ruoyi.workflow.domain.vo.WfDefinitionVo;
|
||||
import com.ruoyi.workflow.service.IWfDefinitionService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
@@ -28,9 +28,7 @@ import java.nio.charset.StandardCharsets;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 工作流程定义
|
||||
* </p>
|
||||
*
|
||||
* @author KonBAI
|
||||
* @date 2022-01-17
|
||||
@@ -40,9 +38,9 @@ import java.util.Map;
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/workflow/definition")
|
||||
public class FlowDefinitionController extends BaseController {
|
||||
public class WfDefinitionController extends BaseController {
|
||||
|
||||
private final IFlowDefinitionService flowDefinitionService;
|
||||
private final IWfDefinitionService flowDefinitionService;
|
||||
|
||||
private final ISysUserService userService;
|
||||
|
||||
@@ -50,8 +48,8 @@ public class FlowDefinitionController extends BaseController {
|
||||
|
||||
@GetMapping(value = "/list")
|
||||
@SaCheckPermission("workflow:definition:list")
|
||||
@ApiOperation(value = "流程定义列表", response = FlowDefinitionVo.class)
|
||||
public TableDataInfo<FlowDefinitionVo> list(PageQuery pageQuery) {
|
||||
@ApiOperation(value = "流程定义列表", response = WfDefinitionVo.class)
|
||||
public TableDataInfo<WfDefinitionVo> list(PageQuery pageQuery) {
|
||||
return flowDefinitionService.list(pageQuery);
|
||||
}
|
||||
|
||||
@@ -63,9 +61,9 @@ public class FlowDefinitionController extends BaseController {
|
||||
*/
|
||||
@GetMapping(value = "/publishList")
|
||||
@SaCheckPermission("workflow:definition:list")
|
||||
@ApiOperation(value = "指定流程的发布版本列表", response = FlowDefinitionVo.class)
|
||||
public TableDataInfo<FlowDefinitionVo> publishList(@ApiParam(value = "流程定义Key", required = true) @RequestParam String processKey,
|
||||
PageQuery pageQuery) {
|
||||
@ApiOperation(value = "指定流程的发布版本列表", response = WfDefinitionVo.class)
|
||||
public TableDataInfo<WfDefinitionVo> publishList(@ApiParam(value = "流程定义Key", required = true) @RequestParam String processKey,
|
||||
PageQuery pageQuery) {
|
||||
return flowDefinitionService.publishList(processKey, pageQuery);
|
||||
}
|
||||
|
||||
@@ -119,9 +117,9 @@ public class FlowDefinitionController extends BaseController {
|
||||
@ApiOperation(value = "保存流程设计器内的xml文件")
|
||||
@SaCheckPermission("workflow:definition:designer")
|
||||
@PostMapping("/save")
|
||||
public R<Void> save(@RequestBody FlowSaveXmlVo vo) {
|
||||
try (InputStream in = new ByteArrayInputStream(vo.getXml().getBytes(StandardCharsets.UTF_8))) {
|
||||
flowDefinitionService.importFile(vo.getName(), vo.getCategory(), in);
|
||||
public R<Void> save(@RequestBody WfDesignerBo bo) {
|
||||
try (InputStream in = new ByteArrayInputStream(bo.getXml().getBytes(StandardCharsets.UTF_8))) {
|
||||
flowDefinitionService.importFile(bo.getName(), bo.getCategory(), in);
|
||||
} catch (Exception e) {
|
||||
log.error("导入失败:", e);
|
||||
return R.ok(e.getMessage());
|
||||
@@ -2,8 +2,8 @@ package com.ruoyi.web.controller.workflow;
|
||||
|
||||
|
||||
import com.ruoyi.common.core.domain.R;
|
||||
import com.ruoyi.workflow.domain.vo.FlowTaskVo;
|
||||
import com.ruoyi.workflow.service.IFlowInstanceService;
|
||||
import com.ruoyi.workflow.domain.bo.WfTaskBo;
|
||||
import com.ruoyi.workflow.service.IWfInstanceService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
@@ -14,19 +14,19 @@ import org.springframework.web.bind.annotation.*;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* <p>工作流流程实例管理<p>
|
||||
* 工作流流程实例管理
|
||||
*
|
||||
* @author XuanXuan
|
||||
* @date 2021-04-03
|
||||
* @author KonBAI
|
||||
* @createTime 2022/3/10 00:12
|
||||
*/
|
||||
@Slf4j
|
||||
@Api(tags = "工作流流程实例管理")
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/workflow/instance")
|
||||
public class FlowInstanceController {
|
||||
public class WfInstanceController {
|
||||
|
||||
private final IFlowInstanceService flowInstanceService;
|
||||
private final IWfInstanceService flowInstanceService;
|
||||
|
||||
@ApiOperation(value = "根据流程定义id启动流程实例")
|
||||
@PostMapping("/startBy/{procDefId}")
|
||||
@@ -47,8 +47,8 @@ public class FlowInstanceController {
|
||||
|
||||
@ApiOperation("结束流程实例")
|
||||
@PostMapping(value = "/stopProcessInstance")
|
||||
public R stopProcessInstance(@RequestBody FlowTaskVo flowTaskVo) {
|
||||
flowInstanceService.stopProcessInstance(flowTaskVo);
|
||||
public R stopProcessInstance(@RequestBody WfTaskBo bo) {
|
||||
flowInstanceService.stopProcessInstance(bo);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@@ -3,9 +3,9 @@ package com.ruoyi.web.controller.workflow;
|
||||
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.dto.FlowTaskDto;
|
||||
import com.ruoyi.workflow.domain.vo.FlowTaskVo;
|
||||
import com.ruoyi.workflow.service.IFlowTaskService;
|
||||
import com.ruoyi.workflow.domain.vo.WfTaskVo;
|
||||
import com.ruoyi.workflow.domain.bo.WfTaskBo;
|
||||
import com.ruoyi.workflow.service.IWfTaskService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
@@ -21,60 +21,60 @@ import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
||||
|
||||
/**
|
||||
* <p>工作流任务管理<p>
|
||||
* 工作流任务管理
|
||||
*
|
||||
* @author XuanXuan
|
||||
* @date 2021-04-03
|
||||
* @author KonBAI
|
||||
* @createTime 2022/3/10 00:12
|
||||
*/
|
||||
@Slf4j
|
||||
@Api(tags = "工作流流程任务管理")
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/workflow/task")
|
||||
public class FlowTaskController {
|
||||
public class WfTaskController {
|
||||
|
||||
private final IFlowTaskService flowTaskService;
|
||||
private final IWfTaskService flowTaskService;
|
||||
|
||||
@ApiOperation(value = "我发起的流程", response = FlowTaskDto.class)
|
||||
@ApiOperation(value = "我发起的流程", response = WfTaskVo.class)
|
||||
@GetMapping(value = "/myProcess")
|
||||
public TableDataInfo<FlowTaskDto> myProcess(PageQuery pageQuery) {
|
||||
public TableDataInfo<WfTaskVo> myProcess(PageQuery pageQuery) {
|
||||
return flowTaskService.myProcess(pageQuery);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "取消申请", response = FlowTaskDto.class)
|
||||
@ApiOperation(value = "取消申请", response = WfTaskVo.class)
|
||||
@PostMapping(value = "/stopProcess")
|
||||
public R stopProcess(@RequestBody FlowTaskVo flowTaskVo) {
|
||||
flowTaskService.stopProcess(flowTaskVo);
|
||||
public R stopProcess(@RequestBody WfTaskBo bo) {
|
||||
flowTaskService.stopProcess(bo);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@ApiOperation(value = "撤回流程", response = FlowTaskDto.class)
|
||||
@ApiOperation(value = "撤回流程", response = WfTaskVo.class)
|
||||
@PostMapping(value = "/revokeProcess")
|
||||
public R revokeProcess(@RequestBody FlowTaskVo flowTaskVo) {
|
||||
flowTaskService.revokeProcess(flowTaskVo);
|
||||
public R revokeProcess(@RequestBody WfTaskBo bo) {
|
||||
flowTaskService.revokeProcess(bo);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@ApiOperation(value = "获取待办列表", response = FlowTaskDto.class)
|
||||
@ApiOperation(value = "获取待办列表", response = WfTaskVo.class)
|
||||
@GetMapping(value = "/todoList")
|
||||
public TableDataInfo<FlowTaskDto> todoList(PageQuery pageQuery) {
|
||||
public TableDataInfo<WfTaskVo> todoList(PageQuery pageQuery) {
|
||||
return flowTaskService.todoList(pageQuery);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "获取已办任务", response = FlowTaskDto.class)
|
||||
@ApiOperation(value = "获取已办任务", response = WfTaskVo.class)
|
||||
@GetMapping(value = "/finishedList")
|
||||
public TableDataInfo<FlowTaskDto> finishedList(PageQuery pageQuery) {
|
||||
public TableDataInfo<WfTaskVo> finishedList(PageQuery pageQuery) {
|
||||
return flowTaskService.finishedList(pageQuery);
|
||||
}
|
||||
|
||||
|
||||
@ApiOperation(value = "流程历史流转记录", response = FlowTaskDto.class)
|
||||
@ApiOperation(value = "流程历史流转记录", response = WfTaskVo.class)
|
||||
@GetMapping(value = "/flowRecord")
|
||||
public R flowRecord(String procInsId, String deployId) {
|
||||
return R.ok(flowTaskService.flowRecord(procInsId, deployId));
|
||||
}
|
||||
|
||||
@ApiOperation(value = "获取流程变量", response = FlowTaskDto.class)
|
||||
@ApiOperation(value = "获取流程变量", response = WfTaskVo.class)
|
||||
@GetMapping(value = "/processVariables/{taskId}")
|
||||
public R processVariables(@ApiParam(value = "流程任务Id") @PathVariable(value = "taskId") String taskId) {
|
||||
return flowTaskService.processVariables(taskId);
|
||||
@@ -82,71 +82,71 @@ public class FlowTaskController {
|
||||
|
||||
@ApiOperation(value = "审批任务")
|
||||
@PostMapping(value = "/complete")
|
||||
public R complete(@RequestBody FlowTaskVo flowTaskVo) {
|
||||
flowTaskService.complete(flowTaskVo);
|
||||
public R complete(@RequestBody WfTaskBo bo) {
|
||||
flowTaskService.complete(bo);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
|
||||
@ApiOperation(value = "驳回任务")
|
||||
@PostMapping(value = "/reject")
|
||||
public R taskReject(@RequestBody FlowTaskVo flowTaskVo) {
|
||||
flowTaskService.taskReject(flowTaskVo);
|
||||
public R taskReject(@RequestBody WfTaskBo bo) {
|
||||
flowTaskService.taskReject(bo);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@ApiOperation(value = "退回任务")
|
||||
@PostMapping(value = "/return")
|
||||
public R taskReturn(@RequestBody FlowTaskVo flowTaskVo) {
|
||||
flowTaskService.taskReturn(flowTaskVo);
|
||||
public R taskReturn(@RequestBody WfTaskBo bo) {
|
||||
flowTaskService.taskReturn(bo);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@ApiOperation(value = "获取所有可回退的节点")
|
||||
@PostMapping(value = "/returnList")
|
||||
public R findReturnTaskList(@RequestBody FlowTaskVo flowTaskVo) {
|
||||
return R.ok(flowTaskService.findReturnTaskList(flowTaskVo));
|
||||
public R findReturnTaskList(@RequestBody WfTaskBo bo) {
|
||||
return R.ok(flowTaskService.findReturnTaskList(bo));
|
||||
}
|
||||
|
||||
@ApiOperation(value = "删除任务")
|
||||
@DeleteMapping(value = "/delete")
|
||||
public R delete(@RequestBody FlowTaskVo flowTaskVo) {
|
||||
flowTaskService.deleteTask(flowTaskVo);
|
||||
public R delete(@RequestBody WfTaskBo bo) {
|
||||
flowTaskService.deleteTask(bo);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@ApiOperation(value = "认领/签收任务")
|
||||
@PostMapping(value = "/claim")
|
||||
public R claim(@RequestBody FlowTaskVo flowTaskVo) {
|
||||
flowTaskService.claim(flowTaskVo);
|
||||
public R claim(@RequestBody WfTaskBo bo) {
|
||||
flowTaskService.claim(bo);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@ApiOperation(value = "取消认领/签收任务")
|
||||
@PostMapping(value = "/unClaim")
|
||||
public R unClaim(@RequestBody FlowTaskVo flowTaskVo) {
|
||||
flowTaskService.unClaim(flowTaskVo);
|
||||
public R unClaim(@RequestBody WfTaskBo bo) {
|
||||
flowTaskService.unClaim(bo);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@ApiOperation(value = "委派任务")
|
||||
@PostMapping(value = "/delegate")
|
||||
public R delegate(@RequestBody FlowTaskVo flowTaskVo) {
|
||||
flowTaskService.delegateTask(flowTaskVo);
|
||||
public R delegate(@RequestBody WfTaskBo bo) {
|
||||
flowTaskService.delegateTask(bo);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@ApiOperation(value = "转办任务")
|
||||
@PostMapping(value = "/assign")
|
||||
public R assign(@RequestBody FlowTaskVo flowTaskVo) {
|
||||
flowTaskService.assignTask(flowTaskVo);
|
||||
public R assign(@RequestBody WfTaskBo bo) {
|
||||
flowTaskService.assignTask(bo);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@ApiOperation(value = "获取下一节点")
|
||||
@PostMapping(value = "/nextFlowNode")
|
||||
public R getNextFlowNode(@RequestBody FlowTaskVo flowTaskVo) {
|
||||
return flowTaskService.getNextFlowNode(flowTaskVo);
|
||||
public R getNextFlowNode(@RequestBody WfTaskBo bo) {
|
||||
return flowTaskService.getNextFlowNode(bo);
|
||||
}
|
||||
|
||||
/**
|
||||
Reference in New Issue
Block a user