修复 用户登录 查询列表等问题

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/console/LoginController.java

@@ -46,7 +46,7 @@ public class LoginController {
 
     @ApiOperation("重置密码")
     @PostMapping("resetPassword")
-    public BaseResponse resetPassword(@Validated ResetPasswordReq req) throws Exception{
+    public BaseResponse resetPassword(@Validated ResetPasswordReq req) throws Exception {
         loginService.resetPassword(req);
         //包装出参
         return BaseResponse.create();
@@ -54,7 +54,7 @@ public class LoginController {
 
     @ApiOperation("修改密码")
     @PostMapping("updatePassword")
-    public BaseResponse updatePassword(@Validated UpdatePasswordReq req) throws Exception{
+    public BaseResponse updatePassword(@Validated UpdatePasswordReq req) throws Exception {
         return loginService.updatePassword(req);
     }
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/console/UserManagerController.java

@@ -4,7 +4,6 @@ import com.abi.qms.platform.dto.req.*;
 import com.abi.qms.platform.dto.res.GetUserInfoRes;
 import com.abi.qms.platform.dto.res.ListUserRes;
 import com.abi.qms.platform.service.UserManagerService;
-import com.abi.task.common.annotation.IgnoreToken;
 import com.abi.task.common.api.base.BaseResponse;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -29,42 +28,41 @@ public class UserManagerController {
     private UserManagerService userManagerService;
 
 
-
     @ApiOperation("创建用户")
     @PostMapping("createUser")
-    public BaseResponse createUser(@Validated @RequestBody CreateUserReq createUserReq) throws Exception{
+    public BaseResponse createUser(@Validated @RequestBody CreateUserReq createUserReq) throws Exception {
         //创建用户
         return userManagerService.createUser(createUserReq);
     }
 
     @ApiOperation("修改用户")
     @PostMapping("updateUser")
-    public BaseResponse updateUser(@Validated @RequestBody UpdateUserReq updateUserReq) throws Exception{
+    public BaseResponse updateUser(@Validated @RequestBody UpdateUserReq updateUserReq) throws Exception {
         //修改用户
         return userManagerService.updateUser(updateUserReq);
     }
 
     @ApiOperation("查询单个用户信息")
     @GetMapping("getUserInfo/{userId}")
-    public BaseResponse<GetUserInfoRes> getUserInfo(@PathVariable("userId") Long userId) throws Exception{
+    public BaseResponse<GetUserInfoRes> getUserInfo(@PathVariable("userId") Long userId) throws Exception {
         //查询单个用户信息
-        GetUserInfoRes  result = userManagerService.getUserInfo(userId);
+        GetUserInfoRes result = userManagerService.getUserInfo(userId);
         //包装出参
         return BaseResponse.create(result);
     }
 
     @ApiOperation("查询用户列表")
     @GetMapping("listUser")
-    public BaseResponse<ListUserRes> listUser(@Validated ListUserReq listUserReq) throws Exception{
+    public BaseResponse<ListUserRes> listUser(@Validated ListUserReq listUserReq) throws Exception {
         //查询用户列表
-        ListUserRes  result = userManagerService.listUser(listUserReq);
+        ListUserRes result = userManagerService.listUser(listUserReq);
         //包装出参
         return BaseResponse.create(result);
     }
 
     @ApiOperation("启用/停用用户")
     @PostMapping("enableUser")
-    public BaseResponse enableUser(@Validated UserInfoIdReq userInfoIdReq) throws Exception{
+    public BaseResponse enableUser(@Validated UserInfoIdReq userInfoIdReq) throws Exception {
         userManagerService.enableUser(userInfoIdReq.getId());
         //包装出参
         return BaseResponse.create();
@@ -72,7 +70,7 @@ public class UserManagerController {
 
     @ApiOperation("批量启用/停用用户")
     @PostMapping("batchEnableUser")
-    public BaseResponse batchEnableUser(@Validated BatchEnableUserReq batchEnableUserReq) throws Exception{
+    public BaseResponse batchEnableUser(@Validated BatchEnableUserReq batchEnableUserReq) throws Exception {
         userManagerService.batchEnableUser(batchEnableUserReq);
         //包装出参
         return BaseResponse.create();

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/LoginServiceImpl.java

@@ -7,7 +7,6 @@ import com.abi.qms.platform.dao.enums.BaseFinal;
 import com.abi.qms.platform.dao.enums.ErrorCodeEnum;
 import com.abi.qms.platform.dao.enums.RedisKey;
 import com.abi.qms.platform.dao.mapper.UserInfoMapper;
-import com.abi.qms.platform.dao.mapper.UserMappingInfoRoleMapper;
 import com.abi.qms.platform.dao.mapper.UserRoleMapper;
 import com.abi.qms.platform.dto.req.LoginReq;
 import com.abi.qms.platform.dto.req.ResetPasswordReq;
@@ -49,9 +48,6 @@ public class LoginServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> impl
     @Resource
     private RedisUtils redisUtil;
 
-    @Autowired
-    private UserMappingInfoRoleMapper userMappingInfoRoleMapper;
-
 
     @Override
     public BaseResponse login(LoginReq req) {

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/UserManagerServiceImpl.java

@@ -4,23 +4,17 @@ import cn.hutool.core.util.ObjectUtil;
 import com.abi.qms.platform.dao.entity.UserInfo;
 import com.abi.qms.platform.dao.entity.UserMappingInfoRole;
 import com.abi.qms.platform.dao.entity.UserRole;
-import com.abi.qms.platform.dao.enums.BaseFinal;
 import com.abi.qms.platform.dao.enums.ErrorCodeEnum;
-import com.abi.qms.platform.dao.enums.RedisKey;
 import com.abi.qms.platform.dao.mapper.UserInfoMapper;
 import com.abi.qms.platform.dao.mapper.UserMappingInfoRoleMapper;
 import com.abi.qms.platform.dao.mapper.UserRoleMapper;
 import com.abi.qms.platform.dto.req.*;
 import com.abi.qms.platform.dto.res.GetUserInfoRes;
 import com.abi.qms.platform.dto.res.ListUserRes;
-import com.abi.qms.platform.dto.res.LoginRes;
 import com.abi.qms.platform.infrastructure.util.PageUtil;
-import com.abi.qms.platform.infrastructure.util.RedisUtils;
-import com.abi.qms.platform.infrastructure.util.UUIDutils;
 import com.abi.qms.platform.infrastructure.util.UserUtil;
 import com.abi.qms.platform.service.UserManagerService;
 import com.abi.task.common.api.base.BaseResponse;
-import com.abi.task.common.utils.AESEncodeTwoUtil;
 import com.abi.task.common.utils.PojoConverterUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -31,7 +25,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
 import java.util.List;
 import java.util.Objects;
 
@@ -86,11 +79,11 @@ public class UserManagerServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo
         qwUR.eq("user_id", userInfo.getId());
         qwUR.eq("is_delete", 0);
         UserMappingInfoRole userMappingInfoRole = userMappingInfoRoleMapper.selectOne(qwUR);
-        if(Objects.nonNull(userMappingInfoRole)){
+        if (Objects.nonNull(userMappingInfoRole)) {
             userMappingInfoRole.setRoleCode(userRole.getRoleCode());
             userMappingInfoRole.setRoleName(userRole.getRoleName());
             userMappingInfoRoleMapper.updateById(userMappingInfoRole);
-        }else{
+        } else {
             userMappingInfoRole = new UserMappingInfoRole();
             userMappingInfoRole.setUserId(userInfo.getId());
             userMappingInfoRole.setRoleCode(userRole.getRoleCode());
@@ -121,11 +114,11 @@ public class UserManagerServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo
         qwUR.eq("user_id", userInfo.getId());
         qwUR.eq("is_delete", 0);
         UserMappingInfoRole userMappingInfoRole = userMappingInfoRoleMapper.selectOne(qwUR);
-        if(Objects.nonNull(userMappingInfoRole)){
+        if (Objects.nonNull(userMappingInfoRole)) {
             userMappingInfoRole.setRoleCode(userRole.getRoleCode());
             userMappingInfoRole.setRoleName(userRole.getRoleName());
             userMappingInfoRoleMapper.updateById(userMappingInfoRole);
-        }else{
+        } else {
             userMappingInfoRole = new UserMappingInfoRole();
             userMappingInfoRole.setUserId(userInfo.getId());
             userMappingInfoRole.setRoleCode(userRole.getRoleCode());