From 2308f4e5bf6eaf4a0351624c88933fb66a4020c5 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 13 八月 2025 19:00:37 +0800
Subject: [PATCH] 积分设置bug修改
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 114 ++++++++++++++++++++++-----------------------------------
1 files changed, 44 insertions(+), 70 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 39470bc..20828c9 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
@@ -32,6 +32,7 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -116,7 +117,7 @@
*/
@Log(title = "用户管理", businessType = BusinessType.INSERT)
@PostMapping("/add")
- @ApiOperation(value = "添加系统用户", tags = {"管理后台-账号管理", "门店后台-部门管理"})
+ @ApiOperation(value = "添加系统用户", tags = {"管理后台-账号管理"})
public AjaxResult add(@RequestBody SysUser user) {
user.setUserName(user.getPhonenumber());
Long userid = tokenService.getLoginUser().getUserid();
@@ -132,51 +133,7 @@
return error("登录账号重复");
}
//门店员工添加数据，需要判断账号是否存在，共用同一个账号
- if(2 == sysUser1.getRoleType()){
- AppUser appUser = appUserClient.getAppUserByPhone1(user.getPhonenumber()).getData();
- if(null == appUser){
- return error("请先注册小程序账号");
- }
- SysUser one2 = userService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUserName, user.getPhonenumber())
- .eq(SysUser::getDelFlag, "0").eq(SysUser::getStatus, "0").eq(SysUser::getObjectId, sysUser1.getObjectId())
- .eq(SysUser::getRoleType, 2));
- if(null != one2){
- 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(MD5Generator.generateMD5("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);
-
- }
-
- //添加门店员工关系数据
- UserShop one1 = userShopService.getOne(new LambdaQueryWrapper<UserShop>().eq(UserShop::getUserId, one.getUserId()).eq(UserShop::getShopId, sysUser1.getObjectId()));
- if(null == one1){
- 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(MD5Generator.generateMD5("a123456")));
@@ -186,7 +143,7 @@
sysUserRole.setRoleId(user.getRoleId());
sysUserRole.setUserId(user.getUserId());
userRoleService.insertSysUserRole(sysUserRole);
- }
+
return AjaxResult.success();
}
@@ -220,17 +177,6 @@
ajax.put("posts", postService.selectPostAll());
if (StringUtils.isNotNull(userId)) {
SysUser sysUser = userService.selectUserById(userId);
- 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()));
@@ -288,17 +234,6 @@
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();
}
@@ -361,6 +296,11 @@
return R.ok();
}
}
+ @PostMapping("/getSysUserAll")
+ public R<List<SysUser>> getSysUserAll() {
+ List<SysUser> list = userService.list();
+ return R.ok(list);
+ }
@PostMapping("/updateSysUser")
@Transactional(rollbackFor = Exception.class)
@@ -396,7 +336,7 @@
return R.fail("用户名或密码错误");
}
// 角色集合
- Set<String> roles = permissionService.getRolePermission(sysUser);
+ Set<String> roles = permissionService.getRolePermission(sysUser);//admin 或 其他权限
// 权限集合getRolePermission
Set<String> permissions = permissionService.getMenuPermission(sysUser);
LoginUser sysUserVo = new LoginUser();
@@ -475,7 +415,6 @@
public AjaxResult resetPwd(@RequestBody SysUser user) {
userService.checkUserAllowed(user);
userService.checkUserDataScope(user.getUserId());
-
user.setPassword(SecurityUtils.encryptPassword(MD5Generator.generateMD5("a123456")));
user.setUpdateBy(SecurityUtils.getUsername());
return toAjax(userService.resetPwd(user));
@@ -635,6 +574,41 @@
userRoleService.insertSysUserRole(sysUserRole);
return R.ok(user.getUserId());
}
+ @ResponseBody
+ @PostMapping("/addSysUserSite")
+ @Transactional(rollbackFor = Exception.class)
+ public R<Long> addSysUserSite(@RequestBody SysUser user) {
+ if(StringUtils.isEmpty(user.getUserName())){
+ user.setUserName(user.getPhonenumber());
+ }
+ if(!org.springframework.util.StringUtils.hasLength(user.getNickName())){
+ user.setNickName(user.getPhonenumber());
+ }
+// if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
+// throw new RuntimeException("手机号已开通账号");
+// }
+ if (StringUtils.isNotEmpty(user.getUserName()) && !userService.checkUserNameUnique(user)) {
+ throw new RuntimeException("登录账号已存在");
+ }
+ user.setCreateBy(SecurityUtils.getUsername());
+ user.setPassword(SecurityUtils.encryptPassword(MD5Generator.generateMD5(user.getPassword())));
+ user.setRoleType(2);
+ userService.insertUser(user);
+ SysUserRole sysUserRole = new SysUserRole();
+ sysUserRole.setRoleId(user.getRoleId());
+ sysUserRole.setUserId(user.getUserId());
+ userRoleService.insertSysUserRole(sysUserRole);
+ return R.ok(user.getUserId());
+ }
+
+ public static void main(String[] args) {
+ String s = SecurityUtils.encryptPassword(MD5Generator.generateMD5("123456"));
+ System.err.println("加密"+s);
+ BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
+
+ System.err.println(passwordEncoder.matches(MD5Generator.generateMD5("123456"), "$2a$10$yxHB49D.WQOKiZvh8SHHv.1/MxHZzriuVA99sIIiHKmsjI.EQC9yC"));
+
+ }
@ResponseBody
--
Gitblit v1.7.1