|
@@ -36,12 +36,12 @@ public class ActivitiController {
|
|
@Resource
|
|
@Resource
|
|
private ActivitiService activitiService;
|
|
private ActivitiService activitiService;
|
|
|
|
|
|
-// @ApiOperation(value = "注册流程")
|
|
|
|
-// @RequestMapping(value = "/createDeployment", method = RequestMethod.POST)
|
|
|
|
-// public Result createDeployment(@RequestParam(value = "processFileName") String processFileName) {
|
|
|
|
-// activitiService.createDeployment(processFileName);
|
|
|
|
-// return ResultUtil.ok();
|
|
|
|
-// }
|
|
|
|
|
|
+ @ApiOperation(value = "注册流程")
|
|
|
|
+ @RequestMapping(value = "/createDeployment", method = RequestMethod.POST)
|
|
|
|
+ public Result createDeployment(@RequestParam(value = "processFileName") String processFileName) {
|
|
|
|
+ activitiService.createDeployment(processFileName);
|
|
|
|
+ return ResultUtil.ok();
|
|
|
|
+ }
|
|
|
|
|
|
@ApiOperation(value = "上传流程")
|
|
@ApiOperation(value = "上传流程")
|
|
@RequestMapping(value = "/updateDeployment", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/updateDeployment", method = RequestMethod.POST)
|
|
@@ -50,35 +50,35 @@ public class ActivitiController {
|
|
return ResultUtil.ok();
|
|
return ResultUtil.ok();
|
|
}
|
|
}
|
|
|
|
|
|
-// @ApiOperation(value = "启动流程")
|
|
|
|
-// @RequestMapping(value = "/startActivity", method = RequestMethod.POST)
|
|
|
|
-// public Result startActivity(@RequestParam(value = "processKey") String processKey) {
|
|
|
|
-// Map<String, Object> map = new HashMap<>();
|
|
|
|
-// map.put("userId", 1L);
|
|
|
|
-// map.put("approveId", 2L);
|
|
|
|
-// map.put("assigneeId", 3L);
|
|
|
|
-// activitiService.startActivity(processKey, map);
|
|
|
|
-// return ResultUtil.ok();
|
|
|
|
-// }
|
|
|
|
-//
|
|
|
|
-// @ApiOperation(value = "获取待办")
|
|
|
|
-// @RequestMapping(value = "/getTaskList", method = RequestMethod.POST)
|
|
|
|
-// public Result getTaskList() {
|
|
|
|
-// activitiService.getTaskList();
|
|
|
|
-// return ResultUtil.ok();
|
|
|
|
-// }
|
|
|
|
-//
|
|
|
|
-// @ApiOperation(value = "提交")
|
|
|
|
-// @RequestMapping(value = "/complete", method = RequestMethod.POST)
|
|
|
|
-// public Result complete(@RequestParam(value = "taskId") String taskId) {
|
|
|
|
-// activitiService.complete(taskId);
|
|
|
|
-// return ResultUtil.ok();
|
|
|
|
-// }
|
|
|
|
-//
|
|
|
|
-// @ApiOperation(value = "根据流程id直接结束流程")
|
|
|
|
-// @RequestMapping(value = "/deleteProcessInstance", method = RequestMethod.POST)
|
|
|
|
-// public Result deleteProcessInstance(@RequestParam(value = "flowId") String flowId) {
|
|
|
|
-// activitiService.deleteProcessInstance(flowId);
|
|
|
|
-// return ResultUtil.ok();
|
|
|
|
-// }
|
|
|
|
|
|
+ @ApiOperation(value = "启动流程")
|
|
|
|
+ @RequestMapping(value = "/startActivity", method = RequestMethod.POST)
|
|
|
|
+ public Result startActivity(@RequestParam(value = "processKey") String processKey) {
|
|
|
|
+ Map<String, Object> map = new HashMap<>();
|
|
|
|
+ map.put("userId", 1L);
|
|
|
|
+ map.put("approveId", 2L);
|
|
|
|
+ map.put("assigneeId", 3L);
|
|
|
|
+ activitiService.startActivity(processKey, map);
|
|
|
|
+ return ResultUtil.ok();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @ApiOperation(value = "获取待办")
|
|
|
|
+ @RequestMapping(value = "/getTaskList", method = RequestMethod.POST)
|
|
|
|
+ public Result getTaskList() {
|
|
|
|
+ activitiService.getTaskList();
|
|
|
|
+ return ResultUtil.ok();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @ApiOperation(value = "提交")
|
|
|
|
+ @RequestMapping(value = "/complete", method = RequestMethod.POST)
|
|
|
|
+ public Result complete(@RequestParam(value = "taskId") String taskId) {
|
|
|
|
+ activitiService.complete(taskId);
|
|
|
|
+ return ResultUtil.ok();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @ApiOperation(value = "根据流程id直接结束流程")
|
|
|
|
+ @RequestMapping(value = "/deleteProcessInstance", method = RequestMethod.POST)
|
|
|
|
+ public Result deleteProcessInstance(@RequestParam(value = "flowId") String flowId) {
|
|
|
|
+ activitiService.deleteProcessInstance(flowId);
|
|
|
|
+ return ResultUtil.ok();
|
|
|
|
+ }
|
|
}
|
|
}
|