角色修改

distributed-print/src/main/java/com/qmth/distributed/print/api/SysRoleController.java

@@ -0,0 +1,114 @@
+package com.qmth.distributed.print.api;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.qmth.boot.api.constant.ApiConstant;
+import com.qmth.teachcloud.common.entity.SysRole;
+import com.qmth.teachcloud.common.service.SysRoleService;
+import com.qmth.teachcloud.common.util.Result;
+import com.qmth.teachcloud.common.util.ResultUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 角色表 前端控制器
+ * </p>
+ *
+ * @author xf
+ * @since 2021-03-23
+ */
+@Api(tags = "角色Controller")
+@RestController
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.sys}/role")
+public class SysRoleController {
+
+    @Autowired
+    private SysRoleService sysRoleService;
+
+    /**
+     * 查询
+     *
+     * @param name
+     * @param enable
+     * @param pageNumber
+     * @param pageSize
+     * @return
+     */
+    @ApiOperation(value = "查询")
+    @RequestMapping(value = "/list", method = RequestMethod.POST)
+    public Result list(@RequestParam(value = "name", required = false) String name,
+                       @RequestParam(value = "enable", required = false) Boolean enable,
+                       @RequestParam(value = "pageNumber", required = true) Integer pageNumber,
+                       @RequestParam(value = "pageSize", required = true) Integer pageSize) {
+        return ResultUtil.ok(sysRoleService.list(name, enable, pageNumber, pageSize));
+    }
+
+    /**
+     * 新增用户时查询角色方法
+     *
+     * @return
+     */
+    @ApiOperation(value = "新增用户时查询角色方法")
+    @RequestMapping(value = "/list_to_user", method = RequestMethod.POST)
+    public Result listToUser() {
+        return ResultUtil.ok(sysRoleService.listToUser());
+    }
+
+    /**
+     * 新增/修改
+     *
+     * @param role
+     * @return
+     */
+    @ApiOperation(value = "新增/修改")
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    public Result save(@Valid @RequestBody SysRole role, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
+        }
+        return ResultUtil.ok(sysRoleService.saveRoleNew(role));
+    }
+
+    /**
+     * 启用/禁用
+     *
+     * @param role
+     * @return
+     */
+    @ApiOperation(value = "启用/禁用")
+    @RequestMapping(value = "/enable", method = RequestMethod.POST)
+    public Result enable(@RequestBody SysRole role) {
+        return ResultUtil.ok(sysRoleService.enable(role));
+    }
+
+    /**
+     * 删除
+     *
+     * @param id
+     * @return
+     */
+    @ApiOperation(value = "删除")
+    @RequestMapping(value = "/remove", method = RequestMethod.POST)
+    public Result remove(Long id) {
+        return ResultUtil.ok(sysRoleService.remove(id));
+    }
+
+    /**
+     * 用户已绑定角色列表
+     *
+     * @param userId
+     * @return
+     */
+    @ApiOperation(value = "用户已绑定角色列表")
+    @RequestMapping(value = "/get_user_roles", method = RequestMethod.POST)
+    public Result getUserRoles(@RequestParam(value = "userId", required = true) Long userId) {
+        return ResultUtil.ok(sysRoleService.getUserRoles(userId));
+    }
+}
+

distributed-print/src/main/java/com/qmth/distributed/print/api/SysUserController.java

