package com.ruoyi.system.controller;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
import com.ruoyi.common.core.domain.R;
|
import com.ruoyi.common.core.exception.ServiceException;
|
import com.ruoyi.common.core.utils.StringUtils;
|
import com.ruoyi.common.core.utils.page.BeanUtils;
|
import com.ruoyi.common.core.utils.page.PageDTO;
|
import com.ruoyi.common.core.utils.poi.ExcelUtil;
|
import com.ruoyi.common.core.web.controller.BaseController;
|
import com.ruoyi.common.core.web.domain.AjaxResult;
|
import com.ruoyi.common.core.web.page.PageInfo;
|
import com.ruoyi.common.log.annotation.Log;
|
import com.ruoyi.common.log.enums.BusinessType;
|
import com.ruoyi.common.security.annotation.InnerAuth;
|
import com.ruoyi.common.security.annotation.RequiresPermissions;
|
import com.ruoyi.common.security.service.TokenService;
|
import com.ruoyi.common.security.utils.SecurityUtils;
|
import com.ruoyi.system.api.domain.SysDept;
|
import com.ruoyi.system.api.domain.SysRole;
|
import com.ruoyi.system.api.domain.SysUser;
|
import com.ruoyi.system.api.domain.getVolumeProductionRkQuery;
|
import com.ruoyi.system.api.feignClient.ManagementClient;
|
import com.ruoyi.system.api.model.LoginUser;
|
import com.ruoyi.system.api.validate.InsertGroup;
|
import com.ruoyi.system.api.validate.UpdateGroup;
|
import com.ruoyi.system.domain.SysUserRole;
|
import com.ruoyi.system.domain.dto.*;
|
import com.ruoyi.system.domain.vo.ConservatorVO;
|
import com.ruoyi.system.domain.vo.SupplierVO;
|
import com.ruoyi.system.service.ISysConfigService;
|
import com.ruoyi.system.service.ISysDeptService;
|
import com.ruoyi.system.service.ISysPermissionService;
|
import com.ruoyi.system.service.ISysPostService;
|
import com.ruoyi.system.service.ISysRoleService;
|
import com.ruoyi.system.service.ISysUserRoleService;
|
import com.ruoyi.system.service.ISysUserService;
|
import io.swagger.annotations.Api;
|
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiParam;
|
import java.io.IOException;
|
import java.util.Date;
|
import java.util.List;
|
import java.util.Objects;
|
import java.util.Set;
|
import java.util.stream.Collectors;
|
import javax.annotation.Resource;
|
import javax.servlet.http.HttpServletResponse;
|
import org.apache.commons.lang3.ArrayUtils;
|
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.validation.annotation.Validated;
|
import org.springframework.web.bind.annotation.DeleteMapping;
|
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.PathVariable;
|
import org.springframework.web.bind.annotation.PostMapping;
|
import org.springframework.web.bind.annotation.PutMapping;
|
import org.springframework.web.bind.annotation.RequestBody;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.RequestParam;
|
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.multipart.MultipartFile;
|
|
/**
|
* 用户信息
|
*
|
* @author ruoyi
|
*/
|
@RestController
|
@RequestMapping("/user")
|
@Api(tags = "用户信息")
|
public class SysUserController extends BaseController {
|
@Autowired
|
private ISysUserService userService;
|
@Resource
|
private TokenService tokenService;
|
@Autowired
|
private ISysRoleService roleService;
|
|
@Autowired
|
private ISysDeptService deptService;
|
|
@Autowired
|
private ISysPostService postService;
|
|
@Autowired
|
private ISysPermissionService permissionService;
|
|
@Autowired
|
private ISysConfigService configService;
|
|
|
@Autowired
|
private ISysUserRoleService userRoleService;
|
|
@Autowired
|
private ISysUserRoleService sysUserRoleService;
|
@Autowired
|
private ManagementClient managementClient;
|
/**
|
* 获取用户列表
|
*/
|
@PostMapping("/list")
|
@ApiOperation("账号管理列表")
|
public AjaxResult list(@Validated @RequestBody SysUserQuery query) {
|
tokenService.getLoginUser();
|
PageInfo<SysUser> pageInfo = new PageInfo<>(query.getPageCurr(), query.getPageSize());
|
PageInfo<SysUser> page = userService.getList(pageInfo, query.getNickName(),
|
query.getPhonenumber(), query.getStatus(),query.getDeptId());
|
return AjaxResult.success(page);
|
}
|
|
/**
|
* 新增用户
|
*/
|
@Log(title = "账号管理", businessType = BusinessType.INSERT)
|
@PostMapping("/add")
|
@ApiOperation("添加账号")
|
@Transactional(rollbackFor = Exception.class)
|
public AjaxResult add(@Validated(InsertGroup.class) @RequestBody SysUserDTO dto) {
|
tokenService.getLoginUser();
|
SysUser user = BeanUtils.copyBean(dto, SysUser.class);
|
user.setUserId(null);
|
// 添加为平台管理员
|
user.setUserType("00");
|
user.setUserName(user.getPhonenumber());
|
if(!org.springframework.util.StringUtils.hasLength(user.getNickName())){
|
user.setNickName(user.getPhonenumber());
|
}
|
SysUser one = userService.getOne(new QueryWrapper<SysUser>()
|
.ne("user_type", "02")
|
.eq("phonenumber", dto.getPhonenumber())
|
.eq("del_flag", "0"));
|
if (one!=null){
|
if (one.getUserType().equals("03")){
|
return error("添加失败，该账号为仓库管理员账号");
|
}else{
|
return error("手机号已开通账号");
|
}
|
}
|
if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
|
return error("手机号已开通账号");
|
}
|
user.setCreateBy(SecurityUtils.getUsername());
|
user.setPassword(SecurityUtils.encryptPassword("a123456"));
|
user.setRoleType(1);
|
user.setDept(deptService.selectDeptById(dto.getDeptId()));
|
SysDept sysDept= deptService.selectDeptById(dto.getDeptId());
|
user.setDeptName(sysDept.getDeptName());
|
user.setDeptId(dto.getDeptId());
|
SysRole byId = roleService.selectRoleById(dto.getRoleId());
|
user.setRoleName(byId.getRoleName());
|
user.setRoleId(dto.getRoleId());
|
userService.save(user);
|
SysUserRole sysUserRole = new SysUserRole();
|
sysUserRole.setRoleId(dto.getRoleId());
|
sysUserRole.setUserId(user.getUserId());
|
int i1 = userRoleService.insertSysUserRole(sysUserRole);
|
return AjaxResult.success();
|
}
|
|
|
/**
|
* 根据用户编号获取详细信息
|
*/
|
@ApiOperation("账号详情")
|
@GetMapping("/{userId}")
|
public AjaxResult getInfo(
|
@ApiParam(value = "用户ID", required = true) @PathVariable(value = "userId", required = true) Long userId) {
|
tokenService.getLoginUser();
|
userService.checkUserDataScope(userId);
|
AjaxResult ajax = AjaxResult.success();
|
List<SysRole> roles = roleService.selectRoleAll();
|
ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
|
ajax.put("Dept", deptService.selectDeptList(null));
|
if (StringUtils.isNotNull(userId)) {
|
SysUser sysUser = userService.getById(userId);
|
ajax.put(AjaxResult.DATA_TAG, sysUser);
|
ajax.put("Dept", sysUser.getDept());
|
ajax.put("roleId", sysUser.getRoleId());
|
ajax.put("roleName", sysUser.getRoleName());
|
}
|
return ajax;
|
}
|
|
|
/**
|
* 修改用户
|
*/
|
@Log(title = "账号管理", businessType = BusinessType.UPDATE)
|
@PutMapping("/update")
|
@ApiOperation("编辑账号")
|
public AjaxResult edit(@Validated(UpdateGroup.class) @RequestBody SysUserDTO dto) {
|
tokenService.getLoginUser();
|
SysUser two = userService.getOne(new QueryWrapper<SysUser>()
|
.ne("user_type", "02")
|
.eq("phonenumber", dto.getPhonenumber())
|
.eq("del_flag", "0"));
|
if (two!=null){
|
if (two.getUserType().equals("03")){
|
return error("添加失败，该账号为仓库管理员账号");
|
}else{
|
return error("手机号已开通账号");
|
}
|
}
|
SysUser user = BeanUtils.copyBean(dto, SysUser.class);
|
user.setUserName(user.getPhonenumber());
|
if(!org.springframework.util.StringUtils.hasLength(user.getNickName())){
|
user.setNickName(user.getPhonenumber());
|
}
|
R<Integer> admin = this.isAdmin(user.getUserId());
|
Integer data = admin.getData();
|
if(data == null || data != 1){
|
SysUserRole one = sysUserRoleService.getOne(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, user.getUserId()));
|
one.setRoleId(dto.getRoleId());
|
sysUserRoleService.updateSysUserRole(one);
|
}
|
userService.checkUserAllowed(user);
|
userService.checkUserDataScope(user.getUserId());
|
SysUser sysUser = userService.getOne(Wrappers.lambdaQuery(SysUser.class)
|
.eq(SysUser::getPhonenumber, user.getPhonenumber())
|
.eq(SysUser::getDelFlag,0)
|
.last("LIMIT 1"));
|
|
if (StringUtils.isNotEmpty(user.getPhonenumber()) && (Objects.nonNull(sysUser) && !user.getUserId().equals(sysUser.getUserId()) )) {
|
return error("手机号已开通账号");
|
}
|
user.setUpdateBy(SecurityUtils.getUsername());
|
if (user.getPassword() != null && !"".equals(user.getPassword())) {
|
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
|
user.setPassWordUpdate(new Date());
|
}
|
if (user.getPhonenumber() != null) {
|
user.setUserName(user.getPhonenumber());
|
}
|
user.setPassword(null);
|
user.setUpdateBy(SecurityUtils.getUsername());
|
user.setUpdateTime(new Date());
|
user.setDept(deptService.selectDeptById(dto.getDeptId()));
|
SysDept sysDept= deptService.selectDeptById(dto.getDeptId());
|
user.setDeptName(sysDept.getDeptName());
|
user.setDeptId(dto.getDeptId());
|
SysRole byId = roleService.selectRoleById(dto.getRoleId());
|
user.setRoleName(byId.getRoleName());
|
user.setRoleId(dto.getRoleId());
|
// 原来的role
|
SysUserRole one = userRoleService.getOne(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId,dto.getUserId() ));
|
one.setRoleId(dto.getRoleId());
|
//更新新的role
|
userRoleService.updateSysUserRole(one);
|
return toAjax(userService.updateById(user));
|
}
|
|
|
/**
|
* 删除用户
|
*/
|
@Log(title = "账号管理", businessType = BusinessType.DELETE)
|
@DeleteMapping("/{userIds}")
|
@ApiOperation("删除账号")
|
public AjaxResult remove(@PathVariable Long[] userIds) {
|
if (ArrayUtils.contains(userIds, SecurityUtils.getUserId())) {
|
return error("当前用户不能删除");
|
}
|
return toAjax(userService.deleteUserByIds(userIds));
|
}
|
|
@PostMapping("/updStatus/{userId}")
|
@ApiOperation("账号管理--冻结/解冻")
|
public AjaxResult updStatus(
|
@ApiParam(value = "账号ID", required = true) @PathVariable("userId") Long userId) {
|
if (userId == null) {
|
return AjaxResult.error("userId不能为空");
|
}
|
SysUser sysUser = userService.selectUserById(userId);
|
if (sysUser.getStatus().equals("0")) {
|
sysUser.setStatus("1");
|
} else {
|
sysUser.setStatus("0");
|
}
|
return toAjax(userService.updateUser(sysUser));
|
}
|
|
|
@Autowired
|
private ISysUserRoleService iSysUserRoleService;
|
|
@PostMapping("/getUserList")
|
public R<List<SysUser>> getUserList(@RequestBody List<Integer> userIds) {
|
List<SysUser> list = userService.list(new LambdaQueryWrapper<SysUser>().in(SysUser::getUserId, userIds));
|
return R.ok(list);
|
}
|
|
|
@PostMapping("/isAdmin")
|
public R<Integer> isAdmin(@RequestBody Long userId){
|
SysUserRole one = sysUserRoleService.getOne(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, userId));
|
Long id =one.getRoleId();
|
return R.ok(id.intValue());
|
}
|
|
@PostMapping("/getSysUser")
|
public R<SysUser> getSysUser(@RequestBody Long userId) {
|
try {
|
SysUser sysUser = userService.selectUserById(userId);
|
return R.ok(sysUser);
|
} catch (Exception e) {
|
e.printStackTrace();
|
return R.ok();
|
}
|
}
|
|
@PostMapping("/getUserSupplierList")
|
public R<List<SysUser>> getUserSupplierList(@RequestBody getVolumeProductionRkQuery getVolumeProductionRkQuery) {
|
LambdaQueryWrapper<SysUser> like1 = new LambdaQueryWrapper<SysUser>();
|
if (getVolumeProductionRkQuery.getSupplierName()!=null){
|
like1.like(SysUser::getNickName, getVolumeProductionRkQuery.getSupplierName());
|
}if (getVolumeProductionRkQuery.getSupplierPhone()!=null){
|
like1.like(SysUser::getPhonenumber,getVolumeProductionRkQuery.getSupplierPhone());
|
}
|
List<SysUser> list = userService.list(like1);
|
return R.ok(list);
|
}
|
|
@PostMapping("/updateSysUser")
|
public R<Boolean> updateSysUser(@RequestBody SysUser sysUser) {
|
try {
|
sysUser.setUpdateBy(SecurityUtils.getUsername());
|
sysUser.setUpdateTime(new Date());
|
userService.updateUser(sysUser);
|
return R.ok(true);
|
} catch (Exception e) {
|
e.printStackTrace();
|
return R.ok();
|
}
|
}
|
|
|
@Log(title = "用户管理", businessType = BusinessType.EXPORT)
|
@PostMapping("/export")
|
public void export(HttpServletResponse response, SysUser user) {
|
List<SysUser> list = userService.selectUserList(user);
|
ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
|
util.exportExcel(response, list, "用户数据");
|
}
|
|
@PostMapping("/importTemplate")
|
public void importTemplate(HttpServletResponse response) throws IOException {
|
ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
|
util.importTemplateExcel(response, "用户数据");
|
}
|
|
@Log(title = "用户管理", businessType = BusinessType.IMPORT)
|
@PostMapping("/importData")
|
public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
|
ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
|
List<SysUser> userList = util.importExcel(file.getInputStream());
|
String operName = SecurityUtils.getUsername();
|
String message = userService.importUser(userList, updateSupport, operName);
|
return success(message);
|
}
|
|
/**
|
* 获取当前用户信息
|
*/
|
@InnerAuth
|
@GetMapping("/info/{username}")
|
public R<LoginUser> info(@PathVariable("username") String username) {
|
SysUser sysUser = userService.selectUserByUserName(username);
|
if (StringUtils.isNull(sysUser)) {
|
return R.fail("用户名或密码错误");
|
}
|
String data = managementClient.isHaveCKZY(sysUser.getUserId().toString()).getData();
|
LoginUser sysUserVo = new LoginUser();
|
sysUser.setIsHaveCk(data);
|
sysUserVo.setSysUser(sysUser);
|
if (sysUser.getUserType().equals("00")) {
|
// 角色集合
|
Set<String> roles = permissionService.getRolePermission(sysUser);
|
// 权限集合
|
Set<String> permissions = permissionService.getMenuPermission(sysUser);
|
sysUserVo.setRoles(roles);
|
sysUserVo.setPermissions(permissions);
|
}
|
return R.ok(sysUserVo);
|
}
|
|
/**
|
* 注册用户信息
|
*/
|
@InnerAuth
|
@PostMapping("/register")
|
public R<SysUser> register(@RequestBody SysUser sysUser) {
|
String username = sysUser.getUserName();
|
if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) {
|
return R.fail("当前系统没有开启注册功能！");
|
}
|
if (!userService.checkUserNameUnique(sysUser)) {
|
return R.fail("保存用户'" + username + "'失败，注册账号已存在");
|
}
|
return R.ok(userService.registerUser(sysUser));
|
}
|
|
@PostMapping("/registerUser")
|
public R<SysUser> registerUser(@RequestBody SysUser sysUser){
|
sysUser = userService.registerUser(sysUser);
|
return R.ok(sysUser);
|
}
|
|
|
/**
|
* 获取用户信息
|
*
|
* @return 用户信息
|
*/
|
@GetMapping("/getInfo")
|
public AjaxResult getInfo() {
|
SysUser user = userService.selectUserById(SecurityUtils.getUserId());
|
// 角色集合
|
Set<String> roles = permissionService.getRolePermission(user);
|
// 权限集合
|
Set<String> permissions = permissionService.getMenuPermission(user);
|
AjaxResult ajax = AjaxResult.success();
|
ajax.put("user", user);
|
ajax.put("roles", roles);
|
ajax.put("permissions", permissions);
|
return ajax;
|
}
|
|
|
/**
|
* 重置密码
|
*/
|
@ApiOperation("重置密码")
|
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
|
@PostMapping("/resetPwd")
|
public AjaxResult resetPwd(@RequestBody ResetPwdDTO dto) {
|
SysUser user = userService.lambdaQuery().eq(SysUser::getUserId, dto.getUserId())
|
.in(SysUser::getUserType, "00", "01", "02", "03").one();
|
if (StringUtils.isNull(user)) {
|
throw new ServiceException("账号不存在");
|
}
|
userService.checkUserAllowed(user);
|
userService.checkUserDataScope(user.getUserId());
|
user.setPassword(SecurityUtils.encryptPassword("a123456"));
|
user.setUpdateBy(SecurityUtils.getUsername());
|
return toAjax(userService.resetPwd(user));
|
}
|
|
@ApiOperation("修改密码")
|
@PostMapping("/updatePwd")
|
public AjaxResult updatePwd(@RequestBody ResetPwdDTO dto) {
|
// 判断旧密码是否和当前密码是否匹配
|
SysUser one = userService.getOne(new QueryWrapper<SysUser>()
|
.eq("phonenumber", dto.getPhonenumber())
|
.eq("del_flag", 0));
|
if (one == null){
|
return AjaxResult.error("账号不存在");
|
}
|
if (SecurityUtils.matchesPassword(dto.getPassword(),one.getPassword())) {
|
return AjaxResult.error("新密码不能和旧密码一致");
|
}
|
if (!SecurityUtils.matchesPassword(dto.getOldPassword(),one.getPassword())){
|
return AjaxResult.error("旧密码错误");
|
}
|
one.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
|
userService.updateById(one);
|
return AjaxResult.success();
|
}
|
|
|
/**
|
* 获取当前用户信息
|
*/
|
@InnerAuth
|
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
|
@PutMapping("/change-password")
|
public R<LoginUser> info(@RequestParam("username") String username,
|
@RequestParam("password") String password) {
|
SysUser user = userService.selectUserByUserName(username);
|
user.setPassword(password);
|
user.setUpdateBy(SecurityUtils.getUsername());
|
int i = userService.updateUser(user);
|
if (i == 1) {
|
return R.ok();
|
} else {
|
return R.fail();
|
}
|
}
|
/**
|
* 状态修改
|
*/
|
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
|
@PutMapping("/changeStatus")
|
public AjaxResult changeStatus(@RequestBody SysUser user) {
|
userService.checkUserAllowed(user);
|
userService.checkUserDataScope(user.getUserId());
|
user.setUpdateBy(SecurityUtils.getUsername());
|
return toAjax(userService.updateUserStatus(user));
|
}
|
|
/**
|
* 根据用户编号获取授权角色
|
*/
|
@GetMapping("/authRole/{userId}")
|
public AjaxResult authRole(@PathVariable("userId") Long userId) {
|
AjaxResult ajax = AjaxResult.success();
|
SysUser user = userService.selectUserById(userId);
|
List<SysRole> roles = roleService.selectRolesByUserId(userId);
|
ajax.put("user", user);
|
ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
|
return ajax;
|
}
|
|
/**
|
* 用户授权角色
|
*/
|
@Log(title = "用户管理", businessType = BusinessType.GRANT)
|
@PutMapping("/authRole")
|
public AjaxResult insertAuthRole(Long userId, Long[] roleIds) {
|
userService.checkUserDataScope(userId);
|
userService.insertUserAuth(userId, roleIds);
|
return success();
|
}
|
|
/**
|
* 获取部门树列表
|
*/
|
@GetMapping("/deptTree")
|
public AjaxResult deptTree(SysDept dept) {
|
return success(deptService.selectDeptTreeList(dept));
|
}
|
|
@PostMapping("/updateUser")
|
public R<Boolean> updateUser(@RequestBody SysUser sysUser){
|
return R.ok(userService.updateById(sysUser));
|
}
|
|
/**
|
* 通过用户id查询角色对象
|
* @param userId
|
* @return
|
*/
|
@GetMapping("/queryRoleByUserId/{userId}")
|
public R<SysRole> queryRoleByUserId(@PathVariable("userId") Long userId){
|
SysUserRole one = sysUserRoleService.getOne(Wrappers.lambdaQuery(SysUserRole.class)
|
.eq(SysUserRole::getUserId, userId)
|
.last("LIMIT 1"));
|
System.out.println("通过用户id查询角色对象"+one);
|
if(Objects.nonNull(one)){
|
SysRole byId = roleService.getOne(Wrappers.lambdaQuery(SysRole.class)
|
.eq(SysRole::getRoleId,one.getRoleId())
|
.last("LIMIT 1"));
|
return R.ok(byId);
|
}
|
return R.ok();
|
}
|
|
|
@GetMapping("/queryRoleByRoleId/{roleId}")
|
public R<SysRole> queryRoleByRoleId(@PathVariable("roleId") Long roleId){
|
return R.ok( roleService.getOne(Wrappers.lambdaQuery(SysRole.class)
|
.eq(SysRole::getRoleId, roleId)
|
.last("LIMIT 1")));
|
}
|
|
/**
|
* 通过手机号集合查询用户
|
* @param phoneList
|
* @return
|
*/
|
@PostMapping("/queryUserByPhoneList")
|
public R<List<SysUser>> queryUserByPhoneList(@RequestBody List<String> phoneList){
|
List<SysUser> list = userService.list(Wrappers.lambdaQuery(SysUser.class)
|
.in(SysUser::getPhonenumber, phoneList)
|
.ne(SysUser::getDelFlag,2));
|
return R.ok(list);
|
}
|
|
/**
|
* 通过手机号查询用户
|
* @param phone
|
* @return
|
*/
|
@PostMapping("/queryUserByPhone")
|
public R<SysUser> queryUserByPhone(@RequestBody String phone){
|
SysUser user = userService.getOne(Wrappers.lambdaQuery(SysUser.class)
|
.eq(SysUser::getPhonenumber, phone)
|
.last("LIMIT 1"));
|
return R.ok(user);
|
}
|
|
// @PostMapping("/queryUserByPhone1")
|
// public R<SysUser> queryUserByPhone1(@RequestBody String phone){
|
// SysUser user = userService.getOne(Wrappers.lambdaQuery(SysUser.class)
|
// .eq(SysUser::getPhonenumber, phone)
|
// .eq(SysUser::get, phone)
|
// .last("LIMIT 1"));
|
// return R.ok(user);
|
// }
|
|
|
/**
|
* 通过账号查询用户
|
* @param userName
|
* @return
|
*/
|
@PostMapping("/queryUserByUserName")
|
public R<SysUser> queryUserByUserName(@RequestBody String userName){
|
SysUser user = userService.getOne(Wrappers.lambdaQuery(SysUser.class)
|
.eq(SysUser::getUserName, userName)
|
.last("LIMIT 1"));
|
return R.ok(user);
|
}
|
|
/**
|
* 获取供应商分页列表
|
*
|
* @param query 供应商列表查询数据传输对象
|
* @return PageDTO<SupplyUserVO>
|
*/
|
@ApiOperation(value = "获取供应商分页列表", notes = "获取供应商分页列表")
|
@PostMapping("/supplier-page")
|
public R<PageDTO<SupplierVO>> getSupplierPage(@Validated @RequestBody SupplierQuery query) {
|
return R.ok(userService.getSupplierPage(query));
|
}
|
|
|
@ApiOperation(value = "获取供应商不分页列表", notes = "获取供应商不分页列表")
|
@PostMapping("/supplier-page1")
|
public R<List<SysUser>> getSupplierPage1() {
|
return R.ok(userService.getSupplierPage1());
|
}
|
|
/**
|
* 添加/编辑供应商
|
*
|
* @param dto 供应商数据传输对象
|
*/
|
@Log(title = "供应商管理", businessType = BusinessType.UPDATE)
|
@ApiOperation(value = "添加/编辑供应商", notes = "添加/编辑供应商")
|
@PostMapping("/save-supplier")
|
public R<?> saveSupplier(@Validated @RequestBody SupplierDTO dto) {
|
userService.saveSupplier(dto);
|
return R.ok();
|
}
|
|
/**
|
* 删除供应商
|
*
|
* @param id 供应商id
|
*/
|
@ApiOperation(value = "删除供应商", notes = "删除供应商")
|
@DeleteMapping("/delete-supplier/{id}")
|
public R<?> deleteSupplier(@PathVariable("id") Long id) {
|
userService.deleteSupplier(id);
|
return R.ok();
|
}
|
|
|
@ApiOperation(value = "获取仓库管理员分页列表", notes = "获取仓库管理分页列表")
|
@PostMapping("/conservator-page")
|
public R<PageDTO<ConservatorVO>> getConservatorPage(@Validated @RequestBody ConservatorQuery query) {
|
return R.ok(userService.getConservatorPage(query));
|
}
|
@ApiOperation(value = "根据仓库等级和所在地获取管理员列表--不分页", notes = "获取仓库管理分页列表")
|
@PostMapping("/conservator-page2")
|
public R<List<SysUser>> getConservatorPage2(@RequestBody ConservatorQueryA query) {
|
tokenService.getLoginUser();
|
return R.ok(userService.getConservatorPage2(query));
|
}
|
|
@ApiOperation(value = "获取仓库管理员不分页列表", notes = "获取仓库管理分页列表")
|
@GetMapping("/conservator-page1/{grade}")
|
public R<List<SysUser>> getConservatorPage1(@PathVariable("grade") String grade) {
|
tokenService.getLoginUser();
|
return R.ok(userService.getConservatorPage1(grade));
|
}
|
|
/**
|
* 添加/编辑供应商
|
*
|
* @param dto 供应商数据传输对象
|
*/
|
@ApiOperation(value = "添加/编辑仓库管理", notes = "添加/编辑仓库管理")
|
@PostMapping("/save-conservator")
|
public R<?> saveConservator(@Validated @RequestBody ConservatorDTO dto) {
|
|
return userService.saveConservator(dto);
|
}
|
|
/**
|
* 删除供应商
|
*
|
* @param id 供应商id
|
*/
|
@ApiOperation(value = "删除仓库管理", notes = "删除仓库管理")
|
@DeleteMapping("/delete-conservator/{id}")
|
public R<?> deleteConservator(@PathVariable("id") Long id) {
|
userService.deleteConservator(id);
|
return R.ok();
|
}
|
|
@InnerAuth
|
@GetMapping("/list-by-name")
|
R<List<SysUser>> getUserListByName(@RequestBody SysUser sysUser) {
|
List<SysUser> list = userService.lambdaQuery()
|
.like(StringUtils.isNotBlank(sysUser.getNickName()), SysUser::getNickName,
|
sysUser.getNickName())
|
.like(StringUtils.isNotBlank(sysUser.getPhonenumber()), SysUser::getPhonenumber,
|
sysUser.getPhonenumber())
|
.eq(SysUser::getUserType, "00")
|
.eq(SysUser::getDelFlag, 0).list();
|
return R.ok(list);
|
}
|
}
|
