From fd7b8fb7c89832c28a838b0449bbb8a392433ee2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 22 四月 2025 14:33:02 +0800
Subject: [PATCH] 将华为云短信替换成阿里云短信
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 135 ++++++++++++++++++++++++++++++++------------
1 files changed, 98 insertions(+), 37 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 8ffd2ff..2f02404 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,5 +1,6 @@
package com.ruoyi.system.controller;
+import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -16,6 +17,7 @@
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.MD5Generator;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.SysDept;
import com.ruoyi.system.api.domain.SysRole;
@@ -30,6 +32,7 @@
import io.seata.spring.annotation.GlobalTransactional;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -49,6 +52,7 @@
@RestController
@RequestMapping("/user")
@Api(tags = "用户信息")
+@Slf4j
public class SysUserController extends BaseController {
@Resource
private ISysUserService userService;
@@ -126,10 +130,13 @@
if(!org.springframework.util.StringUtils.hasLength(user.getNickName())){
user.setNickName(user.getPhonenumber());
}
+ user.setRoleType(sysUser1.getRoleType());
+ user.setObjectId(sysUser1.getObjectId());
if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
return error("手机号已开通账号");
}
- if (StringUtils.isNotEmpty(user.getUserName()) && !userService.checkUserNameUnique(user)) {
+
+ if (StringUtils.isNotEmpty(user.getNickName()) && !userService.checkNickNameUnique(user)) {
return error("登录账号重复");
}
//门店员工添加数据，需要判断账号是否存在，共用同一个账号
@@ -138,11 +145,18 @@
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("a123456"));
+ user.setPassword(SecurityUtils.encryptPassword(MD5Generator.generateMD5("a123456")));
+
user.setRoleType(sysUser1.getRoleType());
user.setObjectId(sysUser1.getObjectId());
if(null != appUser){
@@ -172,18 +186,22 @@
}
//添加门店员工关系数据
- 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);
+ 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("a123456"));
+ user.setPassword(SecurityUtils.encryptPassword(MD5Generator.generateMD5("a123456")));
+
user.setRoleType(sysUser1.getRoleType());
userService.insertUser(user);
SysUserRole sysUserRole = new SysUserRole();
@@ -198,8 +216,12 @@
@GetMapping("/verifyUserNameRepeat/{username}")
@ApiOperation(value = "校验账号是否重复", tags = {"管理后台-账号管理"})
public AjaxResult verifyUserNameRepeat(@PathVariable String username){
+ Long userid = tokenService.getLoginUser().getUserid();
+ SysUser sysUser1 = userService.getById(userid);
SysUser user = new SysUser();
user.setUserName(username);
+ user.setRoleType(sysUser1.getRoleType());
+ user.setObjectId(sysUser1.getObjectId());
if (StringUtils.isNotEmpty(username) && !userService.checkUserNameUnique(user)) {
return error("账号不可重复");
}
@@ -250,21 +272,18 @@
@PutMapping("/update")
@ApiOperation(value = "编辑系统用户", tags = {"管理后台-账号管理", "门店后台-部门管理"})
public AjaxResult edit(@Validated @RequestBody SysUser user) {
+ Long userid = tokenService.getLoginUser().getUserid();
+ SysUser sysUser1 = userService.getById(userid);
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(user.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::getRoleType, sysUser1.getRoleType())
+ .eq(SysUser::getObjectId, sysUser1.getObjectId())
.eq(SysUser::getDelFlag,0)
.last("LIMIT 1"));
@@ -273,6 +292,8 @@
}
sysUser = userService.getOne(Wrappers.lambdaQuery(SysUser.class)
.eq(SysUser::getUserName, user.getUserName())
+ .eq(SysUser::getRoleType, sysUser1.getRoleType())
+ .eq(SysUser::getObjectId, sysUser1.getObjectId())
.eq(SysUser::getDelFlag,0)
.last("LIMIT 1"));
if (StringUtils.isNotEmpty(user.getUserName()) && (Objects.nonNull(sysUser) && !user.getUserId().equals(sysUser.getUserId()) )) {
@@ -281,6 +302,8 @@
user.setUpdateBy(SecurityUtils.getUsername());
if (user.getPassword() != null && !"".equals(user.getPassword())) {
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+ user.setPassword(SecurityUtils.encryptPassword(MD5Generator.generateMD5("a123456")));
+
user.setPassWordUpdate(new Date());
}
if (user.getPhonenumber() != null) {
@@ -289,10 +312,18 @@
user.setUpdateBy(SecurityUtils.getUsername());
user.setUpdateTime(new Date());
userService.updateUser(user);
+
+ //修改角色数据
+ SysUserRole userRole = sysUserRoleService.getOne(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, user.getUserId()));
+ userRole.setRoleId(user.getRoleId());
+ sysUserRoleService.updateSysUserRole(userRole);
+
+ //修改角色数据
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()));
+ 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());
@@ -315,7 +346,8 @@
if (ArrayUtils.contains(userIds, SecurityUtils.getUserId())) {
return error("当前用户不能删除");
}
- return toAjax(userService.deleteUserByIds(userIds));
+ userService.deleteUserByIds(userIds);
+ return AjaxResult.success();
}
@@ -409,6 +441,30 @@
}
/**
+ * 门店登录使用
+ * @param username
+ * @return
+ */
+ @InnerAuth
+ @GetMapping("/infoShop/{username}")
+ public R<LoginUser> infoShop(@PathVariable("username") String username) {
+ SysUser sysUser = userService.selectUserShopByUserName(username);
+ if (StringUtils.isNull(sysUser)) {
+ return R.fail("用户名或密码错误");
+ }
+ // 角色集合
+ Set<String> roles = permissionService.getRolePermission(sysUser);
+ // 权限集合getRolePermission
+ Set<String> permissions = permissionService.getMenuPermission(sysUser);
+ LoginUser sysUserVo = new LoginUser();
+ sysUserVo.setSysUser(sysUser);
+ sysUserVo.setRoles(roles);
+ sysUserVo.setPermissions(permissions);
+
+ return R.ok(sysUserVo);
+ }
+
+ /**
* 注册用户信息
*/
@PostMapping("/register")
@@ -452,7 +508,8 @@
public AjaxResult resetPwd(@RequestBody SysUser user) {
userService.checkUserAllowed(user);
userService.checkUserDataScope(user.getUserId());
- user.setPassword(SecurityUtils.encryptPassword("a123456"));
+
+ user.setPassword(SecurityUtils.encryptPassword(MD5Generator.generateMD5("a123456")));
user.setUpdateBy(SecurityUtils.getUsername());
return toAjax(userService.resetPwd(user));
}
@@ -639,7 +696,7 @@
@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()));
+ .eq(SysUser::getStatus, "0").eq(SysUser::getRoleType, 2));
if(null == one){
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
userService.save(user);
@@ -661,21 +718,25 @@
*/
@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);
+ List<UserShop> list2 = userShopService.list(new LambdaQueryWrapper<UserShop>().eq(UserShop::getShopId, objectId));
+ for (UserShop userShop : list2) {
+ List<UserShop> list1 = userShopService.list(new LambdaUpdateWrapper<UserShop>().eq(UserShop::getUserId, userShop.getUserId()));
+ if(list1.size() == 1 && list1.get(0).getShopId().equals(objectId)){
+ //删除管理员账号
+ userService.deleteUserById(userShop.getUserId());
+ }else{
+ //修改管理后台账号关联的门店数据
+ SysUser sysUser = userService.getById(userShop.getUserId());
+ if(sysUser.getObjectId().equals(objectId)){
+ Optional<UserShop> first = list1.stream().filter(s -> !s.getShopId().equals(objectId)).findFirst();
+ if(first.isPresent()){
+ sysUser.setObjectId(first.get().getShopId());
+ 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));
+ userShopService.removeById(userShop.getId());
}
return R.ok();
}
--
Gitblit v1.7.1