@@ -0,0 +1,168 @@
+package com.qmth.distributed.print.api;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.qmth.boot.api.constant.ApiConstant;
+import com.qmth.teachcloud.common.bean.dto.BlurryUserDto;
+import com.qmth.teachcloud.common.bean.dto.UserDto;
+import com.qmth.teachcloud.common.bean.params.UserSaveParams;
+import com.qmth.teachcloud.common.entity.SysUser;
+import com.qmth.teachcloud.common.service.SysUserService;
+import com.qmth.teachcloud.common.util.Result;
+import com.qmth.teachcloud.common.util.ResultUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.security.NoSuchAlgorithmException;
+import java.util.List;
+
+/**
+ * <p>
+ * 用户表 前端控制器
+ * </p>
+ *
+ * @author xf
+ * @since 2021-03-23
+ */
+@Api(tags = "用户Controller")
+@RestController
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.sys}/user")
+public class SysUserController {
+    private final static Logger log = LoggerFactory.getLogger(SysUserController.class);
+
+    @Autowired
+    private SysUserService sysUserService;
+
+    /**
+     * 查询
+     *
+     * @param loginName
+     * @param roleId
+     * @param enable
+     * @return
+     */
+    @ApiOperation(value = "查询")
+    @RequestMapping(value = "/list", method = RequestMethod.POST)
+    public Result list(@RequestParam(value = "loginName", required = false) String loginName,
+                       @RequestParam(value = "roleId", required = false) String roleId,
+                       @RequestParam(value = "enable", required = false) Boolean enable,
+                       @RequestParam(value = "pageNumber", required = true) Integer pageNumber,
+                       @RequestParam(value = "pageSize", required = true) Integer pageSize) {
+        return ResultUtil.ok(sysUserService.list(loginName, roleId, enable, pageNumber, pageSize));
+    }
+
+    /**
+     * 查询
+     *
+     * @param realName
+     * @param enable
+     * @return
+     */
+    @ApiOperation(value = "查询")
+    @RequestMapping(value = "/list_customer", method = RequestMethod.POST)
+    public Result listCustomer(@RequestParam(value = "realName", required = false) String realName,
+                               @RequestParam(value = "enable", required = false) Boolean enable,
+                               @RequestParam(value = "pageNumber", required = true) Integer pageNumber,
+                               @RequestParam(value = "pageSize", required = true) Integer pageSize) {
+        return ResultUtil.ok(sysUserService.listCustomer(realName, enable, pageNumber, pageSize));
+    }
+
+    /**
+     * 根据科目查询命题老师
+     *
+     * @param courseCode
+     * @param param
+     * @return
+     */
+    @ApiOperation(value = "根据科目查询命题老师")
+    @RequestMapping(value = "/user_list", method = RequestMethod.POST)
+    public Result userQuery(@RequestParam(value = "courseCode", required = false) String courseCode,
+                            @RequestParam(value = "param", required = false) String param) {
+        List<BlurryUserDto> list = sysUserService.listUser(courseCode, param);
+        return ResultUtil.ok(list);
+    }
+
+    /**
+     * 新增/修改
+     *
+     * @param userSaveParams
+     * @return
+     */
+    @ApiOperation(value = "新增/修改")
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    public Result save(@ApiParam(value = "用户信息", required = true) @Valid @RequestBody UserSaveParams userSaveParams, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
+        }
+        return ResultUtil.ok(sysUserService.saveUser(userSaveParams));
+    }
+
+    /**
+     * 新增客服
+     *
+     * @param userSaveParams
+     * @return
+     */
+    @ApiOperation(value = "新增客服")
+    @RequestMapping(value = "/save_customer", method = RequestMethod.POST)
+    public Result saveCustomer(@ApiParam(value = "用户信息", required = true) @Valid @RequestBody UserSaveParams userSaveParams, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
+        }
+        return ResultUtil.ok(sysUserService.saveCustomer(userSaveParams));
+    }
+
+    /**
+     * 启用/禁用
+     *
+     * @param user
+     * @return
+     */
+    @ApiOperation(value = "启用/禁用")
+    @RequestMapping(value = "/enable", method = RequestMethod.POST)
+    public Result enable(@RequestBody SysUser user) throws NoSuchAlgorithmException {
+        return ResultUtil.ok(sysUserService.enable(user));
+    }
+
+    /**
+     * 重置密码
+     *
+     * @param user
+     * @return
+     */
+    @ApiOperation(value = "重置密码")
+    @RequestMapping(value = "/reset_password", method = RequestMethod.POST)
+    public Result resetPassword(@RequestBody SysUser user) throws NoSuchAlgorithmException {
+        return ResultUtil.ok(sysUserService.resetPassword(user.getId()));
+    }
+
+    /**
+     * 修改密码
+     *
+     * @return
+     */
+    @ApiOperation(value = "修改密码")
+    @RequestMapping(value = "/update_password", method = RequestMethod.POST)
+    public Result updatePassword(@RequestBody SysUser user) throws NoSuchAlgorithmException {
+        return ResultUtil.ok(sysUserService.updatePassword(user));
+    }
+
+    /**
+     * 绑定角色
+     *
+     * @param sysUser
+     * @return
+     */
+    @ApiOperation(value = "绑定角色")
+    @RequestMapping(value = "/bind_roles", method = RequestMethod.POST)
+    public Result bindRoles(@RequestBody SysUser sysUser) {
+        return ResultUtil.ok(sysUserService.bindRoles(sysUser));
+    }
+}
+

teachcloud-common-api/src/main/java/com/qmth/teachcloud/common/api/api/SysRoleController.java

