From c42f62b32bac302a7ac9fcde7489f7c5fc6e11aa Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 06 十二月 2024 15:35:17 +0800
Subject: [PATCH] zjh20241205-3
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java | 51 ++++++++++++++++++++++++---------------------------
1 files changed, 24 insertions(+), 27 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java
index 2686fc0..21165b2 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java
@@ -51,13 +51,10 @@
public class SysLoginController {
@Autowired
private SysLoginService loginService;
-
@Autowired
private ISysMenuService menuService;
-
@Autowired
private SysPermissionService permissionService;
-
@Resource
private ITjCustomerService customerService;
@Resource
@@ -92,9 +89,9 @@
// 鐢熸垚浠ょ墝
String token;
if (loginBody.getMobile()) {
- token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getType(),loginBody.getCode(),loginBody.getUuid());
+ token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getType(), loginBody.getCode(), loginBody.getUuid());
} else {
- token = loginService.Cuslogin(loginBody.getUsername(), loginBody.getPassword(), loginBody.getType(),loginBody.getCode(),loginBody.getUuid());
+ token = loginService.Cuslogin(loginBody.getUsername(), loginBody.getPassword(), loginBody.getType(), loginBody.getCode(), loginBody.getUuid());
}
if (null == token) {
return success("璇ヨ处鍙锋鍦ㄤ娇鐢ㄤ腑");
@@ -111,37 +108,35 @@
@GetMapping("getInfo")
public AjaxResult getInfo() {
AjaxResult ajax = success();
-// SysUser user = Objects.requireNonNull(SecurityUtils.getLoginUser()).getUser();
SysUser user = UserHoder.getLoginUser().getUser();
if (null != user.getUserId()) {
- String message=null;
- if (secretKeyLogin)
- {
- if(null !=user.getDeptId()){
- if(!SecurityUtils.isAdmin(user.getUserId())){
- SysDept sysDept = deptService.getById(user.getDeptId());
- if (null != sysDept) {
- DictHosp dictHosp = hospService.getById(sysDept.getHospId());
- if(null !=dictHosp && dictHosp.getSecretKey() !=null && dictHosp.getExpirationTime() !=null){
- if (!SecurityUtils.matchesMallMerchantSecretKey(secret,dictHosp.getHospAreaId(),dictHosp.getAreaid(),
- dictHosp.getExpirationTime(),dictHosp.getSecretKey())) {
+ if (secretKeyLogin) {
+ if (null != user.getDeptId()) {
+ SysDept sysDept = deptService.getById(user.getDeptId());
+ if (null != sysDept) {
+ DictHosp dictHosp = hospService.getById(sysDept.getHospId());
+ if (null != dictHosp) {
+ user.setHospName(dictHosp.getHospAreaName());
+ user.setHospId(dictHosp.getHospAreaId());
+ }
+ if (!SecurityUtils.isAdmin(user.getUserId())) {
+ if (null != dictHosp && dictHosp.getSecretKey() != null && dictHosp.getExpirationTime() != null) {
+ if (!SecurityUtils.matchesMallMerchantSecretKey(secret, dictHosp.getHospAreaId(), dictHosp.getHospAreaName(),
+ dictHosp.getExpirationTime(), dictHosp.getSecretKey())) {
String userIdKey = Constants.LOGIN_USERID_KEY + user.getUserId();
String userKey = redisCache.getCacheObject(userIdKey);
- if (org.apache.commons.lang3.StringUtils.isNotEmpty(userKey))
- {
+ if (org.apache.commons.lang3.StringUtils.isNotEmpty(userKey)) {
redisCache.deleteObject(userIdKey);
redisCache.deleteObject(userKey);
}
-
throw new SecretKeyException("鍟嗗宸茶繃鏈熻缁垂浣跨敤");
}
long between = DateUtil.between(new Date(), DateUtil.endOfDay(dictHosp.getExpirationTime()), DateUnit.DAY);
- if(between<=30){
-// message="杩樻湁 "+between+" 澶╁埌鏈� 璇锋敞鎰忕画璐�! 浠ュ厤褰卞搷姝ｅ父浣跨敤!";
- UserHoder.getLoginUser().setMessage("杩樻湁 "+between+" 澶╁埌鏈� 璇锋敞鎰忕画璐�! 浠ュ厤褰卞搷姝ｅ父浣跨敤!");
+ if (between <= 30) {
+ UserHoder.getLoginUser().setMessage("杩樻湁 " + between + " 澶╁埌鏈� 璇锋敞鎰忕画璐�! 浠ュ厤褰卞搷姝ｅ父浣跨敤!");
}
- }else {
+ } else {
throw new SecretKeyException("璇风即璐逛娇鐢�");
}
}
@@ -154,7 +149,8 @@
ajax.put("user", user);
ajax.put("roles", roles);
ajax.put("permissions", permissions);
- ajax.put("securitMessage",UserHoder.getLoginUser().getMessage());
+ ajax.put("securitMessage", UserHoder.getLoginUser().getMessage());
+ ajax.put("hospName", UserHoder.getLoginUser().getHospName());
} else {
Set<String> roles = new HashSet<>();
LambdaQueryWrapper<SysRole> wq = new LambdaQueryWrapper<>();
@@ -173,8 +169,9 @@
ajax.put("user", user1);
ajax.put("roles", roles);
ajax.put("permissions", permissions);
- ajax.put("post",null);
- ajax.put("securitMessage",null);
+ ajax.put("post", null);
+ ajax.put("securitMessage", null);
+ ajax.put("hospName", UserHoder.getLoginUser().getHospName());
}
return ajax;
}
--
Gitblit v1.8.0