重置指定人员的指定角色

airport-admin/src/main/java/com/sundot/airport/web/controller/system/SysUserController.java

@@ -17,6 +17,7 @@ import com.sundot.airport.attendance.domain.portrait.WorkHoursStats;
 import com.sundot.airport.check.domain.CheckLargeScreenCommonDto;
 import com.sundot.airport.check.domain.CheckLargeScreenCorrectionDto;
 import com.sundot.airport.check.domain.CheckLargeScreenCorrectionQueryParamDto;
+import com.sundot.airport.common.core.domain.ResetUserRoleDto;
 import com.sundot.airport.common.core.domain.SysLargeScreenWorkingPortraitDto;
 import com.sundot.airport.common.enums.RoleTypeEnum;
 import com.sundot.airport.exam.domain.DailyTask;
@@ -527,6 +528,16 @@ public class SysUserController extends BaseController {
     }
 
     /**
+     * 重置指定人员的指定角色
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @Log(title = "重置指定人员的指定角色", businessType = BusinessType.UPDATE)
+    @PostMapping("/resetUserRole")
+    public AjaxResult resetUserRole(@RequestBody ResetUserRoleDto resetUserRoleDto) {
+        return toAjax(userService.resetUserRole(resetUserRoleDto));
+    }
+
+    /**
      * 根据用户ID获取岗位选择框列表
      */
     @PreAuthorize("@ss.hasPermi('system:user:query')")

airport-common/src/main/java/com/sundot/airport/common/core/domain/ResetUserRoleDto.java

@@ -0,0 +1,29 @@
+package com.sundot.airport.common.core.domain;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 重置指定人员的指定角色Dto
+ *
+ * @author sundot
+ * @date 2020/12/01
+ */
+@Data
+public class ResetUserRoleDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户账号列表
+     */
+    private List<String> userNameList;
+
+    /**
+     * 角色key列表
+     */
+    private List<String> roleKeyList;
+
+}

airport-system/src/main/java/com/sundot/airport/system/service/ISysUserService.java

@@ -3,6 +3,7 @@ package com.sundot.airport.system.service;
 import java.util.List;
 
 import com.sundot.airport.common.core.domain.BaseLargeScreenQueryParamDto;
+import com.sundot.airport.common.core.domain.ResetUserRoleDto;
 import com.sundot.airport.common.core.domain.entity.SysUser;
 import com.sundot.airport.system.domain.SysLargeScreenCooperationDto;
 import com.sundot.airport.system.domain.SysLargeScreenCooperationQueryParamDto;
@@ -224,18 +225,25 @@ public interface ISysUserService {
     public int resetUserPost();
 
     /**
+     * 重置指定人员的指定角色
+     *
+     * @return 结果
+     */
+    public int resetUserRole(ResetUserRoleDto resetUserRoleDto);
+
+    /**
      * 根据角色标识查询用户列表
      *
      * @param roleKeyList 角色标识
      * @return 用户列表
      */
     public List<SysUser> selectUserListByRoleKey(List<String> roleKeyList);
-    
+
     /**
      * 根据角色标识和站点ID查询用户列表
      *
      * @param roleKeyList 角色标识
-     * @param stationId 站点ID
+     * @param stationId   站点ID
      * @return 用户列表
      */
     public List<SysUser> selectUserListByRoleKeyAndDeptId(List<String> roleKeyList, Long stationId);

airport-system/src/main/java/com/sundot/airport/system/service/impl/SysUserServiceImpl.java

@@ -18,6 +18,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
 import com.sundot.airport.common.core.domain.BaseLargeScreenQueryParamDto;
+import com.sundot.airport.common.core.domain.ResetUserRoleDto;
 import com.sundot.airport.common.core.domain.entity.SysDept;
 import com.sundot.airport.common.core.domain.entity.SysDictData;
 import com.sundot.airport.common.dto.UserInfo;
@@ -603,6 +604,36 @@ public class SysUserServiceImpl implements ISysUserService {
     }
 
     /**
+     * 重置指定人员的指定角色
+     *
+     * @return 结果
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public int resetUserRole(ResetUserRoleDto resetUserRoleDto) {
+        List<SysUserRole> list = new ArrayList<>();
+        List<SysRole> sysRoleList = roleMapper.selectRoleList(new SysRole());
+        List<Long> roleIdList = sysRoleList.stream().filter(sysRole -> resetUserRoleDto.getRoleKeyList().contains(sysRole.getRoleKey())).map(SysRole::getRoleId).distinct().collect(Collectors.toList());
+        resetUserRoleDto.getUserNameList().forEach(x -> {
+            SysUser sysUser = userMapper.selectUserByUserName(x);
+            if (sysUser == null) {
+                throw new ServiceException("根据【" + x + "】未查询到用户信息");
+            }
+            userRoleMapper.deleteUserRoleByUserId(sysUser.getUserId());
+            roleIdList.forEach(y -> {
+                SysUserRole sysUserRole = new SysUserRole();
+                sysUserRole.setUserId(sysUser.getUserId());
+                sysUserRole.setRoleId(y);
+                list.add(sysUserRole);
+            });
+        });
+        if (CollUtil.isNotEmpty(list)) {
+            userRoleMapper.batchUserRole(list);
+        }
+        return 1;
+    }
+
+    /**
      * 根据角色标识查询用户列表
      *
      * @param roleKeyList 角色标识