@@ -1,114 +1,113 @@
-package com.qmth.teachcloud.common.api.api;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.teachcloud.common.entity.SysRole;
-import com.qmth.teachcloud.common.service.SysRoleService;
-import com.qmth.teachcloud.common.util.Result;
-import com.qmth.teachcloud.common.util.ResultUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * <p>
- * 角色表 前端控制器
- * </p>
- *
- * @author xf
- * @since 2021-03-23
- */
-@Api(tags = "角色Controller")
-@RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.sys}/role")
-public class SysRoleController {
-
-    @Autowired
-    private SysRoleService sysRoleService;
-
-    /**
-     * 查询
-     *
-     * @param name
-     * @param enable
-     * @param pageNumber
-     * @param pageSize
-     * @return
-     */
-    @ApiOperation(value = "查询")
-    @RequestMapping(value = "/list", method = RequestMethod.POST)
-    public Result list(@RequestParam(value = "name", required = false) String name,
-                       @RequestParam(value = "enable", required = false) Boolean enable,
-                       @RequestParam(value = "pageNumber", required = true) Integer pageNumber,
-                       @RequestParam(value = "pageSize", required = true) Integer pageSize) {
-        IPage<SysRole> userDtos = sysRoleService.list(name, enable, pageNumber, pageSize);
-        return ResultUtil.ok(userDtos);
-    }
-
-    /**
-     * 新增用户时查询角色方法
-     * @return
-     */
-    @ApiOperation(value = "新增用户时查询角色方法")
-    @RequestMapping(value = "/list_to_user", method = RequestMethod.POST)
-    public Result listToUser() {
-        List<SysRole> userDtos = sysRoleService.listToUser();
-        return ResultUtil.ok(userDtos);
-    }
-
-    /**
-     * 新增/修改
-     *
-     * @param role
-     * @return
-     */
-    @ApiOperation(value = "新增/修改")
-    @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public Result save(@RequestBody SysRole role) {
-        boolean isSuccess = sysRoleService.saveRole(role);
-        return ResultUtil.ok(isSuccess);
-    }
-
-    /**
-     * 启用/禁用
-     *
-     * @param role
-     * @return
-     */
-    @ApiOperation(value = "启用/禁用")
-    @RequestMapping(value = "/enable", method = RequestMethod.POST)
-    public Result enable(@RequestBody SysRole role) {
-        boolean isSuccess = sysRoleService.enable(role);
-        return ResultUtil.ok(isSuccess);
-    }
-
-    /**
-     * 删除
-     *
-     * @param id
-     * @return
-     */
-    @ApiOperation(value = "删除")
-    @RequestMapping(value = "/remove", method = RequestMethod.POST)
-    public Result remove(Long id) {
-        boolean isSuccess = sysRoleService.remove(id);
-        return ResultUtil.ok(isSuccess);
-    }
-
-    /**
-     * 用户已绑定角色列表
-     *
-     * @param userId
-     * @return
-     */
-    @ApiOperation(value = "用户已绑定角色列表")
-    @RequestMapping(value = "/get_user_roles", method = RequestMethod.POST)
-    public Result getUserRoles(@RequestParam(value = "userId", required = true) Long userId) {
-        List<Long> list = sysRoleService.getUserRoles(userId);
-        return ResultUtil.ok(list);
-    }
-}
-
+//package com.qmth.distributed.print.api;
+//
+//import com.baomidou.mybatisplus.core.metadata.IPage;
+//import com.qmth.boot.api.constant.ApiConstant;
+//import com.qmth.teachcloud.common.entity.SysRole;
+//import com.qmth.teachcloud.common.service.SysRoleService;
+//import com.qmth.teachcloud.common.util.Result;
+//import com.qmth.teachcloud.common.util.ResultUtil;
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiOperation;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.validation.BindingResult;
+//import org.springframework.web.bind.annotation.*;
+//
+//import javax.validation.Valid;
+//import java.util.List;
+//
+///**
+// * <p>
+// * 角色表 前端控制器
+// * </p>
+// *
+// * @author xf
+// * @since 2021-03-23
+// */
+//@Api(tags = "角色Controller")
+//@RestController
+//@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.sys}/role")
+//public class SysRoleController {
+//
+//    @Autowired
+//    private SysRoleService sysRoleService;
+//
+//    /**
+//     * 查询
+//     *
+//     * @param name
+//     * @param enable
+//     * @param pageNumber
+//     * @param pageSize
+//     * @return
+//     */
+//    @ApiOperation(value = "查询")
+//    @RequestMapping(value = "/list", method = RequestMethod.POST)
+//    public Result list(@RequestParam(value = "name", required = false) String name,
+//                       @RequestParam(value = "enable", required = false) Boolean enable,
+//                       @RequestParam(value = "pageNumber", required = true) Integer pageNumber,
+//                       @RequestParam(value = "pageSize", required = true) Integer pageSize) {
+//        return ResultUtil.ok(sysRoleService.list(name, enable, pageNumber, pageSize));
+//    }
+//
+//    /**
+//     * 新增用户时查询角色方法
+//     *
+//     * @return
+//     */
+//    @ApiOperation(value = "新增用户时查询角色方法")
+//    @RequestMapping(value = "/list_to_user", method = RequestMethod.POST)
+//    public Result listToUser() {
+//        return ResultUtil.ok(sysRoleService.listToUser());
+//    }
+//
+//    /**
+//     * 新增/修改
+//     *
+//     * @param role
+//     * @return
+//     */
+//    @ApiOperation(value = "新增/修改")
+//    @RequestMapping(value = "/save", method = RequestMethod.POST)
+//    public Result save(@Valid @RequestBody SysRole role, BindingResult bindingResult) {
+//        if (bindingResult.hasErrors()) {
+//            return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
+//        }
+//        return ResultUtil.ok(sysRoleService.saveRoleNew(role));
+//    }
+//
+//    /**
+//     * 启用/禁用
+//     *
+//     * @param role
+//     * @return
+//     */
+//    @ApiOperation(value = "启用/禁用")
+//    @RequestMapping(value = "/enable", method = RequestMethod.POST)
+//    public Result enable(@RequestBody SysRole role) {
+//        return ResultUtil.ok(sysRoleService.enable(role));
+//    }
+//
+//    /**
+//     * 删除
+//     *
+//     * @param id
+//     * @return
+//     */
+//    @ApiOperation(value = "删除")
+//    @RequestMapping(value = "/remove", method = RequestMethod.POST)
+//    public Result remove(Long id) {
+//        return ResultUtil.ok(sysRoleService.remove(id));
+//    }
+//
+//    /**
+//     * 用户已绑定角色列表
+//     *
+//     * @param userId
+//     * @return
+//     */
+//    @ApiOperation(value = "用户已绑定角色列表")
+//    @RequestMapping(value = "/get_user_roles", method = RequestMethod.POST)
+//    public Result getUserRoles(@RequestParam(value = "userId", required = true) Long userId) {
+//        return ResultUtil.ok(sysRoleService.getUserRoles(userId));
+//    }
+//}

