根据nick_name查询部门名称
This commit is contained in:
@@ -11,6 +11,8 @@ import org.springframework.web.bind.annotation.*;
|
|||||||
|
|
||||||
import javax.validation.Valid;
|
import javax.validation.Valid;
|
||||||
import javax.validation.constraints.NotBlank;
|
import javax.validation.constraints.NotBlank;
|
||||||
|
import java.util.List;
|
||||||
|
import com.ruoyi.fadapp.domain.vo.NickDeptVo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* FAD APP认证控制器
|
* FAD APP认证控制器
|
||||||
@@ -51,4 +53,22 @@ public class FadAppAuthController {
|
|||||||
authService.logout(token);
|
authService.logout(token);
|
||||||
return R.ok();
|
return R.ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 根据用户名查部门名称
|
||||||
|
*/
|
||||||
|
@GetMapping("/dept-name")
|
||||||
|
public R<String> getDeptNameByUserName(@RequestParam String userName) {
|
||||||
|
String deptName = authService.getDeptNameByUserName(userName);
|
||||||
|
return R.ok(deptName);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 批量根据昵称查询部门名称
|
||||||
|
*/
|
||||||
|
@PostMapping("/dept-names-by-nicks")
|
||||||
|
public R<List<NickDeptVo>> getDeptNamesByNickNames(@RequestBody List<String> nickNames) {
|
||||||
|
List<NickDeptVo> result = authService.getDeptNamesByNickNames(nickNames);
|
||||||
|
return R.ok(result);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
package com.ruoyi.fadapp.domain.vo;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class NickDeptVo {
|
||||||
|
private String nickName;
|
||||||
|
private String deptName;
|
||||||
|
}
|
||||||
@@ -1,6 +1,8 @@
|
|||||||
package com.ruoyi.fadapp.service;
|
package com.ruoyi.fadapp.service;
|
||||||
|
|
||||||
import com.ruoyi.fadapp.domain.vo.LoginResultVo;
|
import com.ruoyi.fadapp.domain.vo.LoginResultVo;
|
||||||
|
import com.ruoyi.fadapp.domain.vo.NickDeptVo;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* FAD APP认证服务接口
|
* FAD APP认证服务接口
|
||||||
@@ -31,4 +33,19 @@ public interface IFadAppAuthService {
|
|||||||
* @param token 访问令牌
|
* @param token 访问令牌
|
||||||
*/
|
*/
|
||||||
void logout(String token);
|
void logout(String token);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 根据用户名查部门名称
|
||||||
|
*/
|
||||||
|
String getDeptNameByUserName(String userName);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 根据昵称查部门名称
|
||||||
|
*/
|
||||||
|
String getDeptNameByNickName(String nickName);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 批量根据昵称查部门名称
|
||||||
|
*/
|
||||||
|
List<NickDeptVo> getDeptNamesByNickNames(List<String> nickNames);
|
||||||
}
|
}
|
||||||
@@ -11,6 +11,7 @@ import com.ruoyi.common.exception.ServiceException;
|
|||||||
import com.ruoyi.common.helper.LoginHelper;
|
import com.ruoyi.common.helper.LoginHelper;
|
||||||
import com.ruoyi.common.utils.redis.RedisUtils;
|
import com.ruoyi.common.utils.redis.RedisUtils;
|
||||||
import com.ruoyi.fadapp.domain.vo.LoginResultVo;
|
import com.ruoyi.fadapp.domain.vo.LoginResultVo;
|
||||||
|
import com.ruoyi.fadapp.domain.vo.NickDeptVo;
|
||||||
import com.ruoyi.fadapp.service.IFadAppAuthService;
|
import com.ruoyi.fadapp.service.IFadAppAuthService;
|
||||||
import com.ruoyi.system.service.ISysUserService;
|
import com.ruoyi.system.service.ISysUserService;
|
||||||
import com.ruoyi.system.service.SysPermissionService;
|
import com.ruoyi.system.service.SysPermissionService;
|
||||||
@@ -20,6 +21,7 @@ import org.springframework.stereotype.Service;
|
|||||||
|
|
||||||
import java.time.Duration;
|
import java.time.Duration;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* FAD APP认证服务实现类
|
* FAD APP认证服务实现类
|
||||||
@@ -113,8 +115,8 @@ public class FadAppAuthServiceImpl implements IFadAppAuthService {
|
|||||||
result.setPhonenumber(user.getPhonenumber());
|
result.setPhonenumber(user.getPhonenumber());
|
||||||
result.setAvatar(user.getAvatar());
|
result.setAvatar(user.getAvatar());
|
||||||
result.setDeptId(user.getDeptId());
|
result.setDeptId(user.getDeptId());
|
||||||
|
result.setDeptName(user.getDept() != null ? user.getDept().getDeptName() : "");
|
||||||
// 这里可以设置部门名称,需要查询部门信息
|
// 这里可以设置部门名称,需要查询部门信息
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -182,4 +184,45 @@ public class FadAppAuthServiceImpl implements IFadAppAuthService {
|
|||||||
loginUser.setRoles(roles);
|
loginUser.setRoles(roles);
|
||||||
return loginUser;
|
return loginUser;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getDeptNameByUserName(String userName) {
|
||||||
|
SysUser user = userService.selectUserByUserName(userName);
|
||||||
|
if (user == null) {
|
||||||
|
throw new ServiceException("用户不存在");
|
||||||
|
}
|
||||||
|
if (user.getDept() != null) {
|
||||||
|
return user.getDept().getDeptName();
|
||||||
|
}
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getDeptNameByNickName(String nickName) {
|
||||||
|
SysUser user = userService.selectUserByNickName(nickName);
|
||||||
|
if (user == null) {
|
||||||
|
throw new ServiceException("用户不存在");
|
||||||
|
}
|
||||||
|
if (user.getDept() != null) {
|
||||||
|
return user.getDept().getDeptName();
|
||||||
|
}
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<NickDeptVo> getDeptNamesByNickNames(List<String> nickNames) {
|
||||||
|
List<NickDeptVo> result = new ArrayList<>();
|
||||||
|
for (String nick : nickNames) {
|
||||||
|
SysUser user = userService.selectUserByNickName(nick);
|
||||||
|
NickDeptVo vo = new NickDeptVo();
|
||||||
|
vo.setNickName(nick);
|
||||||
|
if (user != null && user.getDept() != null) {
|
||||||
|
vo.setDeptName(user.getDept().getDeptName());
|
||||||
|
} else {
|
||||||
|
vo.setDeptName("");
|
||||||
|
}
|
||||||
|
result.add(vo);
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -114,5 +114,11 @@ public interface SysUserMapper extends BaseMapperPlus<SysUserMapper, SysUser, Sy
|
|||||||
*/
|
*/
|
||||||
List<SysUser> selectListAndNotDel();
|
List<SysUser> selectListAndNotDel();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 通过昵称查询用户
|
||||||
|
* @param nickName 昵称
|
||||||
|
* @return 用户对象信息
|
||||||
|
*/
|
||||||
|
SysUser selectUserByNickName(String nickName);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -83,6 +83,13 @@ public interface ISysUserService {
|
|||||||
*/
|
*/
|
||||||
SysUser selectUserByIdAndNotDelFlag(Long userId);
|
SysUser selectUserByIdAndNotDelFlag(Long userId);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 通过昵称查询用户
|
||||||
|
* @param nickName 昵称
|
||||||
|
* @return 用户对象信息
|
||||||
|
*/
|
||||||
|
SysUser selectUserByNickName(String nickName);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据用户ID查询用户所属角色组
|
* 根据用户ID查询用户所属角色组
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -526,4 +526,9 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
|
|||||||
return ObjectUtil.isNull(sysUser) ? null : sysUser.getNickName();
|
return ObjectUtil.isNull(sysUser) ? null : sysUser.getNickName();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public SysUser selectUserByNickName(String nickName) {
|
||||||
|
return baseMapper.selectUserByNickName(nickName);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -192,6 +192,11 @@
|
|||||||
where u.del_flag = '0' and u.email = #{email}
|
where u.del_flag = '0' and u.email = #{email}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
<select id="selectUserByNickName" parameterType="String" resultMap="SysUserResult">
|
||||||
|
<include refid="selectUserVo"/>
|
||||||
|
where u.del_flag = '0' and u.nick_name = #{nickName}
|
||||||
|
</select>
|
||||||
|
|
||||||
<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
|
<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
|
||||||
<include refid="selectUserVo"/>
|
<include refid="selectUserVo"/>
|
||||||
where u.del_flag = '0' and u.user_id = #{userId}
|
where u.del_flag = '0' and u.user_id = #{userId}
|
||||||
|
|||||||
Reference in New Issue
Block a user