From d3e9a09cb54017a8063e5bfe3ace5012f66f3130 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 25 三月 2025 18:34:34 +0800
Subject: [PATCH] 修改统计bug
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 40 insertions(+), 5 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 807dc76..abd345d 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;
@@ -129,7 +133,8 @@
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("登录账号重复");
}
//门店员工添加数据，需要判断账号是否存在，共用同一个账号
@@ -148,7 +153,8 @@
.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){
@@ -192,7 +198,8 @@
}
}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();
@@ -290,6 +297,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) {
@@ -324,7 +333,8 @@
if (ArrayUtils.contains(userIds, SecurityUtils.getUserId())) {
return error("当前用户不能删除");
}
- return toAjax(userService.deleteUserByIds(userIds));
+ userService.deleteUserByIds(userIds);
+ return AjaxResult.success();
}
@@ -418,6 +428,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")
@@ -461,7 +495,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));
}
--
Gitblit v1.7.1