From 517bc5f9926d1886ab5361b0450d9505346be161 Mon Sep 17 00:00:00 2001 From: smallchill Date: Wed, 1 May 2019 13:38:35 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E6=B5=81=E4=B8=8E=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flowable/core/utils/TaskUtil.java | 8 ++- .../service/impl/FlowBusinessServiceImpl.java | 25 +++++-- .../controller/FlowFollowController.java | 65 +++++++++++++++++++ .../flowable/engine/entity/FlowExecution.java | 50 ++++++++++++++ .../flowable/engine/service/FlowService.java | 20 ++++++ .../engine/service/impl/FlowServiceImpl.java | 52 +++++++++++++-- .../system/user/cache/UserCache.java | 14 ++++ doc/sql/bladex-sword-mysql.sql | 17 ++--- doc/sql/bladex-update-RC9.sql | 6 +- 9 files changed, 231 insertions(+), 26 deletions(-) create mode 100644 blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/controller/FlowFollowController.java create mode 100644 blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/entity/FlowExecution.java diff --git a/blade-ops-api/blade-flow-api/src/main/java/org/springblade/flowable/core/utils/TaskUtil.java b/blade-ops-api/blade-flow-api/src/main/java/org/springblade/flowable/core/utils/TaskUtil.java index 4565840d..df41e665 100644 --- a/blade-ops-api/blade-flow-api/src/main/java/org/springblade/flowable/core/utils/TaskUtil.java +++ b/blade-ops-api/blade-flow-api/src/main/java/org/springblade/flowable/core/utils/TaskUtil.java @@ -20,6 +20,8 @@ import org.springblade.core.secure.utils.SecureUtil; import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.StringUtil; +import static org.springblade.core.launch.constant.FlowConstant.TASK_USR_PREFIX; + /** * 工作流任务工具类 * @@ -33,7 +35,7 @@ public class TaskUtil { * @return taskUser */ public static String getTaskUser() { - return StringUtil.format("taskUser_{}", SecureUtil.getUserId()); + return StringUtil.format("{}{}", TASK_USR_PREFIX, SecureUtil.getUserId()); } /** @@ -43,7 +45,7 @@ public class TaskUtil { * @return taskUser */ public static String getTaskUser(String userId) { - return StringUtil.format("taskUser_{}", userId); + return StringUtil.format("{}{}", TASK_USR_PREFIX, userId); } @@ -54,7 +56,7 @@ public class TaskUtil { * @return userId */ public static Integer getUserId(String taskUser) { - return Func.toInt(StringUtil.removePrefix(taskUser, "taskUser_")); + return Func.toInt(StringUtil.removePrefix(taskUser, TASK_USR_PREFIX)); } /** diff --git a/blade-ops/blade-flow/src/main/java/org/springblade/flowable/business/service/impl/FlowBusinessServiceImpl.java b/blade-ops/blade-flow/src/main/java/org/springblade/flowable/business/service/impl/FlowBusinessServiceImpl.java index e1ab7f75..13059ec8 100644 --- a/blade-ops/blade-flow/src/main/java/org/springblade/flowable/business/service/impl/FlowBusinessServiceImpl.java +++ b/blade-ops/blade-flow/src/main/java/org/springblade/flowable/business/service/impl/FlowBusinessServiceImpl.java @@ -57,14 +57,14 @@ public class FlowBusinessServiceImpl implements FlowBusinessService { @Override public IPage selectClaimPage(IPage page, BladeFlow bladeFlow) { String taskUser = TaskUtil.getTaskUser(); - String taskRole = TaskUtil.getCandidateGroup(); + String taskGroup = TaskUtil.getCandidateGroup(); List flowList = new LinkedList<>(); // 等待签收的任务 TaskQuery claimUserQuery = taskService.createTaskQuery().taskCandidateUser(taskUser) .includeProcessVariables().active().orderByTaskCreateTime().desc(); // 等待签收的任务 - TaskQuery claimRoleQuery = taskService.createTaskQuery().taskCandidateGroup(taskRole) + TaskQuery claimRoleQuery = taskService.createTaskQuery().taskCandidateGroup(taskGroup) .includeProcessVariables().active().orderByTaskCreateTime().desc(); // 构建列表数据 @@ -111,8 +111,19 @@ public class FlowBusinessServiceImpl implements FlowBusinessService { List flowList = new LinkedList<>(); HistoricProcessInstanceQuery historyQuery = historyService.createHistoricProcessInstanceQuery().startedBy(taskUser).orderByProcessInstanceStartTime().desc(); + + if (bladeFlow.getCategory() != null) { + historyQuery.processDefinitionCategory(bladeFlow.getCategory()); + } + if (bladeFlow.getBeginDate() != null) { + historyQuery.startedAfter(bladeFlow.getBeginDate()); + } + if (bladeFlow.getEndDate() != null) { + historyQuery.startedBefore(bladeFlow.getEndDate()); + } + // 查询列表 - List historyList = historyQuery.listPage(Func.toInt(page.getCurrent() - 1), Func.toInt(page.getSize())); + List historyList = historyQuery.listPage(Func.toInt(page.getCurrent() - 1), Func.toInt(page.getSize() * page.getCurrent())); historyList.forEach(historicProcessInstance -> { BladeFlow flow = new BladeFlow(); @@ -168,6 +179,9 @@ public class FlowBusinessServiceImpl implements FlowBusinessService { HistoricTaskInstanceQuery doneQuery = historyService.createHistoricTaskInstanceQuery().taskAssignee(taskUser).finished() .includeProcessVariables().orderByHistoricTaskInstanceEndTime().desc(); + if (bladeFlow.getCategory() != null) { + doneQuery.processCategoryIn(Func.toStrList(bladeFlow.getCategory())); + } if (bladeFlow.getBeginDate() != null) { doneQuery.taskCompletedAfter(bladeFlow.getBeginDate()); } @@ -176,7 +190,7 @@ public class FlowBusinessServiceImpl implements FlowBusinessService { } // 查询列表 - List doneList = doneQuery.listPage(Func.toInt(page.getCurrent() - 1), Func.toInt(page.getSize())); + List doneList = doneQuery.listPage(Func.toInt(page.getCurrent() - 1), Func.toInt(page.getSize() * page.getCurrent())); doneList.forEach(historicTaskInstance -> { BladeFlow flow = new BladeFlow(); flow.setTaskId(historicTaskInstance.getId()); @@ -249,6 +263,9 @@ public class FlowBusinessServiceImpl implements FlowBusinessService { * @param status 状态 */ private void buildFlowTaskList(BladeFlow bladeFlow, List flowList, TaskQuery taskQuery, String status) { + if (bladeFlow.getCategory() != null) { + taskQuery.processCategoryIn(Func.toStrList(bladeFlow.getCategory())); + } if (bladeFlow.getBeginDate() != null) { taskQuery.taskCreatedAfter(bladeFlow.getBeginDate()); } diff --git a/blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/controller/FlowFollowController.java b/blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/controller/FlowFollowController.java new file mode 100644 index 00000000..4c305539 --- /dev/null +++ b/blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/controller/FlowFollowController.java @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package org.springblade.flowable.engine.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.annotation.PreAuth; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.constant.RoleConstant; +import org.springblade.flowable.engine.entity.FlowExecution; +import org.springblade.flowable.engine.service.FlowService; +import org.springframework.web.bind.annotation.*; + +/** + * 流程状态控制器 + * + * @author Chill + */ +@RestController +@RequestMapping("follow") +@AllArgsConstructor +@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR) +public class FlowFollowController { + + private FlowService flowService; + + /** + * 流程状态列表 + */ + @GetMapping("list") + @ApiOperation(value = "分页", notes = "传入notice", position = 1) + public R> list(Query query, @ApiParam(value = "流程实例id") String processInstanceId, @ApiParam(value = "流程key") String processDefinitionKey) { + IPage pages = flowService.selectFollowPage(Condition.getPage(query), processInstanceId, processDefinitionKey); + return R.data(pages); + } + + /** + * 删除流程实例 + */ + @PostMapping("delete-process-instance") + @ApiOperation(value = "删除", notes = "传入主键集合", position = 2) + public R deleteProcessInstance(@ApiParam(value = "流程实例id") @RequestParam String processInstanceId, @ApiParam(value = "删除原因") @RequestParam String deleteReason) { + boolean temp = flowService.deleteProcessInstance(processInstanceId, deleteReason); + return R.status(temp); + } + +} diff --git a/blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/entity/FlowExecution.java b/blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/entity/FlowExecution.java new file mode 100644 index 00000000..de04f34d --- /dev/null +++ b/blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/entity/FlowExecution.java @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package org.springblade.flowable.engine.entity; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 运行实体类 + * + * @author Chill + */ +@Data +public class FlowExecution implements Serializable { + + private static final long serialVersionUID = 1L; + + private String id; + private String name; + private String startUserId; + private String startUser; + private Date startTime; + private String taskDefinitionId; + private String taskDefinitionKey; + private String category; + private String categoryName; + private String processInstanceId; + private String processDefinitionId; + private String processDefinitionKey; + private String activityId; + private int suspensionState; + private String executionId; + +} diff --git a/blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/service/FlowService.java b/blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/service/FlowService.java index 327a3493..406430d1 100644 --- a/blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/service/FlowService.java +++ b/blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/service/FlowService.java @@ -19,6 +19,7 @@ package org.springblade.flowable.engine.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import org.springblade.flowable.core.entity.BladeFlow; +import org.springblade.flowable.engine.entity.FlowExecution; import org.springblade.flowable.engine.entity.FlowModel; import org.springblade.flowable.engine.entity.FlowProcess; import org.springframework.web.multipart.MultipartFile; @@ -51,6 +52,16 @@ public interface FlowService extends IService { */ IPage selectProcessPage(IPage page, String category); + /** + * 流程管理列表 + * + * @param page 分页工具 + * @param processInstanceId 流程实例id + * @param processDefinitionKey 流程key + * @return + */ + IPage selectFollowPage(IPage page, String processInstanceId, String processDefinitionKey); + /** * 获取流转历史列表 * @@ -105,4 +116,13 @@ public interface FlowService extends IService { * @return */ boolean deployModel(String modelId, String category); + + /** + * 删除流程实例 + * + * @param processInstanceId 流程实例id + * @param deleteReason 删除原因 + * @return + */ + boolean deleteProcessInstance(String processInstanceId, String deleteReason); } diff --git a/blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/service/impl/FlowServiceImpl.java b/blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/service/impl/FlowServiceImpl.java index 46910eec..c871c1d7 100644 --- a/blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/service/impl/FlowServiceImpl.java +++ b/blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/service/impl/FlowServiceImpl.java @@ -33,11 +33,13 @@ import org.flowable.engine.RuntimeService; import org.flowable.engine.TaskService; import org.flowable.engine.history.HistoricActivityInstance; import org.flowable.engine.history.HistoricProcessInstance; +import org.flowable.engine.impl.persistence.entity.ExecutionEntityImpl; import org.flowable.engine.impl.persistence.entity.ProcessDefinitionEntityImpl; import org.flowable.engine.repository.Deployment; import org.flowable.engine.repository.ProcessDefinition; import org.flowable.engine.repository.ProcessDefinitionQuery; import org.flowable.engine.runtime.ProcessInstance; +import org.flowable.engine.runtime.ProcessInstanceQuery; import org.flowable.engine.task.Comment; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.tool.utils.DateUtil; @@ -47,10 +49,12 @@ import org.springblade.core.tool.utils.StringUtil; import org.springblade.flowable.core.entity.BladeFlow; import org.springblade.flowable.core.utils.TaskUtil; import org.springblade.flowable.engine.constant.FlowConstant; +import org.springblade.flowable.engine.entity.FlowExecution; import org.springblade.flowable.engine.entity.FlowModel; import org.springblade.flowable.engine.entity.FlowProcess; import org.springblade.flowable.engine.mapper.FlowMapper; import org.springblade.flowable.engine.service.FlowService; +import org.springblade.flowable.engine.utils.FlowCache; import org.springblade.system.user.cache.UserCache; import org.springblade.system.user.entity.User; import org.springframework.stereotype.Service; @@ -90,20 +94,54 @@ public class FlowServiceImpl extends ServiceImpl implemen if (StringUtils.isNotEmpty(category)) { processDefinitionQuery.processDefinitionCategory(category); } - List processDefinitionList = processDefinitionQuery.listPage(Func.toInt(page.getCurrent() - 1), Func.toInt(page.getSize())); + List processDefinitionList = processDefinitionQuery.listPage(Func.toInt(page.getCurrent() - 1), Func.toInt(page.getSize() * page.getCurrent())); List flowProcessList = new ArrayList<>(); - for (ProcessDefinition processDefinition : processDefinitionList) { + processDefinitionList.forEach(processDefinition -> { String deploymentId = processDefinition.getDeploymentId(); Deployment deployment = repositoryService.createDeploymentQuery().deploymentId(deploymentId).singleResult(); FlowProcess flowProcess = new FlowProcess((ProcessDefinitionEntityImpl) processDefinition); flowProcess.setDeploymentTime(deployment.getDeploymentTime()); flowProcessList.add(flowProcess); - } + }); page.setTotal(processDefinitionQuery.count()); page.setRecords(flowProcessList); return page; } + @Override + public IPage selectFollowPage(IPage page, String processInstanceId, String processDefinitionKey) { + ProcessInstanceQuery processInstanceQuery = runtimeService.createProcessInstanceQuery(); + if (StringUtil.isNotBlank(processInstanceId)) { + processInstanceQuery.processInstanceId(processInstanceId); + } + if (StringUtil.isNotBlank(processDefinitionKey)) { + processInstanceQuery.processDefinitionKey(processDefinitionKey); + } + List flowList = new ArrayList<>(); + List procInsList = processInstanceQuery.listPage(Func.toInt(page.getCurrent() - 1), Func.toInt(page.getSize() * page.getCurrent())); + procInsList.forEach(processInstance -> { + ExecutionEntityImpl execution = (ExecutionEntityImpl) processInstance; + FlowExecution flowExecution = new FlowExecution(); + flowExecution.setId(execution.getId()); + flowExecution.setName(execution.getName()); + flowExecution.setStartUserId(execution.getStartUserId()); + flowExecution.setStartUser(UserCache.getUserByTaskUser(execution.getStartUserId()).getName()); + flowExecution.setStartTime(execution.getStartTime()); + flowExecution.setExecutionId(execution.getId()); + flowExecution.setProcessInstanceId(execution.getProcessInstanceId()); + flowExecution.setProcessDefinitionId(execution.getProcessDefinitionId()); + flowExecution.setProcessDefinitionKey(execution.getProcessDefinitionKey()); + flowExecution.setSuspensionState(execution.getSuspensionState()); + ProcessDefinition processDefinition = FlowCache.getProcessDefinition(execution.getProcessDefinitionId()); + flowExecution.setCategory(processDefinition.getCategory()); + flowExecution.setCategoryName(FlowCache.getCategoryName(processDefinition.getCategory())); + flowList.add(flowExecution); + }); + page.setTotal(processInstanceQuery.count()); + page.setRecords(flowList); + return page; + } + @Override public List historyFlowList(String processInstanceId, String startActivityId, String endActivityId) { List flowList = new LinkedList<>(); @@ -132,7 +170,7 @@ public class FlowServiceImpl extends ServiceImpl implemen flow.setHistoryActivityName(historicActivityInstance.getActivityName()); flow.setCreateTime(historicActivityInstance.getStartTime()); flow.setEndTime(historicActivityInstance.getEndTime()); - String durationTime = DateUtil.secondToTime(Func.toLong(historicActivityInstance.getDurationInMillis(),0L) / 1000); + String durationTime = DateUtil.secondToTime(Func.toLong(historicActivityInstance.getDurationInMillis(), 0L) / 1000); flow.setHistoryActivityDurationTime(durationTime); // 获取流程发起人名称 if (FlowConstant.START_EVENT.equals(historicActivityInstance.getActivityType())) { @@ -252,6 +290,12 @@ public class FlowServiceImpl extends ServiceImpl implemen return deploy(deployment, category); } + @Override + public boolean deleteProcessInstance(String processInstanceId, String deleteReason) { + runtimeService.deleteProcessInstance(processInstanceId, deleteReason); + return true; + } + private boolean deploy(Deployment deployment, String category) { log.debug("流程部署--------deploy: " + deployment + " 分类---------->" + category); List list = repositoryService.createProcessDefinitionQuery().deploymentId(deployment.getId()).list(); diff --git a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/cache/UserCache.java b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/cache/UserCache.java index f945af24..8cf2f00a 100644 --- a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/cache/UserCache.java +++ b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/cache/UserCache.java @@ -20,9 +20,12 @@ import org.springblade.core.cache.utils.CacheUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.SpringUtil; +import org.springblade.core.tool.utils.StringUtil; import org.springblade.system.user.entity.User; import org.springblade.system.user.feign.IUserClient; +import static org.springblade.core.launch.constant.FlowConstant.TASK_USR_PREFIX; + /** * 系统缓存 * @@ -39,6 +42,17 @@ public class UserCache { userClient = SpringUtil.getBean(IUserClient.class); } + /** + * 根据任务用户id获取用户信息 + * + * @param taskUserId 任务用户id + * @return + */ + public static User getUserByTaskUser(String taskUserId) { + int userId = Func.toInt(StringUtil.removePrefix(taskUserId, TASK_USR_PREFIX)); + return getUser(userId); + } + /** * 获取用户名 * diff --git a/doc/sql/bladex-sword-mysql.sql b/doc/sql/bladex-sword-mysql.sql index 776f8710..ee021e97 100644 --- a/doc/sql/bladex-sword-mysql.sql +++ b/doc/sql/bladex-sword-mysql.sql @@ -11,7 +11,7 @@ Target Server Version : 50723 File Encoding : 65001 - Date: 29/04/2019 15:18:04 + Date: 01/05/2019 13:34:42 */ SET NAMES utf8mb4; @@ -222,7 +222,7 @@ CREATE TABLE `blade_menu` ( -- Records of blade_menu -- ---------------------------- BEGIN; -INSERT INTO `blade_menu` VALUES (1, 0, 'desk', '工作台', 'menu', '/desk', 'desktop', 1, 1, 0, 1, NULL, 0), (2, 1, 'notice', '通知公告', 'menu', '/desk/notice', NULL, 1, 1, 0, 1, NULL, 0), (3, 0, 'system', '系统管理', 'menu', '/system', 'setting', 99, 1, 0, 1, NULL, 0), (4, 3, 'user', '用户管理', 'menu', '/system/user', NULL, 1, 1, 0, 1, NULL, 0), (5, 3, 'dept', '部门管理', 'menu', '/system/dept', NULL, 2, 1, 0, 1, NULL, 0), (6, 3, 'dict', '字典管理', 'menu', '/system/dict', NULL, 3, 1, 0, 1, NULL, 0), (7, 3, 'menu', '菜单管理', 'menu', '/system/menu', NULL, 4, 1, 0, 1, NULL, 0), (8, 3, 'role', '角色管理', 'menu', '/system/role', NULL, 5, 1, 0, 1, NULL, 0), (9, 3, 'param', '参数管理', 'menu', '/system/param', NULL, 6, 1, 0, 1, NULL, 0), (10, 0, 'monitor', '系统监控', 'menu', '/monitor', 'fund', 3, 1, 0, 1, NULL, 0), (11, 10, 'doc', '接口文档', 'menu', 'http://localhost/doc.html', NULL, 1, 1, 0, 2, NULL, 0), (12, 10, 'admin', '服务治理', 'menu', 'http://localhost:7002', NULL, 2, 1, 0, 2, NULL, 0), (13, 10, 'log', '日志管理', 'menu', '/monitor/log', NULL, 3, 1, 0, 1, NULL, 0), (14, 13, 'log_usual', '通用日志', 'menu', '/monitor/log/usual', NULL, 1, 1, 0, 1, NULL, 0), (15, 13, 'log_api', '接口日志', 'menu', '/monitor/log/api', NULL, 2, 1, 0, 1, NULL, 0), (16, 13, 'log_error', '错误日志', 'menu', '/monitor/log/error', NULL, 3, 1, 0, 1, NULL, 0), (17, 0, 'tool', '研发工具', 'menu', '/tool', 'tool', 4, 1, 0, 1, NULL, 0), (18, 17, 'code', '代码生成', 'menu', '/tool/code', NULL, 1, 1, 0, 1, NULL, 0), (19, 2, 'notice_add', '新增', 'add', '/desk/notice/add', 'plus', 1, 2, 1, 1, NULL, 0), (20, 2, 'notice_edit', '修改', 'edit', '/desk/notice/edit', 'form', 2, 2, 2, 1, NULL, 0), (21, 2, 'notice_delete', '删除', 'delete', '/api/blade-desk/notice/remove', 'delete', 3, 2, 3, 1, NULL, 0), (22, 2, 'notice_view', '查看', 'view', '/desk/notice/view', 'file-text', 4, 2, 2, 1, NULL, 0), (23, 4, 'user_add', '新增', 'add', '/system/user/add', 'plus', 1, 2, 1, 1, NULL, 0), (24, 4, 'user_edit', '修改', 'edit', '/system/user/edit', 'form', 2, 2, 2, 1, NULL, 0), (25, 4, 'user_delete', '删除', 'delete', '/api/blade-user/remove', 'delete', 3, 2, 3, 1, NULL, 0), (26, 4, 'user_role', '角色配置', 'role', NULL, 'user-add', 4, 2, 1, 1, NULL, 0), (27, 4, 'user_reset', '密码重置', 'reset-password', '/api/blade-user/reset-password', 'retweet', 5, 2, 1, 1, NULL, 0), (28, 4, 'user_view', '查看', 'view', '/system/user/view', 'file-text', 6, 2, 2, 1, NULL, 0), (29, 5, 'dept_add', '新增', 'add', '/system/dept/add', 'plus', 1, 2, 1, 1, NULL, 0), (30, 5, 'dept_edit', '修改', 'edit', '/system/dept/edit', 'form', 2, 2, 2, 1, NULL, 0), (31, 5, 'dept_delete', '删除', 'delete', '/api/blade-system/dept/remove', 'delete', 3, 2, 3, 1, NULL, 0), (32, 5, 'dept_view', '查看', 'view', '/system/dept/view', 'file-text', 4, 2, 2, 1, NULL, 0), (33, 6, 'dict_add', '新增', 'add', '/system/dict/add', 'plus', 1, 2, 1, 1, NULL, 0), (34, 6, 'dict_edit', '修改', 'edit', '/system/dict/edit', 'form', 2, 2, 2, 1, NULL, 0), (35, 6, 'dict_delete', '删除', 'delete', '/api/blade-system/dict/remove', 'delete', 3, 2, 3, 1, NULL, 0), (36, 6, 'dict_view', '查看', 'view', '/system/dict/view', 'file-text', 4, 2, 2, 1, NULL, 0), (37, 7, 'menu_add', '新增', 'add', '/system/menu/add', 'plus', 1, 2, 1, 1, NULL, 0), (38, 7, 'menu_edit', '修改', 'edit', '/system/menu/edit', 'form', 2, 2, 2, 1, NULL, 0), (39, 7, 'menu_delete', '删除', 'delete', '/api/blade-system/menu/remove', 'delete', 3, 2, 3, 1, NULL, 0), (40, 7, 'menu_view', '查看', 'view', '/system/menu/view', 'file-text', 4, 2, 2, 1, NULL, 0), (41, 8, 'role_add', '新增', 'add', '/system/role/add', 'plus', 1, 2, 1, 1, NULL, 0), (42, 8, 'role_edit', '修改', 'edit', '/system/role/edit', 'form', 2, 2, 2, 1, NULL, 0), (43, 8, 'role_delete', '删除', 'delete', '/api/blade-system/role/remove', 'delete', 3, 2, 3, 1, NULL, 0), (44, 8, 'role_view', '查看', 'view', '/system/role/view', 'file-text', 4, 2, 2, 1, NULL, 0), (45, 9, 'param_add', '新增', 'add', '/system/param/add', 'plus', 1, 2, 1, 1, NULL, 0), (46, 9, 'param_edit', '修改', 'edit', '/system/param/edit', 'form', 2, 2, 2, 1, NULL, 0), (47, 9, 'param_delete', '删除', 'delete', '/api/blade-system/param/remove', 'delete', 3, 2, 3, 1, NULL, 0), (48, 9, 'param_view', '查看', 'view', '/system/param/view', 'file-text', 4, 2, 2, 1, NULL, 0), (49, 14, 'log_usual_view', '查看', 'view', '/monitor/log/usual/view', 'file-text', 4, 2, 2, 1, NULL, 0), (50, 15, 'log_api_view', '查看', 'view', '/monitor/log/api/view', 'file-text', 4, 2, 2, 1, NULL, 0), (51, 16, 'log_error_view', '查看', 'view', '/monitor/log/error/view', 'file-text', 4, 2, 2, 1, NULL, 0), (52, 18, 'code_add', '新增', 'add', '/tool/code/add', 'plus', 1, 2, 1, 1, NULL, 0), (53, 18, 'code_edit', '修改', 'edit', '/tool/code/edit', 'form', 2, 2, 2, 1, NULL, 0), (54, 18, 'code_delete', '删除', 'delete', '/api/blade-system/code/remove', 'delete', 3, 2, 3, 1, NULL, 0), (55, 18, 'code_view', '查看', 'view', '/tool/code/view', 'file-text', 4, 2, 2, 1, NULL, 0), (56, 3, 'tenant', '租户管理', 'menu', '/system/tenant', NULL, 7, 1, 0, 1, NULL, 0), (57, 56, 'tenant_add', '新增', 'add', '/system/tenant/add', 'plus', 1, 2, 1, 1, NULL, 0), (58, 56, 'tenant_edit', '修改', 'edit', '/system/tenant/edit', 'form', 2, 2, 2, 1, NULL, 0), (59, 56, 'tenant_delete', '删除', 'delete', '/api/blade-system/tenant/remove', 'delete', 3, 2, 3, 1, NULL, 0), (60, 56, 'tenant_view', '查看', 'view', '/system/tenant/view', 'file-text', 4, 2, 2, 1, NULL, 0), (61, 3, 'client', '应用管理', 'menu', '/system/client', NULL, 8, 1, 0, 1, NULL, 0), (62, 61, 'client_add', '新增', 'add', '/system/client/add', 'plus', 1, 2, 1, 1, NULL, 0), (63, 61, 'client_edit', '修改', 'edit', '/system/client/edit', 'form', 2, 2, 2, 2, NULL, 0), (64, 61, 'client_delete', '删除', 'delete', '/api/blade-system/client/remove', 'delete', 3, 2, 3, 3, NULL, 0), (65, 61, 'client_view', '查看', 'view', '/system/client/view', 'file-text', 4, 2, 2, 2, NULL, 0), (66, 0, 'flow', '流程管理', 'menu', '/flow', 'stock', 5, 1, 0, 1, NULL, 0), (67, 66, 'flow_model', '模型管理', 'menu', '/flow/model', NULL, 1, 1, 0, 1, NULL, 0), (68, 67, 'flow_model_create', '创建', 'create', '', 'plus', 1, 2, 1, 1, NULL, 0), (69, 67, 'flow_model_update', '编辑', 'update', '', 'form', 2, 2, 2, 1, NULL, 0), (70, 67, 'flow_model_deploy', '部署', 'deploy', '', 'cloud-upload', 3, 2, 2, 1, NULL, 0), (71, 67, 'flow_model_download', '下载', 'download', '', 'download', 4, 2, 2, 1, NULL, 0), (72, 67, 'flow_model_delete', '删除', 'delete', '/api/blade-flow/model/remove', 'delete', 5, 2, 3, 1, NULL, 0), (73, 66, 'flow_deploy', '流程部署', 'menu', '/flow/deploy', NULL, 2, 1, 0, 1, NULL, 0), (74, 66, 'flow_manager', '流程管理', 'menu', '/flow/manager', NULL, 3, 1, 0, 1, NULL, 0), (75, 74, 'flow_manager_state', '变更状态', 'state', '', 'plus', 1, 2, 2, 1, NULL, 0), (76, 74, 'flow_manager_image', '流程图', 'image', '', 'image', 2, 2, 2, 1, NULL, 0), (77, 74, 'flow_manager_remove', '删除', 'remove', '', 'delete', 3, 2, 3, 1, NULL, 0), (78, 66, 'flow_status', '流程状态', 'menu', '/flow/status', NULL, 4, 1, 0, 1, NULL, 0), (79, 78, 'flow_status_delete', '删除', 'delete', '', 'delete', 1, 2, 3, 1, NULL, 0), (80, 0, 'work', '我的事务', 'work', '/work', 'bell', 2, 1, 0, 1, NULL, 0), (81, 80, 'work_start', '发起事务', 'menu', '/work/start', NULL, 1, 1, 0, 1, NULL, 0), (82, 81, 'work_start_flow', '发起', 'flow', '', 'flow', 1, 2, 2, 1, NULL, 0), (83, 81, 'work_start_image', '流程图', 'image', '', 'image', 2, 2, 2, 1, NULL, 0), (84, 80, 'work_claim', '待签事务', 'menu', '/work/claim', NULL, 2, 1, 0, 1, NULL, 0), (85, 84, 'work_claim_sign', '签收', 'sign', '', 'sign', 1, 2, 2, 1, NULL, 0), (86, 84, 'work_claim_detail', '详情', 'detail', '', 'detail', 2, 2, 2, 1, NULL, 0), (87, 84, 'work_claim_follow', '跟踪', 'follow', '', 'follow', 3, 2, 2, 1, NULL, 0), (88, 80, 'work_todo', '待办事务', 'menu', '/work/todo', NULL, 2, 1, 0, 1, NULL, 0), (89, 88, 'work_todo_handle', '办理', 'handle', '', 'handle', 1, 2, 2, 1, NULL, 0), (90, 88, 'work_todo_detail', '详情', 'detail', '', 'detail', 2, 2, 2, 1, NULL, 0), (91, 88, 'work_todo_follow', '跟踪', 'follow', '', 'follow', 3, 2, 2, 1, NULL, 0), (92, 80, 'work_send', '已发事务', 'menu', '/work/send', NULL, 3, 1, 0, 1, NULL, 0), (93, 92, 'work_send_detail', '详情', 'detail', '', 'detail', 1, 2, 2, 1, NULL, 0), (94, 92, 'work_send_follow', '跟踪', 'follow', '', 'follow', 2, 2, 2, 1, NULL, 0), (95, 80, 'work_done', '办结事务', 'menu', '/work/done', NULL, 4, 1, 0, 1, NULL, 0), (96, 95, 'work_done_detail', '详情', 'detail', '', 'detail', 1, 2, 2, 1, NULL, 0), (97, 95, 'work_done_follow', '跟踪', 'follow', NULL, 'follow', 2, 2, 2, 1, NULL, 0); +INSERT INTO `blade_menu` VALUES (1, 0, 'desk', '工作台', 'menu', '/desk', 'desktop', 1, 1, 0, 1, NULL, 0), (2, 1, 'notice', '通知公告', 'menu', '/desk/notice', NULL, 1, 1, 0, 1, NULL, 0), (3, 0, 'system', '系统管理', 'menu', '/system', 'setting', 99, 1, 0, 1, NULL, 0), (4, 3, 'user', '用户管理', 'menu', '/system/user', NULL, 1, 1, 0, 1, NULL, 0), (5, 3, 'dept', '部门管理', 'menu', '/system/dept', NULL, 2, 1, 0, 1, NULL, 0), (6, 3, 'dict', '字典管理', 'menu', '/system/dict', NULL, 3, 1, 0, 1, NULL, 0), (7, 3, 'menu', '菜单管理', 'menu', '/system/menu', NULL, 4, 1, 0, 1, NULL, 0), (8, 3, 'role', '角色管理', 'menu', '/system/role', NULL, 5, 1, 0, 1, NULL, 0), (9, 3, 'param', '参数管理', 'menu', '/system/param', NULL, 6, 1, 0, 1, NULL, 0), (10, 0, 'monitor', '系统监控', 'menu', '/monitor', 'fund', 3, 1, 0, 1, NULL, 0), (11, 10, 'doc', '接口文档', 'menu', 'http://localhost/doc.html', NULL, 1, 1, 0, 2, NULL, 0), (12, 10, 'admin', '服务治理', 'menu', 'http://localhost:7002', NULL, 2, 1, 0, 2, NULL, 0), (13, 10, 'log', '日志管理', 'menu', '/monitor/log', NULL, 3, 1, 0, 1, NULL, 0), (14, 13, 'log_usual', '通用日志', 'menu', '/monitor/log/usual', NULL, 1, 1, 0, 1, NULL, 0), (15, 13, 'log_api', '接口日志', 'menu', '/monitor/log/api', NULL, 2, 1, 0, 1, NULL, 0), (16, 13, 'log_error', '错误日志', 'menu', '/monitor/log/error', NULL, 3, 1, 0, 1, NULL, 0), (17, 0, 'tool', '研发工具', 'menu', '/tool', 'tool', 4, 1, 0, 1, NULL, 0), (18, 17, 'code', '代码生成', 'menu', '/tool/code', NULL, 1, 1, 0, 1, NULL, 0), (19, 2, 'notice_add', '新增', 'add', '/desk/notice/add', 'plus', 1, 2, 1, 1, NULL, 0), (20, 2, 'notice_edit', '修改', 'edit', '/desk/notice/edit', 'form', 2, 2, 2, 1, NULL, 0), (21, 2, 'notice_delete', '删除', 'delete', '/api/blade-desk/notice/remove', 'delete', 3, 2, 3, 1, NULL, 0), (22, 2, 'notice_view', '查看', 'view', '/desk/notice/view', 'file-text', 4, 2, 2, 1, NULL, 0), (23, 4, 'user_add', '新增', 'add', '/system/user/add', 'plus', 1, 2, 1, 1, NULL, 0), (24, 4, 'user_edit', '修改', 'edit', '/system/user/edit', 'form', 2, 2, 2, 1, NULL, 0), (25, 4, 'user_delete', '删除', 'delete', '/api/blade-user/remove', 'delete', 3, 2, 3, 1, NULL, 0), (26, 4, 'user_role', '角色配置', 'role', NULL, 'user-add', 4, 2, 1, 1, NULL, 0), (27, 4, 'user_reset', '密码重置', 'reset-password', '/api/blade-user/reset-password', 'retweet', 5, 2, 1, 1, NULL, 0), (28, 4, 'user_view', '查看', 'view', '/system/user/view', 'file-text', 6, 2, 2, 1, NULL, 0), (29, 5, 'dept_add', '新增', 'add', '/system/dept/add', 'plus', 1, 2, 1, 1, NULL, 0), (30, 5, 'dept_edit', '修改', 'edit', '/system/dept/edit', 'form', 2, 2, 2, 1, NULL, 0), (31, 5, 'dept_delete', '删除', 'delete', '/api/blade-system/dept/remove', 'delete', 3, 2, 3, 1, NULL, 0), (32, 5, 'dept_view', '查看', 'view', '/system/dept/view', 'file-text', 4, 2, 2, 1, NULL, 0), (33, 6, 'dict_add', '新增', 'add', '/system/dict/add', 'plus', 1, 2, 1, 1, NULL, 0), (34, 6, 'dict_edit', '修改', 'edit', '/system/dict/edit', 'form', 2, 2, 2, 1, NULL, 0), (35, 6, 'dict_delete', '删除', 'delete', '/api/blade-system/dict/remove', 'delete', 3, 2, 3, 1, NULL, 0), (36, 6, 'dict_view', '查看', 'view', '/system/dict/view', 'file-text', 4, 2, 2, 1, NULL, 0), (37, 7, 'menu_add', '新增', 'add', '/system/menu/add', 'plus', 1, 2, 1, 1, NULL, 0), (38, 7, 'menu_edit', '修改', 'edit', '/system/menu/edit', 'form', 2, 2, 2, 1, NULL, 0), (39, 7, 'menu_delete', '删除', 'delete', '/api/blade-system/menu/remove', 'delete', 3, 2, 3, 1, NULL, 0), (40, 7, 'menu_view', '查看', 'view', '/system/menu/view', 'file-text', 4, 2, 2, 1, NULL, 0), (41, 8, 'role_add', '新增', 'add', '/system/role/add', 'plus', 1, 2, 1, 1, NULL, 0), (42, 8, 'role_edit', '修改', 'edit', '/system/role/edit', 'form', 2, 2, 2, 1, NULL, 0), (43, 8, 'role_delete', '删除', 'delete', '/api/blade-system/role/remove', 'delete', 3, 2, 3, 1, NULL, 0), (44, 8, 'role_view', '查看', 'view', '/system/role/view', 'file-text', 4, 2, 2, 1, NULL, 0), (45, 9, 'param_add', '新增', 'add', '/system/param/add', 'plus', 1, 2, 1, 1, NULL, 0), (46, 9, 'param_edit', '修改', 'edit', '/system/param/edit', 'form', 2, 2, 2, 1, NULL, 0), (47, 9, 'param_delete', '删除', 'delete', '/api/blade-system/param/remove', 'delete', 3, 2, 3, 1, NULL, 0), (48, 9, 'param_view', '查看', 'view', '/system/param/view', 'file-text', 4, 2, 2, 1, NULL, 0), (49, 14, 'log_usual_view', '查看', 'view', '/monitor/log/usual/view', 'file-text', 4, 2, 2, 1, NULL, 0), (50, 15, 'log_api_view', '查看', 'view', '/monitor/log/api/view', 'file-text', 4, 2, 2, 1, NULL, 0), (51, 16, 'log_error_view', '查看', 'view', '/monitor/log/error/view', 'file-text', 4, 2, 2, 1, NULL, 0), (52, 18, 'code_add', '新增', 'add', '/tool/code/add', 'plus', 1, 2, 1, 1, NULL, 0), (53, 18, 'code_edit', '修改', 'edit', '/tool/code/edit', 'form', 2, 2, 2, 1, NULL, 0), (54, 18, 'code_delete', '删除', 'delete', '/api/blade-system/code/remove', 'delete', 3, 2, 3, 1, NULL, 0), (55, 18, 'code_view', '查看', 'view', '/tool/code/view', 'file-text', 4, 2, 2, 1, NULL, 0), (56, 3, 'tenant', '租户管理', 'menu', '/system/tenant', NULL, 7, 1, 0, 1, NULL, 0), (57, 56, 'tenant_add', '新增', 'add', '/system/tenant/add', 'plus', 1, 2, 1, 1, NULL, 0), (58, 56, 'tenant_edit', '修改', 'edit', '/system/tenant/edit', 'form', 2, 2, 2, 1, NULL, 0), (59, 56, 'tenant_delete', '删除', 'delete', '/api/blade-system/tenant/remove', 'delete', 3, 2, 3, 1, NULL, 0), (60, 56, 'tenant_view', '查看', 'view', '/system/tenant/view', 'file-text', 4, 2, 2, 1, NULL, 0), (61, 3, 'client', '应用管理', 'menu', '/system/client', NULL, 8, 1, 0, 1, NULL, 0), (62, 61, 'client_add', '新增', 'add', '/system/client/add', 'plus', 1, 2, 1, 1, NULL, 0), (63, 61, 'client_edit', '修改', 'edit', '/system/client/edit', 'form', 2, 2, 2, 2, NULL, 0), (64, 61, 'client_delete', '删除', 'delete', '/api/blade-system/client/remove', 'delete', 3, 2, 3, 3, NULL, 0), (65, 61, 'client_view', '查看', 'view', '/system/client/view', 'file-text', 4, 2, 2, 2, NULL, 0), (66, 0, 'flow', '流程管理', 'menu', '/flow', 'stock', 5, 1, 0, 1, NULL, 0), (67, 66, 'flow_model', '模型管理', 'menu', '/flow/model', NULL, 1, 1, 0, 1, NULL, 0), (68, 67, 'flow_model_create', '创建', 'create', '', 'plus', 1, 2, 1, 1, NULL, 0), (69, 67, 'flow_model_update', '编辑', 'update', '', 'form', 2, 2, 2, 1, NULL, 0), (70, 67, 'flow_model_deploy', '部署', 'deploy', '', 'cloud-upload', 3, 2, 2, 1, NULL, 0), (71, 67, 'flow_model_download', '下载', 'download', '', 'download', 4, 2, 2, 1, NULL, 0), (72, 67, 'flow_model_delete', '删除', 'delete', '/api/blade-flow/model/remove', 'delete', 5, 2, 3, 1, NULL, 0), (73, 66, 'flow_deploy', '流程部署', 'menu', '/flow/deploy', NULL, 2, 1, 0, 1, NULL, 0), (74, 66, 'flow_manager', '流程管理', 'menu', '/flow/manager', NULL, 3, 1, 0, 1, NULL, 0), (75, 74, 'flow_manager_state', '变更状态', 'state', '', 'plus', 1, 2, 2, 1, NULL, 0), (76, 74, 'flow_manager_image', '流程图', 'image', '', 'image', 2, 2, 2, 1, NULL, 0), (77, 74, 'flow_manager_remove', '删除', 'remove', '', 'delete', 3, 2, 3, 1, NULL, 0), (78, 66, 'flow_follow', '流程跟踪', 'menu', '/flow/follow', NULL, 4, 1, 0, 1, NULL, 0), (79, 78, 'flow_follow_delete', '删除', 'remove', '', 'remove', 1, 2, 2, 1, NULL, 0), (80, 0, 'work', '我的事务', 'work', '/work', 'bell', 2, 1, 0, 1, NULL, 0), (81, 80, 'work_start', '发起事务', 'menu', '/work/start', NULL, 1, 1, 0, 1, NULL, 0), (82, 81, 'work_start_flow', '发起', 'flow', '', 'flow', 1, 2, 2, 1, NULL, 0), (83, 81, 'work_start_image', '流程图', 'image', '', 'image', 2, 2, 2, 1, NULL, 0), (84, 80, 'work_claim', '待签事务', 'menu', '/work/claim', NULL, 2, 1, 0, 1, NULL, 0), (85, 84, 'work_claim_sign', '签收', 'sign', '', 'sign', 1, 2, 2, 1, NULL, 0), (86, 84, 'work_claim_detail', '详情', 'detail', '', 'detail', 2, 2, 2, 1, NULL, 0), (87, 84, 'work_claim_follow', '跟踪', 'follow', '', 'follow', 3, 2, 2, 1, NULL, 0), (88, 80, 'work_todo', '待办事务', 'menu', '/work/todo', NULL, 2, 1, 0, 1, NULL, 0), (89, 88, 'work_todo_handle', '办理', 'handle', '', 'handle', 1, 2, 2, 1, NULL, 0), (90, 88, 'work_todo_detail', '详情', 'detail', '', 'detail', 2, 2, 2, 1, NULL, 0), (91, 88, 'work_todo_follow', '跟踪', 'follow', '', 'follow', 3, 2, 2, 1, NULL, 0), (92, 80, 'work_send', '已发事务', 'menu', '/work/send', NULL, 3, 1, 0, 1, NULL, 0), (93, 92, 'work_send_detail', '详情', 'detail', '', 'detail', 1, 2, 2, 1, NULL, 0), (94, 92, 'work_send_follow', '跟踪', 'follow', '', 'follow', 2, 2, 2, 1, NULL, 0), (95, 80, 'work_done', '办结事务', 'menu', '/work/done', NULL, 4, 1, 0, 1, NULL, 0), (96, 95, 'work_done_detail', '详情', 'detail', '', 'detail', 1, 2, 2, 1, NULL, 0), (97, 95, 'work_done_follow', '跟踪', 'follow', '', 'follow', 2, 2, 2, 1, NULL, 0); COMMIT; -- ---------------------------- @@ -298,14 +298,7 @@ CREATE TABLE `blade_process_leave` ( `status` int(2) NULL DEFAULT NULL COMMENT '状态', `is_deleted` int(2) NULL DEFAULT NULL COMMENT '是否已删除', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci; - --- ---------------------------- --- Records of blade_process_leave --- ---------------------------- -BEGIN; -INSERT INTO `blade_process_leave` VALUES (1, 'Leave:8:740403ae-6a3d-11e9-b420-260de95419df', '81c7b9ff-6a3d-11e9-b420-260de95419df', '2019-04-30 00:00:00', '2019-05-10 00:00:00', 'sadfasfsadfasdf', 'hr', '2019-04-29 13:13:21', 1, '2019-04-29 13:13:21', 1, '2019-04-29 13:13:22', 1, 0), (2, 'Leave:8:740403ae-6a3d-11e9-b420-260de95419df', '63b59405-6a46-11e9-863c-260de95419df', '2019-05-01 00:00:00', '2019-05-04 00:00:00', 'asdfasdfasdf', 'hr', '2019-04-29 14:16:56', 1, '2019-04-29 14:16:56', 1, '2019-04-29 14:16:57', 1, 0), (3, 'Leave:8:740403ae-6a3d-11e9-b420-260de95419df', '1faffbf1-6a47-11e9-926d-260de95419df', '2019-04-30 00:00:00', '2019-05-04 00:00:00', '是大法师地方撒的', 'hr', '2019-04-29 14:22:11', 1, '2019-04-29 14:22:11', 1, '2019-04-29 14:22:12', 1, 0); -COMMIT; +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci; -- ---------------------------- -- Table structure for blade_role @@ -338,13 +331,13 @@ CREATE TABLE `blade_role_menu` ( `menu_id` int(11) NULL DEFAULT NULL COMMENT '菜单id', `role_id` int(11) NULL DEFAULT NULL COMMENT '角色id', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 291 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci; +) ENGINE = InnoDB AUTO_INCREMENT = 259 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci; -- ---------------------------- -- Records of blade_role_menu -- ---------------------------- BEGIN; -INSERT INTO `blade_role_menu` VALUES (66, 66, NULL), (67, 67, NULL), (68, 68, NULL), (69, 69, NULL), (70, 70, NULL), (71, 71, NULL), (72, 72, NULL), (73, 73, NULL), (74, 74, NULL), (75, 75, NULL), (76, 76, NULL), (77, 77, NULL), (78, 78, NULL), (79, 79, NULL), (80, 80, NULL), (81, 81, NULL), (82, 82, NULL), (83, 83, NULL), (84, 84, NULL), (85, 85, NULL), (86, 86, NULL), (87, 87, NULL), (88, 88, NULL), (89, 89, NULL), (90, 90, NULL), (91, 91, NULL), (92, 92, NULL), (93, 93, NULL), (94, 94, NULL), (95, 95, NULL), (96, 96, NULL), (97, 97, NULL), (98, 1, 1), (99, 2, 1), (100, 3, 1), (101, 4, 1), (102, 5, 1), (103, 6, 1), (104, 7, 1), (105, 8, 1), (106, 9, 1), (107, 10, 1), (108, 11, 1), (109, 12, 1), (110, 13, 1), (111, 14, 1), (112, 15, 1), (113, 16, 1), (114, 17, 1), (115, 18, 1), (116, 19, 1), (117, 20, 1), (118, 21, 1), (119, 22, 1), (120, 23, 1), (121, 24, 1), (122, 25, 1), (123, 26, 1), (124, 27, 1), (125, 28, 1), (126, 29, 1), (127, 30, 1), (128, 31, 1), (129, 32, 1), (130, 33, 1), (131, 34, 1), (132, 35, 1), (133, 36, 1), (134, 37, 1), (135, 38, 1), (136, 39, 1), (137, 40, 1), (138, 41, 1), (139, 42, 1), (140, 43, 1), (141, 44, 1), (142, 45, 1), (143, 46, 1), (144, 47, 1), (145, 48, 1), (146, 49, 1), (147, 50, 1), (148, 51, 1), (149, 52, 1), (150, 53, 1), (151, 54, 1), (152, 55, 1), (153, 56, 1), (154, 57, 1), (155, 58, 1), (156, 59, 1), (157, 60, 1), (158, 61, 1), (159, 62, 1), (160, 63, 1), (161, 64, 1), (162, 65, 1), (163, 66, 1), (164, 67, 1), (165, 68, 1), (166, 69, 1), (167, 70, 1), (168, 71, 1), (169, 72, 1), (170, 73, 1), (171, 74, 1), (172, 75, 1), (173, 76, 1), (174, 77, 1), (175, 78, 1), (176, 79, 1), (177, 80, 1), (178, 81, 1), (179, 82, 1), (180, 83, 1), (181, 84, 1), (182, 85, 1), (183, 86, 1), (184, 87, 1), (185, 88, 1), (186, 89, 1), (187, 90, 1), (188, 91, 1), (189, 92, 1), (190, 93, 1), (191, 94, 1), (192, 95, 1), (193, 96, 1), (194, 97, 1), (195, 1, 2), (196, 2, 2), (197, 19, 2), (198, 20, 2), (199, 21, 2), (200, 22, 2), (201, 80, 2), (202, 81, 2), (203, 82, 2), (204, 83, 2), (205, 84, 2), (206, 85, 2), (207, 86, 2), (208, 87, 2), (209, 88, 2), (210, 89, 2), (211, 90, 2), (212, 91, 2), (213, 92, 2), (214, 93, 2), (215, 94, 2), (216, 95, 2), (217, 96, 2), (218, 97, 2), (219, 1, 3), (220, 2, 3), (221, 19, 3), (222, 20, 3), (223, 21, 3), (224, 22, 3), (225, 80, 3), (226, 81, 3), (227, 82, 3), (228, 83, 3), (229, 84, 3), (230, 85, 3), (231, 86, 3), (232, 87, 3), (233, 88, 3), (234, 89, 3), (235, 90, 3), (236, 91, 3), (237, 92, 3), (238, 93, 3), (239, 94, 3), (240, 95, 3), (241, 96, 3), (242, 97, 3), (243, 1, 4), (244, 2, 4), (245, 19, 4), (246, 20, 4), (247, 21, 4), (248, 22, 4), (249, 80, 4), (250, 81, 4), (251, 82, 4), (252, 83, 4), (253, 84, 4), (254, 85, 4), (255, 86, 4), (256, 87, 4), (257, 88, 4), (258, 89, 4), (259, 90, 4), (260, 91, 4), (261, 92, 4), (262, 93, 4), (263, 94, 4), (264, 95, 4), (265, 96, 4), (266, 97, 4), (267, 1, 5), (268, 2, 5), (269, 19, 5), (270, 20, 5), (271, 21, 5), (272, 22, 5), (273, 80, 5), (274, 81, 5), (275, 82, 5), (276, 83, 5), (277, 84, 5), (278, 85, 5), (279, 86, 5), (280, 87, 5), (281, 88, 5), (282, 89, 5), (283, 90, 5), (284, 91, 5), (285, 92, 5), (286, 93, 5), (287, 94, 5), (288, 95, 5), (289, 96, 5), (290, 97, 5); +INSERT INTO `blade_role_menu` VALUES (66, 1, 1), (67, 2, 1), (68, 3, 1), (69, 4, 1), (70, 5, 1), (71, 6, 1), (72, 7, 1), (73, 8, 1), (74, 9, 1), (75, 10, 1), (76, 11, 1), (77, 12, 1), (78, 13, 1), (79, 14, 1), (80, 15, 1), (81, 16, 1), (82, 17, 1), (83, 18, 1), (84, 19, 1), (85, 20, 1), (86, 21, 1), (87, 22, 1), (88, 23, 1), (89, 24, 1), (90, 25, 1), (91, 26, 1), (92, 27, 1), (93, 28, 1), (94, 29, 1), (95, 30, 1), (96, 31, 1), (97, 32, 1), (98, 33, 1), (99, 34, 1), (100, 35, 1), (101, 36, 1), (102, 37, 1), (103, 38, 1), (104, 39, 1), (105, 40, 1), (106, 41, 1), (107, 42, 1), (108, 43, 1), (109, 44, 1), (110, 45, 1), (111, 46, 1), (112, 47, 1), (113, 48, 1), (114, 49, 1), (115, 50, 1), (116, 51, 1), (117, 52, 1), (118, 53, 1), (119, 54, 1), (120, 55, 1), (121, 56, 1), (122, 57, 1), (123, 58, 1), (124, 59, 1), (125, 60, 1), (126, 61, 1), (127, 62, 1), (128, 63, 1), (129, 64, 1), (130, 65, 1), (131, 66, 1), (132, 67, 1), (133, 68, 1), (134, 69, 1), (135, 70, 1), (136, 71, 1), (137, 72, 1), (138, 73, 1), (139, 74, 1), (140, 75, 1), (141, 76, 1), (142, 77, 1), (143, 78, 1), (144, 79, 1), (145, 80, 1), (146, 81, 1), (147, 82, 1), (148, 83, 1), (149, 84, 1), (150, 85, 1), (151, 86, 1), (152, 87, 1), (153, 88, 1), (154, 89, 1), (155, 90, 1), (156, 91, 1), (157, 92, 1), (158, 93, 1), (159, 94, 1), (160, 95, 1), (161, 96, 1), (162, 97, 1), (163, 1, 2), (164, 2, 2), (165, 19, 2), (166, 20, 2), (167, 21, 2), (168, 22, 2), (169, 80, 2), (170, 81, 2), (171, 82, 2), (172, 83, 2), (173, 84, 2), (174, 85, 2), (175, 86, 2), (176, 87, 2), (177, 88, 2), (178, 89, 2), (179, 90, 2), (180, 91, 2), (181, 92, 2), (182, 93, 2), (183, 94, 2), (184, 95, 2), (185, 96, 2), (186, 97, 2), (187, 1, 3), (188, 2, 3), (189, 19, 3), (190, 20, 3), (191, 21, 3), (192, 22, 3), (193, 80, 3), (194, 81, 3), (195, 82, 3), (196, 83, 3), (197, 84, 3), (198, 85, 3), (199, 86, 3), (200, 87, 3), (201, 88, 3), (202, 89, 3), (203, 90, 3), (204, 91, 3), (205, 92, 3), (206, 93, 3), (207, 94, 3), (208, 95, 3), (209, 96, 3), (210, 97, 3), (211, 1, 4), (212, 2, 4), (213, 19, 4), (214, 20, 4), (215, 21, 4), (216, 22, 4), (217, 80, 4), (218, 81, 4), (219, 82, 4), (220, 83, 4), (221, 84, 4), (222, 85, 4), (223, 86, 4), (224, 87, 4), (225, 88, 4), (226, 89, 4), (227, 90, 4), (228, 91, 4), (229, 92, 4), (230, 93, 4), (231, 94, 4), (232, 95, 4), (233, 96, 4), (234, 97, 4), (235, 1, 5), (236, 2, 5), (237, 19, 5), (238, 20, 5), (239, 21, 5), (240, 22, 5), (241, 80, 5), (242, 81, 5), (243, 82, 5), (244, 83, 5), (245, 84, 5), (246, 85, 5), (247, 86, 5), (248, 87, 5), (249, 88, 5), (250, 89, 5), (251, 90, 5), (252, 91, 5), (253, 92, 5), (254, 93, 5), (255, 94, 5), (256, 95, 5), (257, 96, 5), (258, 97, 5); COMMIT; -- ---------------------------- diff --git a/doc/sql/bladex-update-RC9.sql b/doc/sql/bladex-update-RC9.sql index 8cd8fba1..6ae1af4d 100644 --- a/doc/sql/bladex-update-RC9.sql +++ b/doc/sql/bladex-update-RC9.sql @@ -33,10 +33,10 @@ INSERT INTO `blade_menu`(`parent_id`, `code`, `name`, `alias`, `path`, `source`, VALUES (@managerid, 'flow_manager_remove', '删除', 'remove', '', 'delete', 3, 2, 3, 1, NULL, 0); INSERT INTO `blade_menu`(`parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`) -VALUES (@flowid, 'flow_status', '流程状态', 'menu', '/flow/status', NULL, 4, 1, 0, 1, NULL, 0); +VALUES (@flowid, 'flow_follow', '流程跟踪', 'menu', '/flow/follow', NULL, 4, 1, 0, 1, NULL, 0); set @statueid = (SELECT LAST_INSERT_ID()); INSERT INTO `blade_menu`(`parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`) -VALUES (@statueid, 'flow_status_delete', '删除', 'delete', '', 'delete', 1, 2, 3, 1, NULL, 0); +VALUES (@statueid, 'flow_follow_delete', '删除', 'remove', '', 'remove', 1, 2, 2, 1, NULL, 0); INSERT INTO `blade_menu`(`parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`) VALUES (0, 'work', '我的事务', 'work', '/work', 'bell', 2, 1, 0, 1, NULL, 0); @@ -85,7 +85,7 @@ set @doneid = (SELECT LAST_INSERT_ID()); INSERT INTO `blade_menu`(`parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`) VALUES (@doneid, 'work_done_detail', '详情', 'detail', '', 'detail', 1, 2, 2, 1, NULL, 0); INSERT INTO `blade_menu`(`parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`) -VALUES (@sendid, 'work_done_follow', '跟踪', 'follow', '', 'follow', 2, 2, 2, 1, NULL, 0); +VALUES (@doneid, 'work_done_follow', '跟踪', 'follow', '', 'follow', 2, 2, 2, 1, NULL, 0); -- ---------------------------- -- 更新系统管理排序