From 60f70f7409ec1ece8905e088fb43e0cb0258a70b Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 19 十二月 2024 10:10:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 76 ++++++++++++++++++++++++++++++-------
1 files changed, 61 insertions(+), 15 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 f6bf757..03bb721 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
@@ -10,13 +10,15 @@
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.SysUserRole;
+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;
import com.ruoyi.system.query.ShopUserStart;
import com.ruoyi.system.service.*;
@@ -65,6 +67,12 @@
@Resource
private ISysUserRoleService sysUserRoleService;
+ @Resource
+ private UserShopService userShopService;
+
+ @Resource
+ private TokenService tokenService;
+
@@ -73,7 +81,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 +92,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 +102,14 @@
*/
@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(sysUser1.getRoleType() == 2){
+ user.setObjectId(sysUser1.getObjectId());
+ }
if(!org.springframework.util.StringUtils.hasLength(user.getNickName())){
user.setNickName(user.getPhonenumber());
}
@@ -108,7 +120,7 @@
return error("登录账号重复");
}
user.setCreateBy(SecurityUtils.getUsername());
- user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+ user.setPassword(SecurityUtils.encryptPassword("a123456"));
user.setRoleType(1);
userService.insertUser(user);
SysUserRole sysUserRole = new SysUserRole();
@@ -120,7 +132,7 @@
@GetMapping("/verifyUserNameRepeat/{username}")
- @ApiOperation(value = "校验账号是否重复", tags = {"管理后台-系统用户管理"})
+ @ApiOperation(value = "校验账号是否重复", tags = {"管理后台-账号管理"})
public AjaxResult verifyUserNameRepeat(@PathVariable String username){
SysUser user = new SysUser();
user.setUserName(username);
@@ -138,7 +150,7 @@
/**
* 根据用户编号获取详细信息
*/
- @ApiOperation(value = "获取用户详情", tags = {"管理后台-系统用户管理"})
+ @ApiOperation(value = "获取用户详情", tags = {"管理后台-账号管理", "门店后台-部门管理"})
@GetMapping("/getInfo/{userId}")
public AjaxResult getInfo(@PathVariable Long userId) {
userService.checkUserDataScope(userId);
@@ -148,7 +160,7 @@
ajax.put("posts", postService.selectPostAll());
if (StringUtils.isNotNull(userId)) {
SysUser sysUser = userService.selectUserById(userId);
- ajax.put(AjaxResult.DATA_TAG, sysUser);
+ ajax.put("data", sysUser);
ajax.put("postIds", postService.selectPostListByUserId(userId));
ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
}
@@ -161,8 +173,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())){
@@ -212,7 +223,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 +235,7 @@
@PostMapping("/shopUserStart")
- @ApiOperation(value = "账号管理--禁用/启用", tags = {"管理后台-系统用户管理"})
+ @ApiOperation(value = "账号管理--禁用/启用", tags = {"管理后台-账号管理", "门店后台-部门管理"})
public AjaxResult shopUserStart(@RequestBody ShopUserStart shopUserStart) {
if (shopUserStart.getUserId() == null) {
return AjaxResult.error("userId不能为空");
@@ -350,11 +361,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));
}
@@ -528,4 +539,39 @@
public SysUser getSysUserById(@RequestParam("userId") Long userId){
return userService.getById(userId);
}
+
+
+ /**
+ * 保存门店员工管理后台账号
+ * @param user
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/saveShopUser")
+ public R saveShopUser(@RequestBody SysUser user){
+ Integer shopId = user.getObjectId();
+ 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.setObjectId(null);
+ user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+ userService.save(user);
+ //添加用户角色数据
+ SysUserRole userRole = new SysUserRole();
+ userRole.setUserId(user.getUserId());
+ userRole.setRoleId(2L);
+ userRoleService.save(userRole);
+ }else{
+ user = one;
+ }
+ //添加门店关系数据
+ UserShop userShop = userShopService.getOne(new LambdaQueryWrapper<UserShop>().eq(UserShop::getShopId, shopId).eq(UserShop::getUserId, user.getAppUserId()));
+ if(null == userShop){
+ userShop = new UserShop();
+ userShop.setUserId(user.getUserId().intValue());
+ userShop.setShopId(user.getObjectId());
+ userShopService.save(userShop);
+ }
+ return R.ok();
+ }
}
--
Gitblit v1.7.1