From ea9f78d25d2a15ae8eafaa7724fe99c6e3b772ea Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期一, 25 三月 2024 09:42:00 +0800 Subject: [PATCH] 取消角色切换 --- /dev/null | 47 ----------------------- ycl-server/src/main/java/com/ycl/system/controller/SysRoleController.java | 15 ------- ycl-server/src/main/java/com/ycl/system/service/impl/SysRoleServiceImpl.java | 5 -- ycl-server/src/main/resources/mapper/system/SysUserRoleMapper.xml | 3 - ycl-server/src/main/java/com/ycl/system/service/ISysRoleService.java | 1 5 files changed, 0 insertions(+), 71 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/system/controller/SysRoleController.java b/ycl-server/src/main/java/com/ycl/system/controller/SysRoleController.java index 21f5fc4..396053c 100644 --- a/ycl-server/src/main/java/com/ycl/system/controller/SysRoleController.java +++ b/ycl-server/src/main/java/com/ycl/system/controller/SysRoleController.java @@ -229,20 +229,5 @@ ajax.put("depts", deptService.selectDeptTreeList(new SysDept())); return ajax; } - //TODO - @GetMapping("/exchange/{roleId}") - public AjaxResult exchange(@PathVariable Integer roleId) { - roleService.exchange(roleId); - // 鏇存柊缂撳瓨鐢ㄦ埛鏉冮檺 - LoginUser loginUser = getLoginUser(); - SysUser user = loginUser.getUser(); - List<SysRole> roles = user.getRoles(); - SysRole sysRole = roles.get(0); - sysRole.setRoleId(Long.parseLong(roleId+"")); - user.setRoles(Arrays.asList(sysRole)); - loginUser.setUser(user); - tokenService.setLoginUser(loginUser); - return success(); - } } diff --git a/ycl-server/src/main/java/com/ycl/system/service/ISysRoleService.java b/ycl-server/src/main/java/com/ycl/system/service/ISysRoleService.java index 9b19ff0..8d78c9e 100644 --- a/ycl-server/src/main/java/com/ycl/system/service/ISysRoleService.java +++ b/ycl-server/src/main/java/com/ycl/system/service/ISysRoleService.java @@ -172,5 +172,4 @@ */ public int insertAuthUsers(Long roleId, Long[] userIds); - void exchange(Integer roleId); } diff --git a/ycl-server/src/main/java/com/ycl/system/service/impl/SysRoleServiceImpl.java b/ycl-server/src/main/java/com/ycl/system/service/impl/SysRoleServiceImpl.java index 0debc2e..ef347a7 100644 --- a/ycl-server/src/main/java/com/ycl/system/service/impl/SysRoleServiceImpl.java +++ b/ycl-server/src/main/java/com/ycl/system/service/impl/SysRoleServiceImpl.java @@ -419,9 +419,4 @@ return userRoleMapper.batchUserRole(list); } - @Override - public void exchange(Integer roleId) { - Long userId = SecurityUtils.getLoginUser().getUserId(); - userRoleMapper.exchange(roleId,userId); - } } diff --git a/ycl-server/src/main/resources/mapper/system/SysUserRoleMapper.xml b/ycl-server/src/main/resources/mapper/system/SysUserRoleMapper.xml index 57c4ac0..7a5c65a 100644 --- a/ycl-server/src/main/resources/mapper/system/SysUserRoleMapper.xml +++ b/ycl-server/src/main/resources/mapper/system/SysUserRoleMapper.xml @@ -41,7 +41,4 @@ #{userId} </foreach> </delete> - <update id="exchange"> - update sys_user_role set role_id = #{roleId} where user_id = #{userId} - </update> </mapper> \ No newline at end of file diff --git a/ycl-server/src/test/java/com/ycl/activiti/Activiti7Test.java b/ycl-server/src/test/java/com/ycl/activiti/Activiti7Test.java deleted file mode 100644 index 2b090d8..0000000 --- a/ycl-server/src/test/java/com/ycl/activiti/Activiti7Test.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.ycl.activiti; - -import org.activiti.engine.ProcessEngine; -import org.activiti.engine.ProcessEngines; -import org.activiti.engine.RepositoryService; -import org.activiti.engine.RuntimeService; -import org.activiti.engine.repository.Deployment; -import org.activiti.engine.runtime.ProcessInstance; -import org.junit.jupiter.api.Test; - -import java.util.HashMap; -import java.util.Map; - -public class Activiti7Test { - //閮ㄧ讲娴佺▼ - @Test - public void test1(){ - //閫氳繃getDefaut鏂规硶鑾峰彇娴佺▼寮曟搸瀵硅薄浼氬姞杞絩esources鐩綍涓嬬殑activit.cfg.xml - ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine(); - //瀹屾垚娴佺▼閮ㄧ讲鎿嶄綔閫氳繃repositoryService瀵硅薄瀹屾垚 - RepositoryService repositoryService = processEngine.getRepositoryService(); - //瀹屾垚閮ㄧ讲 - Deployment deploy = repositoryService.createDeployment() - .addClasspathResource("flow/test.bpmn20.xml") - .name("娴嬭瘯娴佺▼") - .deploy(); - System.out.println(deploy.getId()); - System.out.println(deploy.getName()); - - } - //鍙戣捣娴佺▼ - @Test - public void test2(){ - ProcessEngine engine = ProcessEngines.getDefaultProcessEngine(); - //鍙戣捣娴佺▼锛岄渶瑕侀�氳繃runtimeService瀹炵幇 - RuntimeService runtimeService = engine.getRuntimeService(); - //璧嬪�� - Map<String,Object> map = new HashMap<>(); - map.put("assign1","zhangsan"); - map.put("assign2","lisi"); - //瀵瑰簲act_re_procdef琛� - ProcessInstance processInstance = runtimeService.startProcessInstanceById("test123:1:2503",map); - System.out.println("processInstance.getId() ="+processInstance.getId()); - System.out.println("processInstance.getDeploymentId() ="+processInstance.getDeploymentId()); - System.out.println("processInstance.getDescription() ="+processInstance.getDescription()); - } -} -- Gitblit v1.8.0