teachcloud-common-api/src/main/java/com/qmth/teachcloud/common/api/api/SysUserController.java

@@ -1,171 +1,171 @@
-package com.qmth.teachcloud.common.api.api;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.teachcloud.common.bean.dto.BlurryUserDto;
-import com.qmth.teachcloud.common.bean.dto.UserDto;
-import com.qmth.teachcloud.common.bean.params.UserSaveParams;
-import com.qmth.teachcloud.common.entity.SysUser;
-import com.qmth.teachcloud.common.service.SysUserService;
-import com.qmth.teachcloud.common.util.Result;
-import com.qmth.teachcloud.common.util.ResultUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.security.NoSuchAlgorithmException;
-import java.util.List;
-
-/**
- * <p>
- * 用户表 前端控制器
- * </p>
- *
- * @author xf
- * @since 2021-03-23
- */
-@Api(tags = "用户Controller")
-@RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.sys}/user")
-public class SysUserController {
-    private final static Logger log = LoggerFactory.getLogger(SysUserController.class);
-
-    @Autowired
-    private SysUserService sysUserService;
-
-    /**
-     * 查询
-     *
-     * @param loginName
-     * @param roleId
-     * @param enable
-     * @return
-     */
-    @ApiOperation(value = "查询")
-    @RequestMapping(value = "/list", method = RequestMethod.POST)
-    public Result list(@RequestParam(value = "loginName", required = false) String loginName,
-                       @RequestParam(value = "roleId", required = false) String roleId,
-                       @RequestParam(value = "enable", required = false) Boolean enable,
-                       @RequestParam(value = "pageNumber", required = true) Integer pageNumber,
-                       @RequestParam(value = "pageSize", required = true) Integer pageSize) {
-        IPage<UserDto> userDtos = sysUserService.list(loginName, roleId, enable, pageNumber, pageSize);
-        return ResultUtil.ok(userDtos);
-    }
-
-    /**
-     * 查询
-     *
-     * @param realName
-     * @param enable
-     * @return
-     */
-    @ApiOperation(value = "查询")
-    @RequestMapping(value = "/list_customer", method = RequestMethod.POST)
-    public Result listCustomer(@RequestParam(value = "realName", required = false) String realName,
-                               @RequestParam(value = "enable", required = false) Boolean enable,
-                               @RequestParam(value = "pageNumber", required = true) Integer pageNumber,
-                               @RequestParam(value = "pageSize", required = true) Integer pageSize) {
-        IPage<UserDto> userDtos = sysUserService.listCustomer(realName, enable, pageNumber, pageSize);
-        return ResultUtil.ok(userDtos);
-    }
-
-    /**
-     * 根据科目查询命题老师
-     *
-     * @param courseCode
-     * @param param
-     * @return
-     */
-    @ApiOperation(value = "根据科目查询命题老师")
-    @RequestMapping(value = "/user_list", method = RequestMethod.POST)
-    public Result userQuery(@RequestParam(value = "courseCode", required = false) String courseCode,
-                            @RequestParam(value = "param", required = false) String param) {
-        List<BlurryUserDto> list = sysUserService.listUser(courseCode, param);
-        return ResultUtil.ok(list);
-    }
-
-    /**
-     * 新增/修改
-     *
-     * @param userSaveParams
-     * @return
-     */
-    @ApiOperation(value = "新增/修改")
-    @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public Result save(@ApiParam(value = "用户信息", required = true) @Valid @RequestBody UserSaveParams userSaveParams, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
-        }
-        return ResultUtil.ok(sysUserService.saveUser(userSaveParams));
-    }
-
-    /**
-     * 新增客服
-     *
-     * @param userSaveParams
-     * @return
-     */
-    @ApiOperation(value = "新增客服")
-    @RequestMapping(value = "/save_customer", method = RequestMethod.POST)
-    public Result saveCustomer(@ApiParam(value = "用户信息", required = true) @Valid @RequestBody UserSaveParams userSaveParams, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
-        }
-        return ResultUtil.ok(sysUserService.saveCustomer(userSaveParams));
-    }
-
-    /**
-     * 启用/禁用
-     *
-     * @param user
-     * @return
-     */
-    @ApiOperation(value = "启用/禁用")
-    @RequestMapping(value = "/enable", method = RequestMethod.POST)
-    public Result enable(@RequestBody SysUser user) throws NoSuchAlgorithmException {
-        return ResultUtil.ok(sysUserService.enable(user));
-    }
-
-    /**
-     * 重置密码
-     *
-     * @param user
-     * @return
-     */
-    @ApiOperation(value = "重置密码")
-    @RequestMapping(value = "/reset_password", method = RequestMethod.POST)
-    public Result resetPassword(@RequestBody SysUser user) throws NoSuchAlgorithmException {
-        return ResultUtil.ok(sysUserService.resetPassword(user.getId()));
-    }
-
-    /**
-     * 修改密码
-     *
-     * @return
-     */
-    @ApiOperation(value = "修改密码")
-    @RequestMapping(value = "/update_password", method = RequestMethod.POST)
-    public Result updatePassword(@RequestBody SysUser user) throws NoSuchAlgorithmException {
-        return ResultUtil.ok(sysUserService.updatePassword(user));
-    }
-
-    /**
-     * 绑定角色
-     *
-     * @param sysUser
-     * @return
-     */
-    @ApiOperation(value = "绑定角色")
-    @RequestMapping(value = "/bind_roles", method = RequestMethod.POST)
-    public Result bindRoles(@RequestBody SysUser sysUser) {
-        boolean isSuccess = sysUserService.bindRoles(sysUser);
-        return ResultUtil.ok(isSuccess);
-    }
-}
-
+//package com.qmth.teachcloud.common.api.api;
+//
+//import com.baomidou.mybatisplus.core.metadata.IPage;
+//import com.qmth.boot.api.constant.ApiConstant;
+//import com.qmth.teachcloud.common.bean.dto.BlurryUserDto;
+//import com.qmth.teachcloud.common.bean.dto.UserDto;
+//import com.qmth.teachcloud.common.bean.params.UserSaveParams;
+//import com.qmth.teachcloud.common.entity.SysUser;
+//import com.qmth.teachcloud.common.service.SysUserService;
+//import com.qmth.teachcloud.common.util.Result;
+//import com.qmth.teachcloud.common.util.ResultUtil;
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiOperation;
+//import io.swagger.annotations.ApiParam;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.validation.BindingResult;
+//import org.springframework.web.bind.annotation.*;
+//
+//import javax.validation.Valid;
+//import java.security.NoSuchAlgorithmException;
+//import java.util.List;
+//
+///**
+// * <p>
+// * 用户表 前端控制器
+// * </p>
+// *
+// * @author xf
+// * @since 2021-03-23
+// */
+//@Api(tags = "用户Controller")
+//@RestController
+//@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.sys}/user")
+//public class SysUserController {
+//    private final static Logger log = LoggerFactory.getLogger(SysUserController.class);
+//
+//    @Autowired
+//    private SysUserService sysUserService;
+//
+//    /**
+//     * 查询
+//     *
+//     * @param loginName
+//     * @param roleId
+//     * @param enable
+//     * @return
+//     */
+//    @ApiOperation(value = "查询")
+//    @RequestMapping(value = "/list", method = RequestMethod.POST)
+//    public Result list(@RequestParam(value = "loginName", required = false) String loginName,
+//                       @RequestParam(value = "roleId", required = false) String roleId,
+//                       @RequestParam(value = "enable", required = false) Boolean enable,
+//                       @RequestParam(value = "pageNumber", required = true) Integer pageNumber,
+//                       @RequestParam(value = "pageSize", required = true) Integer pageSize) {
+//        IPage<UserDto> userDtos = sysUserService.list(loginName, roleId, enable, pageNumber, pageSize);
+//        return ResultUtil.ok(userDtos);
+//    }
+//
+//    /**
+//     * 查询
+//     *
+//     * @param realName
+//     * @param enable
+//     * @return
+//     */
+//    @ApiOperation(value = "查询")
+//    @RequestMapping(value = "/list_customer", method = RequestMethod.POST)
+//    public Result listCustomer(@RequestParam(value = "realName", required = false) String realName,
+//                               @RequestParam(value = "enable", required = false) Boolean enable,
+//                               @RequestParam(value = "pageNumber", required = true) Integer pageNumber,
+//                               @RequestParam(value = "pageSize", required = true) Integer pageSize) {
+//        IPage<UserDto> userDtos = sysUserService.listCustomer(realName, enable, pageNumber, pageSize);
+//        return ResultUtil.ok(userDtos);
+//    }
+//
+//    /**
+//     * 根据科目查询命题老师
+//     *
+//     * @param courseCode
+//     * @param param
+//     * @return
+//     */
+//    @ApiOperation(value = "根据科目查询命题老师")
+//    @RequestMapping(value = "/user_list", method = RequestMethod.POST)
+//    public Result userQuery(@RequestParam(value = "courseCode", required = false) String courseCode,
+//                            @RequestParam(value = "param", required = false) String param) {
+//        List<BlurryUserDto> list = sysUserService.listUser(courseCode, param);
+//        return ResultUtil.ok(list);
+//    }
+//
+//    /**
+//     * 新增/修改
+//     *
+//     * @param userSaveParams
+//     * @return
+//     */
+//    @ApiOperation(value = "新增/修改")
+//    @RequestMapping(value = "/save", method = RequestMethod.POST)
+//    public Result save(@ApiParam(value = "用户信息", required = true) @Valid @RequestBody UserSaveParams userSaveParams, BindingResult bindingResult) {
+//        if (bindingResult.hasErrors()) {
+//            return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
+//        }
+//        return ResultUtil.ok(sysUserService.saveUser(userSaveParams));
+//    }
+//
+//    /**
+//     * 新增客服
+//     *
+//     * @param userSaveParams
+//     * @return
+//     */
+//    @ApiOperation(value = "新增客服")
+//    @RequestMapping(value = "/save_customer", method = RequestMethod.POST)
+//    public Result saveCustomer(@ApiParam(value = "用户信息", required = true) @Valid @RequestBody UserSaveParams userSaveParams, BindingResult bindingResult) {
+//        if (bindingResult.hasErrors()) {
+//            return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
+//        }
+//        return ResultUtil.ok(sysUserService.saveCustomer(userSaveParams));
+//    }
+//
+//    /**
+//     * 启用/禁用
+//     *
+//     * @param user
+//     * @return
+//     */
+//    @ApiOperation(value = "启用/禁用")
+//    @RequestMapping(value = "/enable", method = RequestMethod.POST)
+//    public Result enable(@RequestBody SysUser user) throws NoSuchAlgorithmException {
+//        return ResultUtil.ok(sysUserService.enable(user));
+//    }
+//
+//    /**
+//     * 重置密码
+//     *
+//     * @param user
+//     * @return
+//     */
+//    @ApiOperation(value = "重置密码")
+//    @RequestMapping(value = "/reset_password", method = RequestMethod.POST)
+//    public Result resetPassword(@RequestBody SysUser user) throws NoSuchAlgorithmException {
+//        return ResultUtil.ok(sysUserService.resetPassword(user.getId()));
+//    }
+//
+//    /**
+//     * 修改密码
+//     *
+//     * @return
+//     */
+//    @ApiOperation(value = "修改密码")
+//    @RequestMapping(value = "/update_password", method = RequestMethod.POST)
+//    public Result updatePassword(@RequestBody SysUser user) throws NoSuchAlgorithmException {
+//        return ResultUtil.ok(sysUserService.updatePassword(user));
+//    }
+//
+//    /**
+//     * 绑定角色
+//     *
+//     * @param sysUser
+//     * @return
+//     */
+//    @ApiOperation(value = "绑定角色")
+//    @RequestMapping(value = "/bind_roles", method = RequestMethod.POST)
+//    public Result bindRoles(@RequestBody SysUser sysUser) {
+//        boolean isSuccess = sysUserService.bindRoles(sysUser);
+//        return ResultUtil.ok(isSuccess);
+//    }
+//}
+//

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/result/LoginResult.java

