diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowDefinitionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowDefinitionController.java index fed6dcaa..4f407c2d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowDefinitionController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowDefinitionController.java @@ -1,5 +1,6 @@ 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; @@ -47,8 +48,8 @@ public class FlowDefinitionController extends BaseController { private final ISysRoleService sysRoleService; - @GetMapping(value = "/list") + @SaCheckPermission("workflow:definition:list") @ApiOperation(value = "流程定义列表", response = FlowDefinitionVo.class) public TableDataInfo list(PageQuery pageQuery) { return flowDefinitionService.list(pageQuery); @@ -61,7 +62,8 @@ public class FlowDefinitionController extends BaseController { * @return */ @GetMapping(value = "/publishList") - @ApiOperation(value = "流程定义列表", response = FlowDefinitionVo.class) + @SaCheckPermission("workflow:definition:list") + @ApiOperation(value = "指定流程的发布版本列表", response = FlowDefinitionVo.class) public TableDataInfo publishList(@ApiParam(value = "流程定义Key", required = true) @RequestParam String processKey, PageQuery pageQuery) { return flowDefinitionService.publishList(processKey, pageQuery); @@ -69,6 +71,7 @@ public class FlowDefinitionController extends BaseController { @ApiOperation(value = "导入流程文件", notes = "上传bpmn20的xml文件") + @SaCheckPermission("workflow:definition:designer") @PostMapping("/import") public R importFile(@RequestParam(required = false) String name, @RequestParam(required = false) String category, @@ -85,6 +88,7 @@ public class FlowDefinitionController extends BaseController { @ApiOperation(value = "读取xml文件") + @SaCheckPermission("workflow:definition:view") @GetMapping("/readXml/{definitionId}") public R readXml(@ApiParam(value = "流程定义ID") @PathVariable(value = "definitionId") String definitionId) { try { @@ -96,6 +100,7 @@ public class FlowDefinitionController extends BaseController { } @ApiOperation(value = "读取图片文件") + @SaCheckPermission("workflow:definition:view") @GetMapping("/readImage/{definitionId}") public void readImage(@ApiParam(value = "流程定义id") @PathVariable(value = "definitionId") String definitionId, HttpServletResponse response) { @@ -112,6 +117,7 @@ public class FlowDefinitionController extends BaseController { @ApiOperation(value = "保存流程设计器内的xml文件") + @SaCheckPermission("workflow:definition:designer") @PostMapping("/save") public R save(@RequestBody FlowSaveXmlVo vo) { try (InputStream in = new ByteArrayInputStream(vo.getXml().getBytes(StandardCharsets.UTF_8))) { @@ -126,6 +132,7 @@ public class FlowDefinitionController extends BaseController { @ApiOperation(value = "根据流程定义id启动流程实例") + @SaCheckPermission("workflow:definition:start") @PostMapping("/start/{procDefId}") public R start(@ApiParam(value = "流程定义id") @PathVariable(value = "procDefId") String procDefId, @ApiParam(value = "变量集合,json对象") @RequestBody Map variables) { @@ -135,6 +142,7 @@ public class FlowDefinitionController extends BaseController { } @ApiOperation(value = "激活或挂起流程定义") + @SaCheckPermission("workflow:definition:update") @PutMapping(value = "/updateState") public R updateState(@ApiParam(value = "ture:挂起,false:激活", required = true) @RequestParam Boolean suspended, @ApiParam(value = "流程定义ID", required = true) @RequestParam String definitionId) { @@ -143,6 +151,7 @@ public class FlowDefinitionController extends BaseController { } @ApiOperation(value = "删除流程") + @SaCheckPermission("workflow:definition:remove") @DeleteMapping(value = "/delete") public R delete(@ApiParam(value = "流程部署ID", required = true) @RequestParam String deployId) { flowDefinitionService.delete(deployId); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/SysFormController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/SysFormController.java index 03df18b3..bd3113aa 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/SysFormController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/SysFormController.java @@ -36,7 +36,7 @@ public class SysFormController extends BaseController { /** * 查询流程表单列表 */ - @SaCheckPermission("flowable:form:list") + @SaCheckPermission("workflow:form:list") @GetMapping("/list") public TableDataInfo list(SysForm sysForm, PageQuery pageQuery) { return SysFormService.selectSysFormPage(sysForm, pageQuery); @@ -45,7 +45,7 @@ public class SysFormController extends BaseController { /** * 导出流程表单列表 */ - @SaCheckPermission("flowable:form:export") + @SaCheckPermission("workflow:form:export") @Log(title = "流程表单", businessType = BusinessType.EXPORT) @GetMapping("/export") public void export(SysForm sysForm, HttpServletResponse response) { @@ -56,7 +56,7 @@ public class SysFormController extends BaseController { /** * 获取流程表单详细信息 */ - @SaCheckPermission("flowable:form:query") + @SaCheckPermission("workflow:form:query") @GetMapping(value = "/{formId}") public R getInfo(@PathVariable("formId") Long formId) { return R.ok(SysFormService.selectSysFormById(formId)); @@ -65,7 +65,7 @@ public class SysFormController extends BaseController { /** * 新增流程表单 */ - @SaCheckPermission("flowable:form:add") + @SaCheckPermission("workflow:form:add") @Log(title = "流程表单", businessType = BusinessType.INSERT) @PostMapping public R add(@RequestBody SysForm sysForm) { @@ -75,7 +75,7 @@ public class SysFormController extends BaseController { /** * 修改流程表单 */ - @SaCheckPermission("flowable:form:edit") + @SaCheckPermission("workflow:form:edit") @Log(title = "流程表单", businessType = BusinessType.UPDATE) @PutMapping public R edit(@RequestBody SysForm sysForm) { @@ -85,7 +85,7 @@ public class SysFormController extends BaseController { /** * 删除流程表单 */ - @SaCheckPermission("flowable:form:remove") + @SaCheckPermission("workflow:form:remove") @Log(title = "流程表单", businessType = BusinessType.DELETE) @DeleteMapping("/{formIds}") public R remove(@PathVariable Long[] formIds) { diff --git a/ruoyi-ui/src/views/workflow/definition/index.vue b/ruoyi-ui/src/views/workflow/definition/index.vue index 4bfadf8f..a694d507 100644 --- a/ruoyi-ui/src/views/workflow/definition/index.vue +++ b/ruoyi-ui/src/views/workflow/definition/index.vue @@ -32,6 +32,7 @@ icon="el-icon-upload" size="mini" @click="handleImport" + v-hasPermi="['workflow:definition:designer']" >导入 @@ -41,6 +42,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" + v-hasPermi="['workflow:definition:designer']" >新增 @@ -51,7 +53,7 @@ size="mini" :disabled="multiple" @click="handleDelete" - v-hasPermi="['system:deployment:remove']" + v-hasPermi="['workflow:definition:remove']" >删除 @@ -61,7 +63,7 @@ icon="el-icon-download" size="mini" @click="handleExport" - v-hasPermi="['system:deployment:export']" + v-hasPermi="['workflow:definition:export']" >导出 @@ -109,13 +111,14 @@ size="mini" icon="el-icon-edit" @click="handleUpdate(scope.row)" + v-hasPermi="['workflow:definition:designer']" >编辑 删除 @@ -125,15 +128,17 @@ 流程图 配置表单 版本管理 @@ -237,6 +242,7 @@ icon="el-icon-video-pause" v-if="!scope.row.suspended" @click.native="handleUpdateSuspended(scope.row)" + v-hasPermi="['workflow:definition:update']" >挂起 激活 删除 diff --git a/ruoyi-ui/src/views/workflow/task/form/index.vue b/ruoyi-ui/src/views/workflow/task/form/index.vue index 06a9d8e2..ef4dd082 100644 --- a/ruoyi-ui/src/views/workflow/task/form/index.vue +++ b/ruoyi-ui/src/views/workflow/task/form/index.vue @@ -24,7 +24,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['flowable:form:add']" + v-hasPermi="['workflow:form:add']" >新增 @@ -35,7 +35,7 @@ size="mini" :disabled="single" @click="handleUpdate" - v-hasPermi="['flowable:form:edit']" + v-hasPermi="['workflow:form:edit']" >修改 @@ -46,7 +46,7 @@ size="mini" :disabled="multiple" @click="handleDelete" - v-hasPermi="['flowable:form:remove']" + v-hasPermi="['workflow:form:remove']" >删除 @@ -56,7 +56,7 @@ icon="el-icon-download" size="mini" @click="handleExport" - v-hasPermi="['flowable:form:export']" + v-hasPermi="['workflow:form:export']" >导出 @@ -80,14 +80,14 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['flowable:form:edit']" + v-hasPermi="['workflow:form:edit']" >修改 删除 diff --git a/script/sql/ry_20220217.sql b/script/sql/ry_20220303.sql similarity index 95% rename from script/sql/ry_20220217.sql rename to script/sql/ry_20220303.sql index 5d03104a..09eabf95 100644 --- a/script/sql/ry_20220217.sql +++ b/script/sql/ry_20220303.sql @@ -186,12 +186,12 @@ insert into sys_menu values('118', '文件管理', '1', '10', 'oss', 'system/os -- xxl-job-admin控制台 insert into sys_menu values('120', '任务调度中心', '2', '5', 'XxlJob', 'monitor/xxljob/index', '', 1, 0, 'C', '0', '0', 'monitor:xxljob:list', 'job', 'admin', sysdate(), '', null, 'Xxl-Job控制台菜单'); -- 流程配置 -insert into sys_menu values('121', '流程分类', '5', '1', 'category', 'workflow/category/index', '', 1, 0, 'C', '0', '0', null, 'nested', 'admin', sysdate(), 'admin', null, ''); -insert into sys_menu values('122', '流程定义', '5', '2', 'definition', 'workflow/definition/index', '', 1, 0, 'C', '0', '0', null, 'example', 'admin', sysdate(), 'admin', null, ''); -insert into sys_menu values('123', '表单配置', '5', '3', 'form', 'workflow/task/form/index', '', 1, 0, 'C', '0', '0', null, 'form', 'admin', sysdate(), 'admin', null, ''); -insert into sys_menu values('124', '我的流程', '6', '1', 'process', 'workflow/task/process/index', '', 1, 0, 'C', '0', '0', null, 'guide', 'admin', sysdate(), 'admin', null, ''); -insert into sys_menu values('125', '待办任务', '6', '2', 'todo', 'workflow/task/todo/index', '', 1, 0, 'C', '0', '0', null, 'cascader', 'admin', sysdate(), 'admin', null, ''); -insert into sys_menu values('126', '已办任务', '6', '3', 'finished', 'workflow/task/finished/index', '', 1, 0, 'C', '0', '0', null, 'checkbox', 'admin', sysdate(), 'admin', null, ''); +insert into sys_menu values('121', '流程分类', '5', '1', 'category', 'workflow/category/index', '', 1, 0, 'C', '0', '0', 'workflow:category:list', 'nested', 'admin', sysdate(), 'admin', null, ''); +insert into sys_menu values('122', '流程定义', '5', '2', 'definition', 'workflow/definition/index', '', 1, 0, 'C', '0', '0', 'workflow:definition:list', 'example', 'admin', sysdate(), 'admin', null, ''); +insert into sys_menu values('123', '表单配置', '5', '3', 'form', 'workflow/task/form/index', '', 1, 0, 'C', '0', '0', 'workflow:form:list', 'form', 'admin', sysdate(), 'admin', null, ''); +insert into sys_menu values('124', '我的流程', '6', '1', 'process', 'workflow/task/process/index', '', 1, 0, 'C', '0', '0', null, 'guide', 'admin', sysdate(), 'admin', null, ''); +insert into sys_menu values('125', '待办任务', '6', '2', 'todo', 'workflow/task/todo/index', '', 1, 0, 'C', '0', '0', null, 'cascader', 'admin', sysdate(), 'admin', null, ''); +insert into sys_menu values('126', '已办任务', '6', '3', 'finished', 'workflow/task/finished/index', '', 1, 0, 'C', '0', '0', null, 'checkbox', 'admin', sysdate(), 'admin', null, ''); -- 三级菜单 insert into sys_menu values('500', '操作日志', '108', '1', 'operlog', 'monitor/operlog/index', '', 1, 0, 'C', '0', '0', 'monitor:operlog:list', 'form', 'admin', sysdate(), '', null, '操作日志菜单'); @@ -269,11 +269,23 @@ insert into sys_menu values('1132', '文件下载', '118', '3', '#', '', '', 1, insert into sys_menu values('1133', '文件删除', '118', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:oss:remove', '#', 'admin', sysdate(), '', null, ''); insert into sys_menu values('1134', '配置添加', '118', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:oss:add', '#', 'admin', sysdate(), '', null, ''); insert into sys_menu values('1135', '配置编辑', '118', '6', '#', '', '', 1, 0, 'F', '0', '0', 'system:oss:edit', '#', 'admin', sysdate(), '', null, ''); --- 流程管理 +-- 流程分类管理 insert into sys_menu values('1140', '分类查询', '121', '1', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:category:query', '#', 'admin', sysdate(), '', null, ''); insert into sys_menu values('1141', '分类新增', '121', '2', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:category:add', '#', 'admin', sysdate(), '', null, ''); insert into sys_menu values('1142', '分类编辑', '121', '3', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:category:edit', '#', 'admin', sysdate(), '', null, ''); insert into sys_menu values('1143', '分类删除', '121', '4', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:category:remove', '#', 'admin', sysdate(), '', null, ''); +-- 流程定义 +insert into sys_menu values('1150', '查看流程', '122', '1', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:definition:view', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1151', '流程设计', '122', '2', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:definition:designer', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1152', '启动流程', '122', '3', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:definition:start', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1153', '更新流程', '122', '4', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:definition:update', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1154', '流程删除', '122', '5', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:definition:remove', '#', 'admin', sysdate(), '', null, ''); +-- 表单配置 +insert into sys_menu values('1160', '表单查询', '123', '1', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:form:query', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1161', '表单新增', '123', '2', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:form:add', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1162', '表单修改', '123', '3', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:form:edit', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1163', '表单删除', '123', '4', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:form:remove', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1164', '表单导出', '123', '5', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:form:export', '#', 'admin', sysdate(), '', null, ''); -- ---------------------------- -- 6、用户和角色关联表 用户N-1角色 @@ -400,6 +412,16 @@ insert into `sys_role_menu` values (2, 1140); insert into `sys_role_menu` values (2, 1141); insert into `sys_role_menu` values (2, 1142); insert into `sys_role_menu` values (2, 1143); +insert into `sys_role_menu` values (2, 1150); +insert into `sys_role_menu` values (2, 1151); +insert into `sys_role_menu` values (2, 1152); +insert into `sys_role_menu` values (2, 1153); +insert into `sys_role_menu` values (2, 1154); +insert into `sys_role_menu` values (2, 1160); +insert into `sys_role_menu` values (2, 1161); +insert into `sys_role_menu` values (2, 1162); +insert into `sys_role_menu` values (2, 1163); +insert into `sys_role_menu` values (2, 1164); -- ---------------------------- -- 8、角色和部门关联表 角色1-N部门