From 5fce4e825f5d1726a4202f6cb8b659cbf7fb52e2 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 14 一月 2025 16:28:51 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 233 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 211 insertions(+), 22 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
index 35c2bcd..e28674b 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -1,7 +1,12 @@
package com.ruoyi.system.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.account.api.feignClient.AppUserClient;
+import com.ruoyi.account.api.feignClient.AppUserShopClient;
+import com.ruoyi.account.api.model.AppUser;
+import com.ruoyi.account.api.model.AppUserShop;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.controller.BaseController;
@@ -10,11 +15,13 @@
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.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.model.LoginUser;
+import com.ruoyi.system.api.model.UserShop;
import com.ruoyi.system.api.query.ChangeUserQuery;
import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.query.GetSysUserList;
@@ -24,11 +31,13 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
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.*;
import javax.annotation.Resource;
+import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
@@ -65,6 +74,21 @@
@Resource
private ISysUserRoleService sysUserRoleService;
+ @Resource
+ private UserShopService userShopService;
+
+ @Resource
+ private TokenService tokenService;
+
+ @Autowired
+ private ISysMenuService menuService;
+
+ @Resource
+ private AppUserClient appUserClient;
+
+ @Resource
+ private AppUserShopClient appUserShopClient;
+
@@ -73,7 +97,7 @@
* 获取用户列表
*/
@GetMapping("/list")
- @ApiOperation(value = "获取系统用户列表", tags = {"管理后台-系统用户管理", "管理后台-角色管理"})
+ @ApiOperation(value = "获取系统用户列表", tags = {"管理后台-账号管理", "门店后台-部门管理"})
public AjaxResult list(GetSysUserList getSysUserList) {
PageInfo<SysUser> pageInfo = new PageInfo<>(getSysUserList.getPageCurr(), getSysUserList.getPageSize());
PageInfo<SysUser> page = userService.getList(pageInfo, getSysUserList);
@@ -84,7 +108,7 @@
* 获取用户选择列表
*/
@PostMapping("/getChangeUserList")
- @ApiOperation(value = "获取用户选择列表", tags = {"管理后台-获取用户选择列表"})
+ @ApiOperation(value = "获取用户选择列表", tags = {"管理后台-获取用户选择列表", "门店后台-部门管理"})
public AjaxResult<PageInfo<SysUser>> getChangeUserList(@RequestBody ChangeUserQuery query) {
return AjaxResult.success(userService.getChangeUserList(query));
}
@@ -94,10 +118,11 @@
*/
@Log(title = "用户管理", businessType = BusinessType.INSERT)
@PostMapping("/add")
- @ApiOperation(value = "添加系统用户", tags = {"管理后台-系统用户管理"})
- @GlobalTransactional(rollbackFor = Exception.class)//分布式事务
+ @ApiOperation(value = "添加系统用户", tags = {"管理后台-账号管理", "门店后台-部门管理"})
public AjaxResult add(@RequestBody SysUser user) {
user.setUserName(user.getPhonenumber());
+ Long userid = tokenService.getLoginUser().getUserid();
+ SysUser sysUser1 = userService.getById(userid);
if(!org.springframework.util.StringUtils.hasLength(user.getNickName())){
user.setNickName(user.getPhonenumber());
}
@@ -107,20 +132,71 @@
if (StringUtils.isNotEmpty(user.getUserName()) && !userService.checkUserNameUnique(user)) {
return error("登录账号重复");
}
- user.setCreateBy(SecurityUtils.getUsername());
- user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
- user.setRoleType(1);
- userService.insertUser(user);
- SysUserRole sysUserRole = new SysUserRole();
- sysUserRole.setRoleId(user.getRoleId());
- sysUserRole.setUserId(user.getUserId());
- userRoleService.insertSysUserRole(sysUserRole);
+ //门店员工添加数据，需要判断账号是否存在，共用同一个账号
+ if(2 == sysUser1.getRoleType()){
+ AppUser appUser = appUserClient.getAppUserByPhone1(user.getPhonenumber()).getData();
+ if(null == appUser){
+ return error("请先注册小程序账号");
+ }
+ SysUser one = userService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUserName, user.getPhonenumber())
+ .eq(SysUser::getDelFlag, "0").eq(SysUser::getStatus, "0").eq(SysUser::getRoleType, 2));
+ if(null == one){
+ user.setCreateBy(SecurityUtils.getUsername());
+ user.setPassword(SecurityUtils.encryptPassword("a123456"));
+ user.setRoleType(sysUser1.getRoleType());
+ user.setObjectId(sysUser1.getObjectId());
+ if(null != appUser){
+ user.setAppUserId(appUser.getId());
+ }
+ userService.insertUser(user);
+ one = user;
+ SysUserRole sysUserRole = new SysUserRole();
+ sysUserRole.setRoleId(user.getRoleId());
+ sysUserRole.setUserId(user.getUserId());
+ userRoleService.insertSysUserRole(sysUserRole);
+
+ }
+ //添加小程序店员关系数据
+ if(null != appUser){
+ List<AppUserShop> data = appUserShopClient.getAppUserShop(appUser.getId()).getData();
+ Optional<AppUserShop> first = data.stream().filter(s -> s.getShopId().equals(sysUser1.getObjectId())).findFirst();
+ if(!first.isPresent()){
+ AppUserShop appUserShop = new AppUserShop();
+ appUserShop.setAppUserId(appUser.getId());
+ appUserShop.setShopId(sysUser1.getObjectId());
+ appUserShop.setRoleType(2);
+ appUserShopClient.saveAppUserShop(appUserShop);
+ appUser.setUserType(2);
+ appUserClient.editAppUserById(appUser);
+ }
+ }
+
+ //添加门店员工关系数据
+ UserShop userShop = new UserShop();
+ userShop.setUserId(one.getUserId());
+ userShop.setShopId(sysUser1.getObjectId());
+ userShop.setRoleType(2);
+ userShop.setRoleId(user.getRoleId());
+ userShop.setDeptId(user.getDeptId());
+ userShop.setNickName(user.getNickName());
+ userShop.setCreateTime(LocalDateTime.now());
+ userShopService.save(userShop);
+ }else{
+ user.setCreateBy(SecurityUtils.getUsername());
+ user.setPassword(SecurityUtils.encryptPassword("a123456"));
+ user.setRoleType(sysUser1.getRoleType());
+ userService.insertUser(user);
+ SysUserRole sysUserRole = new SysUserRole();
+ sysUserRole.setRoleId(user.getRoleId());
+ sysUserRole.setUserId(user.getUserId());
+ userRoleService.insertSysUserRole(sysUserRole);
+ }
return AjaxResult.success();
}
@GetMapping("/verifyUserNameRepeat/{username}")
- @ApiOperation(value = "校验账号是否重复", tags = {"管理后台-系统用户管理"})
+ @ApiOperation(value = "校验账号是否重复", tags = {"管理后台-账号管理"})
public AjaxResult verifyUserNameRepeat(@PathVariable String username){
SysUser user = new SysUser();
user.setUserName(username);
@@ -138,7 +214,7 @@
/**
* 根据用户编号获取详细信息
*/
- @ApiOperation(value = "获取用户详情", tags = {"管理后台-系统用户管理"})
+ @ApiOperation(value = "获取用户详情", tags = {"管理后台-账号管理", "门店后台-部门管理"})
@GetMapping("/getInfo/{userId}")
public AjaxResult getInfo(@PathVariable Long userId) {
userService.checkUserDataScope(userId);
@@ -148,7 +224,18 @@
ajax.put("posts", postService.selectPostAll());
if (StringUtils.isNotNull(userId)) {
SysUser sysUser = userService.selectUserById(userId);
- ajax.put(AjaxResult.DATA_TAG, sysUser);
+ if(sysUser.getRoleType() == 2){
+ Long userid = tokenService.getLoginUser().getUserid();
+ SysUser sysUser1 = userService.selectUserById(userid);
+ UserShop one = userShopService.getOne(new LambdaQueryWrapper<UserShop>().eq(UserShop::getUserId, sysUser.getUserId()).eq(UserShop::getShopId, sysUser1.getObjectId()));
+ sysUser.setDeptId(one.getDeptId());
+ sysUser.setNickName(one.getNickName());
+ SysDept sysDept = deptService.selectDeptById(one.getDeptId());
+ sysUser.setDept(sysDept);
+ sysUser.setRoleId(one.getRoleId());
+ }
+
+ ajax.put("data", sysUser);
ajax.put("postIds", postService.selectPostListByUserId(userId));
ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
}
@@ -161,8 +248,7 @@
*/
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
@PutMapping("/update")
- @ApiOperation(value = "编辑系统用户", tags = {"管理后台-系统用户管理"})
- @GlobalTransactional(rollbackFor = Exception.class)//分布式事务
+ @ApiOperation(value = "编辑系统用户", tags = {"管理后台-账号管理", "门店后台-部门管理"})
public AjaxResult edit(@Validated @RequestBody SysUser user) {
user.setUserName(user.getPhonenumber());
if(!org.springframework.util.StringUtils.hasLength(user.getNickName())){
@@ -203,6 +289,18 @@
user.setUpdateBy(SecurityUtils.getUsername());
user.setUpdateTime(new Date());
userService.updateUser(user);
+ user = userService.getById(user.getUserId());
+ //添加门店员工关系数据
+ if(2 == user.getRoleType()){
+ UserShop one = userShopService.getOne(new LambdaQueryWrapper<UserShop>().eq(UserShop::getUserId, user.getUserId()).eq(UserShop::getShopId, user.getObjectId()));
+ one.setUserId(user.getUserId());
+ one.setShopId(user.getObjectId());
+ one.setRoleType(one.getRoleType());
+ one.setRoleId(user.getRoleId());
+ one.setDeptId(user.getDeptId());
+ one.setNickName(user.getNickName());
+ userShopService.updateById(one);
+ }
return success();
}
@@ -212,7 +310,7 @@
*/
@Log(title = "用户管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{userIds}")
- @ApiOperation(value = "删除系统用户", tags = {"管理后台-系统用户管理"})
+ @ApiOperation(value = "删除系统用户", tags = {"管理后台-账号管理", "门店后台-部门管理"})
public AjaxResult remove(@PathVariable Long[] userIds) {
if (ArrayUtils.contains(userIds, SecurityUtils.getUserId())) {
return error("当前用户不能删除");
@@ -224,7 +322,7 @@
@PostMapping("/shopUserStart")
- @ApiOperation(value = "账号管理--禁用/启用", tags = {"管理后台-系统用户管理"})
+ @ApiOperation(value = "账号管理--禁用/启用", tags = {"管理后台-账号管理", "门店后台-部门管理"})
public AjaxResult shopUserStart(@RequestBody ShopUserStart shopUserStart) {
if (shopUserStart.getUserId() == null) {
return AjaxResult.error("userId不能为空");
@@ -300,7 +398,7 @@
}
// 角色集合
Set<String> roles = permissionService.getRolePermission(sysUser);
- // 权限集合
+ // 权限集合getRolePermission
Set<String> permissions = permissionService.getMenuPermission(sysUser);
LoginUser sysUserVo = new LoginUser();
sysUserVo.setSysUser(sysUser);
@@ -350,11 +448,11 @@
*/
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
@PutMapping("/resetPwd")
- @ApiOperation(value = "重置密码", tags = {"管理后台-系统用户管理"})
+ @ApiOperation(value = "重置密码", tags = {"管理后台-账号管理", "门店后台-部门管理"})
public AjaxResult resetPwd(@RequestBody SysUser user) {
userService.checkUserAllowed(user);
userService.checkUserDataScope(user.getUserId());
- user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+ user.setPassword(SecurityUtils.encryptPassword("a123456"));
user.setUpdateBy(SecurityUtils.getUsername());
return toAjax(userService.resetPwd(user));
}
@@ -474,6 +572,8 @@
public R<SysUser> queryUserByUserName(@RequestBody String userName){
SysUser user = userService.getOne(Wrappers.lambdaQuery(SysUser.class)
.eq(SysUser::getUserName, userName)
+ .eq(SysUser::getDelFlag, "0")
+ .eq(SysUser::getStatus, 0)
.last("LIMIT 1"));
return R.ok(user);
}
@@ -528,4 +628,93 @@
public SysUser getSysUserById(@RequestParam("userId") Long userId){
return userService.getById(userId);
}
+
+
+ /**
+ * 保存门店员工管理后台账号
+ * @param user
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/saveShopUser")
+ public R<Long> saveShopUser(@RequestBody SysUser user){
+ SysUser one = userService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getPhonenumber, user.getPhonenumber()).eq(SysUser::getDelFlag, "0")
+ .eq(SysUser::getStatus, "0").eq(SysUser::getRoleType, 2).eq(SysUser::getAppUserId, user.getAppUserId()));
+ if(null == one){
+ user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+ userService.save(user);
+ //添加用户角色数据
+ SysUserRole userRole = new SysUserRole();
+ userRole.setUserId(user.getUserId());
+ userRole.setRoleId(2L);
+ userRoleService.save(userRole);
+ }
+ return R.ok(user.getUserId());
+ }
+
+
+ /**
+ * 删除门店管理员账号
+ * @param objectId
+ * @param roleType
+ * @return
+ */
+ @PostMapping("/user/delShopUser")
+ public R delShopUser(@RequestParam("objectId") Integer objectId, @RequestParam("roleType") Integer roleType){
+ List<SysUser> list = userService.list(new LambdaUpdateWrapper<SysUser>().eq(SysUser::getObjectId, objectId).eq(SysUser::getRoleType, roleType)
+ .eq(SysUser::getDelFlag, "0").eq(SysUser::getStatus, "0"));
+ for (SysUser sysUser : list) {
+ List<UserShop> list1 = userShopService.list(new LambdaUpdateWrapper<UserShop>().eq(UserShop::getUserId, sysUser.getUserId()));
+ List<Integer> collect = list1.stream().map(UserShop::getShopId).collect(Collectors.toList());
+ if(collect.contains(objectId) && collect.size() == 1){
+ sysUser.setDelFlag("2");
+ userService.updateById(sysUser);
+ }
+ if(sysUser.getObjectId().equals(objectId) && collect.size() > 1){
+ Integer integer = collect.stream().filter(s -> !s.equals(sysUser.getObjectId())).findFirst().get();
+ sysUser.setObjectId(integer);
+ userService.updateById(sysUser);
+ }
+ userShopService.remove(new LambdaUpdateWrapper<UserShop>().eq(UserShop::getUserId, sysUser.getUserId()).eq(UserShop::getShopId, objectId));
+ }
+ return R.ok();
+ }
+
+
+
+ @ResponseBody
+ @PutMapping("/switchShop/{shopId}")
+ @ApiOperation(value = "切换门店", tags = {"门店后台-首页"})
+ public R<Set<String>> switchShop(@PathVariable("shopId") Integer shopId){
+ Long userid = tokenService.getLoginUser().getUserid();
+ UserShop one = userShopService.getOne(new LambdaQueryWrapper<UserShop>().eq(UserShop::getUserId, userid).eq(UserShop::getShopId, shopId));
+ if(null == one){
+ return R.fail("切换失败");
+ }
+ SysUser sysUser = userService.getById(userid);
+ sysUser.setObjectId(shopId);
+ userService.updateById(sysUser);
+ //查询用户权限列表
+ Long roleId = one.getRoleId();
+ Set<String> rolePerms = menuService.selectMenuPermsByRoleId(roleId);
+ return R.ok(rolePerms);
+ }
+
+
+
+ /**
+ * 通过账号和账号权限查询用户
+ * @param userName
+ * @return
+ */
+ @PostMapping("/queryUserByUserNameAndRoleType")
+ public R<SysUser> queryUserByUserNameAndRoleType(@RequestParam("roleType") String userName, @RequestParam("roleType") Integer roleType){
+ SysUser user = userService.getOne(Wrappers.lambdaQuery(SysUser.class)
+ .eq(SysUser::getUserName, userName)
+ .eq(SysUser::getDelFlag, "0")
+ .eq(SysUser::getStatus, 0)
+ .eq(SysUser::getRoleType, roleType)
+ .last("LIMIT 1"));
+ return R.ok(user);
+ }
}
--
Gitblit v1.7.1