@@ -46,7 +46,7 @@ public class LoginResult implements Serializable {
     OrgNativeBean orgInfo;
 
     @ApiModelProperty(name = "角色集合")
-    private Set<RoleTypeEnum> roleList;
+    private Set<String> roleList;
 
     @ApiModelProperty(name = "服务器时间戳")
     private long time;
@@ -58,7 +58,7 @@ public class LoginResult implements Serializable {
 
     }
 
-    public LoginResult(SysUser sysUser, String sessionId, String accessToken, Set<RoleTypeEnum> roleList, AppSourceEnum appSource) {
+    public LoginResult(SysUser sysUser, String sessionId, String accessToken, Set<String> roleList, AppSourceEnum appSource) {
         this.id = sysUser.getId();
         ServletUtil.setRequestId(Arrays.asList(id));
         this.loginName = sysUser.getLoginName();
@@ -87,11 +87,11 @@ public class LoginResult implements Serializable {
         this.appSource = appSource;
     }
 
-    public Set<RoleTypeEnum> getRoleList() {
+    public Set<String> getRoleList() {
         return roleList;
     }
 
-    public void setRoleList(Set<RoleTypeEnum> roleList) {
+    public void setRoleList(Set<String> roleList) {
         this.roleList = roleList;
     }
 

teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/SysRolePrivilege.java

@@ -8,6 +8,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
+import java.util.Set;
 
 /**
  * <p>

teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/SysUserRole.java

@@ -9,6 +9,8 @@ import com.qmth.teachcloud.common.contant.SystemConstant;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Set;
 
 /**
  * <p>
@@ -55,6 +57,12 @@ public class SysUserRole implements Serializable {
 
     }
 
+    public SysUserRole(Long userId, Long roleId) {
+        this.id = SystemConstant.getDbUuid();
+        this.userId = userId;
+        this.roleId = roleId;
+    }
+
     public SysUserRole(Long userId, Long roleId, Long privilegeId) {
         this.id = SystemConstant.getDbUuid();
         this.userId = userId;

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/CacheService.java

@@ -5,6 +5,7 @@ import com.qmth.teachcloud.common.entity.*;
 import com.qmth.teachcloud.common.enums.PrivilegePropertyEnum;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  * @Description: 缓存操作service

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/TeachcloudCommonService.java

@@ -35,8 +35,17 @@ public interface TeachcloudCommonService {
      * @param sysUser
      * @param roleId
      */
+    @Deprecated
     public void addUserRolePrivilege(SysUser sysUser, Long roleId);
 
+    /**
+     * 新增用户权限
+     *
+     * @param sysUser
+     * @param roleIds
+     */
+    public void addUserRolePrivilege(SysUser sysUser, Long[] roleIds);
+
     /**
      * 获取用户角色
      *

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/CacheServiceImpl.java

@@ -15,6 +15,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Set;
 
 /**
  * @Description: 缓存操作serviceImpl 实现类

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/SysRoleServiceImpl.java

@@ -52,9 +52,6 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     @Resource
     SysRoleService sysRoleService;
 
-//    @Autowired
-//    TeachcloudCommonService commonService;
-
     @Override
     public IPage<SysRole> list(String name, Boolean enable, Integer pageNumber, Integer pageSize) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
@@ -140,15 +137,13 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
                 cacheService.updateRoleCache(role.getId());
                 if (count != sysRolePrivilegeList.size() || count != role.getPrivilegeIds().length) {
                     sysRolePrivilegeService.removeByRoleId(role.getId());
-                    //角色权限
-                    sysRolePrivilegeService.saveBatch(role);
+                    sysRolePrivilegeService.saveBatch(role);//角色权限
                     cacheService.updateRolePrivilegeCache(role.getId());
                 }
-//                commonService.removeUserInfo(user.getId());
             } else {
                 role.setCreateId(sysUser.getId());
                 sysRoleService.save(role);
-                sysRolePrivilegeService.saveBatch(role);
+                sysRolePrivilegeService.saveBatch(role);//角色权限
             }
         } catch (Exception e) {
             if (e instanceof DuplicateKeyException) {

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/SysUserServiceImpl.java

@@ -274,9 +274,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             if (Objects.isNull(sysUser.getId())) {//新增用户
                 sysUser.setInsertInfo(requestUser.getId());
                 sysUserService.save(sysUser);
-                for (Long roleId : userSaveParams.getRoleIds()) {
-                    commonService.addUserRolePrivilege(sysUser, roleId);
-                }
+                commonService.addUserRolePrivilege(sysUser, userSaveParams.getRoleIds());
             } else {//修改用户
                 List<SysUserRole> sysUserRoleList = cacheService.userRolePrivilegeCache(sysUser.getId());
                 List<Long> userRolesList = Arrays.asList(userSaveParams.getRoleIds());
@@ -285,25 +283,19 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 SysUser dbUser = sysUserService.getById(sysUser.getId());
                 sysUser.setUpdateInfo(requestUser.getId());
                 sysUserService.updateById(sysUser);
-                List<SysRole> list = sysUserRoleService.listRoleByUserId(sysUser.getId());
-                boolean containsQuestionTeacher = list.stream().filter(m -> RoleTypeEnum.SCHOOL_ADMIN.equals(m.getType())).count() > 0;
-                if (containsQuestionTeacher || count == 0 || dbUserRolesList.size() != userRolesList.size()) {
+                //如果修改了角色，需要重新登录
+                if (count == 0 || dbUserRolesList.size() != userRolesList.size()) {
                     QueryWrapper<SysUserRole> sysUserRoleQueryWrapper = new QueryWrapper<>();
                     sysUserRoleQueryWrapper.lambda().eq(SysUserRole::getUserId, sysUser.getId());
                     sysUserRoleService.remove(sysUserRoleQueryWrapper);
 
                     cacheService.removeUserRolePrivilegeCache(sysUser.getId());
-                    for (Long roleId : userSaveParams.getRoleIds()) {
-                        commonService.addUserRolePrivilege(sysUser, roleId);
-                    }
-                }
-                //如果修改了角色，需要重新登录
-                if (count == 0 || dbUserRolesList.size() != userRolesList.size()) {
+                    commonService.addUserRolePrivilege(sysUser, userSaveParams.getRoleIds());
                     commonService.removeUserInfo(sysUser.getId());
                 }
                 //如果修改了机构或手机号，需更新用户缓存
                 if (Objects.nonNull(dbUser.getOrgId())) {
-                    if (containsQuestionTeacher || dbUser.getOrgId().longValue() != sysUser.getOrgId().longValue()
+                    if (dbUser.getOrgId().longValue() != sysUser.getOrgId().longValue()
                             || !Objects.equals(dbUser.getMobileNumber(), sysUser.getMobileNumber())) {
                         cacheService.updateUserCache(sysUser.getId());
                         cacheService.updateUserAuthCache(sysUser.getId());

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/TeachcloudCommonServiceImpl.java

@@ -93,6 +93,7 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
      * @param sysUser
      * @param roleId
      */
+    @Deprecated
     @Override
     public void addUserRolePrivilege(SysUser sysUser, Long roleId) {
         List<SysRolePrivilege> sysRolePrivilegeList = cacheService.rolePrivilegeCache(roleId);
@@ -103,6 +104,22 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
         sysUserRoleService.saveBatch(sysUserRoleList);
     }
 
+    /**
+     * 新增用户权限
+     *
+     * @param sysUser
+     * @param roleIds
+     */
+    @Override
+    public void addUserRolePrivilege(SysUser sysUser, Long[] roleIds) {
+        List<SysUserRole> sysUserRoleList = new ArrayList<>();
+        for (int i = 0; i < roleIds.length; i++) {
+            sysUserRoleList.add(new SysUserRole(sysUser.getId(), roleIds[i]));
+        }
+        sysUserRoleService.saveBatch(sysUserRoleList);
+    }
+
+
     /**
      * 获取用户角色权限
      *
@@ -148,12 +165,12 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
             //查询用户角色和权限
             List<SysUserRole> sysUserRoleList = cacheService.userRolePrivilegeCache(user.getId());
             if (Objects.nonNull(sysUserRoleList) && sysUserRoleList.size() > 0) {
-                Set<Long> roleIds = new HashSet<>();
-                Set<Long> privilegeIds = new HashSet<>();
-                sysUserRoleList.forEach(s -> {
-                    roleIds.add(s.getRoleId());
-                    privilegeIds.add(s.getPrivilegeId());
-                });
+                Set<Long> roleIds = sysUserRoleList.stream().map(s -> s.getRoleId()).collect(Collectors.toSet());
+                List<SysRolePrivilege> sysRolePrivilegeList = new ArrayList<>();
+                for (Long l : roleIds) {
+                    sysRolePrivilegeList.addAll(cacheService.rolePrivilegeCache(l));
+                }
+                Set<Long> privilegeIds = sysRolePrivilegeList.stream().map(s -> s.getPrivilegeId()).collect(Collectors.toSet());
                 QueryWrapper<SysRole> sysRoleQueryWrapper = new QueryWrapper<>();
                 sysRoleQueryWrapper.lambda().in(SysRole::getId, roleIds)
                         .eq(SysRole::getEnable, true);
@@ -161,15 +178,15 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
                 int count = Objects.nonNull(sysRoleList) && sysRoleList.size() > 0 ? (int) sysRoleList.stream().filter(s -> s.getType() == RoleTypeEnum.ADMIN).count() : 0;
                 QueryWrapper<SysPrivilege> sysPrivilegeQueryWrapper = new QueryWrapper<>();
                 if (count > 0) {//超级系统管理员
-                    sysPrivilegeQueryWrapper.lambda().eq(SysPrivilege::getType, PrivilegeEnum.URL)
-                            .eq(SysPrivilege::getProperty, PrivilegePropertyEnum.AUTH);
+                    Long schoolId = (Long) ServletUtil.getRequestSchoolByNotVaild();
+                    sysPrivilegeQueryWrapper.lambda().eq(SysPrivilege::getSchoolId, schoolId);
                     List<SysPrivilege> sysPrivilegeList = sysPrivilegeService.list(sysPrivilegeQueryWrapper);
                     authBean = new AuthBean(sysRoleList, sysPrivilegeList.stream().map(s -> s.getUrl()).collect(Collectors.toSet()));
                 } else {
                     BasicSchool tbSchool = Objects.nonNull(user.getSchoolId()) ? cacheService.schoolCache(user.getSchoolId()) : null;
                     SysOrg org = Objects.nonNull(user.getOrgId()) ? cacheService.orgCache(user.getOrgId()) : null;
                     sysPrivilegeQueryWrapper.lambda().in(SysPrivilege::getId, privilegeIds)
-                            .eq(SysPrivilege::getProperty, PrivilegePropertyEnum.AUTH);
+                            .eq(SysPrivilege::getSchoolId, user.getSchoolId());
                     List<SysPrivilege> sysPrivilegeList = sysPrivilegeService.list(sysPrivilegeQueryWrapper);
                     authBean = new AuthBean(sysRoleList, sysPrivilegeList.stream().map(s -> s.getUrl()).collect(Collectors.toSet()), tbSchool, org);
                 }
@@ -636,19 +653,19 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
         String token = SystemConstant.getUuid();
         cacheService.userCache(sysUser.getId());
         //添加用户会话缓存
-        Set<RoleTypeEnum> roleType = authBean.getRoleList().stream().map(s -> s.getType()).collect(Collectors.toSet());
-        String sessionId = SessionUtil.digest(sysUser.getId(), Math.abs(roleType.toString().hashCode()), platform.name());
+        Set<String> roleName = authBean.getRoleList().stream().map(s -> s.getName()).collect(Collectors.toSet());
+        String sessionId = SessionUtil.digest(sysUser.getId(), Math.abs(roleName.toString().hashCode()), platform.name());
         //TODO 测试用
         String test = SignatureEntityTest.build(SignatureType.TOKEN, sessionId, token);
         ExpireTimeBean expireTime = AuthUtil.getExpireTime(platform);
-        TBSession tbSession = new TBSession(sysUser.getSchoolId(), sessionId, String.valueOf(sysUser.getId()), roleType.toString(),
+        TBSession tbSession = new TBSession(sysUser.getSchoolId(), sessionId, String.valueOf(sysUser.getId()), roleName.toString(),
                 platform.name(), platform.name(), deviceId, ServletUtil.getRequest().getLocalAddr(), token,
                 expireTime.getDate().getTime(), appSource);
         tbSessionService.saveOrUpdate(tbSession);
         redisUtil.setUserSession(sessionId, tbSession, expireTime.getExpireSeconds());
 
-        LoginResult loginResult = new LoginResult(sysUser, sessionId, test, roleType, appSource);
-//        LoginResult loginResult = new LoginResult(sysUser, sessionId, token, roleType, appSource);
+        LoginResult loginResult = new LoginResult(sysUser, sessionId, test, roleName, appSource);
+//        LoginResult loginResult = new LoginResult(sysUser, sessionId, token, roleName, appSource);
         loginResult.setSchoolInfo(Objects.nonNull(authBean.getSchool()) ? loginResult.new SchoolNativeBean(authBean.getSchool()) : null);
         loginResult.setOrgInfo(Objects.nonNull(authBean.getOrg()) ? loginResult.new OrgNativeBean(authBean.getOrg()) : null);
         loginResult.setTime(System.currentTimeMillis());