流程执行接口 + 前端执行按钮 + SQL权限修正(flowlog/flowinstance) + execute权限 | 编译通过
This commit is contained in:
@@ -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;
|
||||
|
||||
/**
|
||||
* <20><><EFBFBD><EFBFBD>ʵ<EFBFBD><CAB5> Controller
|
||||
* <20><><EFBFBD><EFBFBD>ʵ<EFBFBD><CAB5> Controller
|
||||
*
|
||||
* @author wcs
|
||||
*/
|
||||
@@ -34,8 +35,11 @@ public class WcsFlowInstanceController extends BaseController
|
||||
@Autowired
|
||||
private IWcsFlowInstanceService flowInstanceService;
|
||||
|
||||
@Autowired
|
||||
private FlowEngineService flowEngineService;
|
||||
|
||||
/**
|
||||
* <20><>ѯ<EFBFBD><D1AF><EFBFBD><EFBFBD>ʵ<EFBFBD><CAB5><EFBFBD>б<EFBFBD>
|
||||
* <20><>ѯ<EFBFBD><D1AF><EFBFBD><EFBFBD>ʵ<EFBFBD><CAB5><EFBFBD>б<EFBFBD>
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('wcs:flowinstance:list')")
|
||||
@GetMapping("/list")
|
||||
@@ -47,20 +51,20 @@ public class WcsFlowInstanceController extends BaseController
|
||||
}
|
||||
|
||||
/**
|
||||
* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʵ<EFBFBD><CAB5><EFBFBD>б<EFBFBD>
|
||||
* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʵ<EFBFBD><CAB5><EFBFBD>б<EFBFBD>
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('wcs:flowinstance:export')")
|
||||
@Log(title = "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʵ<EFBFBD><EFBFBD>", businessType = BusinessType.EXPORT)
|
||||
@Log(title = "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʵ<EFBFBD><EFBFBD>", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, WcsFlowInstance flowInstance)
|
||||
{
|
||||
List<WcsFlowInstance> list = flowInstanceService.selectFlowInstanceList(flowInstance);
|
||||
ExcelUtil<WcsFlowInstance> util = new ExcelUtil<WcsFlowInstance>(WcsFlowInstance.class);
|
||||
util.exportExcel(response, list, "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
|
||||
util.exportExcel(response, list, "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
|
||||
}
|
||||
|
||||
/**
|
||||
* <20><>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD>ʵ<EFBFBD><CAB5><EFBFBD><EFBFBD>ϸ<EFBFBD><CFB8>Ϣ
|
||||
* <20><>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD>ʵ<EFBFBD><CAB5><EFBFBD><EFBFBD>ϸ<EFBFBD><CFB8>Ϣ
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('wcs:flowinstance:query')")
|
||||
@GetMapping(value = "/{id}")
|
||||
@@ -70,10 +74,10 @@ public class WcsFlowInstanceController extends BaseController
|
||||
}
|
||||
|
||||
/**
|
||||
* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʵ<EFBFBD><CAB5>
|
||||
* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʵ<EFBFBD><CAB5>
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('wcs:flowinstance:add')")
|
||||
@Log(title = "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʵ<EFBFBD><EFBFBD>", businessType = BusinessType.INSERT)
|
||||
@Log(title = "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʵ<EFBFBD><EFBFBD>", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@Validated @RequestBody WcsFlowInstance flowInstance)
|
||||
{
|
||||
@@ -82,10 +86,10 @@ public class WcsFlowInstanceController extends BaseController
|
||||
}
|
||||
|
||||
/**
|
||||
* <20><EFBFBD><DEB8><EFBFBD><EFBFBD><EFBFBD>ʵ<EFBFBD><CAB5>
|
||||
* <20><EFBFBD><DEB8><EFBFBD><EFBFBD><EFBFBD>ʵ<EFBFBD><CAB5>
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('wcs:flowinstance:edit')")
|
||||
@Log(title = "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʵ<EFBFBD><EFBFBD>", businessType = BusinessType.UPDATE)
|
||||
@Log(title = "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʵ<EFBFBD><EFBFBD>", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@Validated @RequestBody WcsFlowInstance flowInstance)
|
||||
{
|
||||
@@ -94,13 +98,25 @@ public class WcsFlowInstanceController extends BaseController
|
||||
}
|
||||
|
||||
/**
|
||||
* ɾ<><C9BE><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʵ<EFBFBD><CAB5>
|
||||
* ɾ<><C9BE><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʵ<EFBFBD><CAB5>
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('wcs:flowinstance:remove')")
|
||||
@Log(title = "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʵ<EFBFBD><EFBFBD>", businessType = BusinessType.DELETE)
|
||||
@Log(title = "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʵ<EFBFBD><EFBFBD>", 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);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user