From 0005d49a697ce934c6fc2a61ecb75d881b9a76f2 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 11:48:31 +0800
Subject: [PATCH] feat(production): 完善生产订单管理功能
---
src/main/java/com/ruoyi/framework/security/service/SysLoginService.java | 58 +++++++++++++++++++++++-----------------------------------
1 files changed, 23 insertions(+), 35 deletions(-)
diff --git a/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java b/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java
index f379b7f..8c3d68b 100644
--- a/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java
+++ b/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java
@@ -1,25 +1,10 @@
package com.ruoyi.framework.security.service;
-import javax.annotation.Resource;
-
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.project.system.mapper.SysUserMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.authentication.BadCredentialsException;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.stereotype.Component;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.exception.user.BlackListException;
-import com.ruoyi.common.exception.user.CaptchaException;
-import com.ruoyi.common.exception.user.CaptchaExpireException;
-import com.ruoyi.common.exception.user.UserNotExistsException;
-import com.ruoyi.common.exception.user.UserPasswordNotMatchException;
+import com.ruoyi.common.exception.user.*;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.MessageUtils;
import com.ruoyi.common.utils.StringUtils;
@@ -30,10 +15,18 @@
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.security.context.AuthenticationContextHolder;
import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.project.system.service.ISysConfigService;
import com.ruoyi.project.system.service.ISysUserService;
+import jakarta.annotation.Resource;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Component;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -43,22 +36,19 @@
* @author ruoyi
*/
@Component
+@RequiredArgsConstructor
public class SysLoginService
{
- @Autowired
- private TokenService tokenService;
+ private final TokenService tokenService;
@Resource
private AuthenticationManager authenticationManager;
- @Autowired
- private RedisCache redisCache;
+ private final RedisCache redisCache;
+ private final ISysUserService userService;
+ private final ISysConfigService configService;
+ private final SysUserMapper sysUserMapper;
- @Autowired
- private ISysUserService userService;
-
- @Autowired
- private ISysConfigService configService;
/**
* 鐧诲綍楠岃瘉
@@ -219,8 +209,6 @@
return loginUser.getUserId();
}
- @Autowired
- private SysUserMapper sysUserMapper;
/**
* 鐧诲綍楠岃瘉
@@ -270,13 +258,13 @@
LoginUser loginUser = (LoginUser) authentication.getPrincipal();
recordLoginInfo(loginUser.getUserId());
// 鏇存柊鐢ㄦ埛淇℃伅锛屼慨鏀瑰綋鍓嶉�変腑鍏徃
- SysUser user = loginUser.getUser();
- if(factoryId != null){
- user.setTenantId(factoryId);
- }else{
- user.setTenantId(tokenService.getDeptIdsByUserId(user.getUserId())[0]);
- }
- sysUserMapper.updateUser(user);
+// SysUser user = loginUser.getUser();
+// if(factoryId != null){
+// user.setTenantId(factoryId);
+// }else{
+// user.setTenantId(tokenService.getDeptIdsByUserId(user.getUserId())[0]);
+// }
+// sysUserMapper.updateUser(user);
// 鐢熸垚token
return tokenService.createToken(loginUser);
}
--
Gitblit v1.9.3