diff --git a/ruoyi-admin/src/main/java/com/ruoyi/wcs/flow/controller/WcsFlowInstanceController.java b/ruoyi-admin/src/main/java/com/ruoyi/wcs/flow/controller/WcsFlowInstanceController.java index aa6159da..b42a0a08 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/wcs/flow/controller/WcsFlowInstanceController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/wcs/flow/controller/WcsFlowInstanceController.java @@ -20,10 +20,11 @@ import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.wcs.flow.domain.WcsFlowInstance; +import com.ruoyi.wcs.flow.engine.FlowEngineService; import com.ruoyi.wcs.flow.service.IWcsFlowInstanceService; /** - * 流程实例 Controller + * 锟斤拷锟斤拷实锟斤拷 Controller * * @author wcs */ @@ -34,8 +35,11 @@ public class WcsFlowInstanceController extends BaseController @Autowired private IWcsFlowInstanceService flowInstanceService; + @Autowired + private FlowEngineService flowEngineService; + /** - * 查询流程实例列表 + * 锟斤拷询锟斤拷锟斤拷实锟斤拷锟叫憋拷 */ @PreAuthorize("@ss.hasPermi('wcs:flowinstance:list')") @GetMapping("/list") @@ -47,20 +51,20 @@ public class WcsFlowInstanceController extends BaseController } /** - * 导出流程实例列表 + * 锟斤拷锟斤拷锟斤拷锟斤拷实锟斤拷锟叫憋拷 */ @PreAuthorize("@ss.hasPermi('wcs:flowinstance:export')") - @Log(title = "流程实例", businessType = BusinessType.EXPORT) + @Log(title = "锟斤拷锟斤拷实锟斤拷", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, WcsFlowInstance flowInstance) { List list = flowInstanceService.selectFlowInstanceList(flowInstance); ExcelUtil util = new ExcelUtil(WcsFlowInstance.class); - util.exportExcel(response, list, "流程实例数据"); + util.exportExcel(response, list, "锟斤拷锟斤拷实锟斤拷锟斤拷锟斤拷"); } /** - * 获取流程实例详细信息 + * 锟斤拷取锟斤拷锟斤拷实锟斤拷锟斤拷细锟斤拷息 */ @PreAuthorize("@ss.hasPermi('wcs:flowinstance:query')") @GetMapping(value = "/{id}") @@ -70,10 +74,10 @@ public class WcsFlowInstanceController extends BaseController } /** - * 新增流程实例 + * 锟斤拷锟斤拷锟斤拷锟斤拷实锟斤拷 */ @PreAuthorize("@ss.hasPermi('wcs:flowinstance:add')") - @Log(title = "流程实例", businessType = BusinessType.INSERT) + @Log(title = "锟斤拷锟斤拷实锟斤拷", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@Validated @RequestBody WcsFlowInstance flowInstance) { @@ -82,10 +86,10 @@ public class WcsFlowInstanceController extends BaseController } /** - * 修改流程实例 + * 锟睫革拷锟斤拷锟斤拷实锟斤拷 */ @PreAuthorize("@ss.hasPermi('wcs:flowinstance:edit')") - @Log(title = "流程实例", businessType = BusinessType.UPDATE) + @Log(title = "锟斤拷锟斤拷实锟斤拷", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@Validated @RequestBody WcsFlowInstance flowInstance) { @@ -94,13 +98,25 @@ public class WcsFlowInstanceController extends BaseController } /** - * 删除流程实例 + * 删锟斤拷锟斤拷锟斤拷实锟斤拷 */ @PreAuthorize("@ss.hasPermi('wcs:flowinstance:remove')") - @Log(title = "流程实例", businessType = BusinessType.DELETE) + @Log(title = "锟斤拷锟斤拷实锟斤拷", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(flowInstanceService.deleteFlowInstanceByIds(ids)); } + + /** + * 鎵ц娴佺▼ + */ + @PreAuthorize("@ss.hasPermi('wcs:flowinstance:execute')") + @Log(title = "娴佺▼瀹炰緥", businessType = BusinessType.OTHER) + @PostMapping("/execute/{flowDefId}") + public AjaxResult execute(@PathVariable Long flowDefId) + { + Long instanceId = flowEngineService.executeFlow(flowDefId); + return AjaxResult.success("娴佺▼宸插惎鍔�", instanceId); + } } diff --git a/ruoyi-ui/src/api/wcs/flowinstance.js b/ruoyi-ui/src/api/wcs/flowinstance.js index d42055b9..52637715 100644 --- a/ruoyi-ui/src/api/wcs/flowinstance.js +++ b/ruoyi-ui/src/api/wcs/flowinstance.js @@ -42,3 +42,11 @@ export function delFlowInstance(id) { method: 'delete' }) } + +// 鎵ц娴佺▼ +export function executeFlowInstance(flowDefId) { + return request({ + url: '/wcs/flow/instance/execute/' + flowDefId, + method: 'post' + }) +} diff --git a/ruoyi-ui/src/views/wcs/flowinstance/index.vue b/ruoyi-ui/src/views/wcs/flowinstance/index.vue index 5cbcd054..e3cd57a6 100644 --- a/ruoyi-ui/src/views/wcs/flowinstance/index.vue +++ b/ruoyi-ui/src/views/wcs/flowinstance/index.vue @@ -1,16 +1,16 @@