From 906328ba3f842f5f86cb5bd60e09a8a7f6d2ac93 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 13 十月 2023 08:32:18 +0800
Subject: [PATCH] zjh 2023/10/12--2
---
ltkj-common/src/main/java/com/ltkj/common/core/domain/model/LoginUser.java | 15 +++++++++++++++
ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java | 33 +++++++++++++++++----------------
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java | 6 ++----
3 files changed, 34 insertions(+), 20 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..240ee35 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
@@ -111,10 +111,8 @@
@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()){
@@ -133,12 +131,10 @@
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+" 澶╁埌鏈� 璇锋敞鎰忕画璐�! 浠ュ厤褰卞搷姝ｅ父浣跨敤!");
}
}else {
@@ -155,6 +151,7 @@
ajax.put("roles", roles);
ajax.put("permissions", permissions);
ajax.put("securitMessage",UserHoder.getLoginUser().getMessage());
+ ajax.put("hospName",UserHoder.getLoginUser().getHospName());
} else {
Set<String> roles = new HashSet<>();
LambdaQueryWrapper<SysRole> wq = new LambdaQueryWrapper<>();
@@ -175,6 +172,7 @@
ajax.put("permissions", permissions);
ajax.put("post",null);
ajax.put("securitMessage",null);
+ ajax.put("hospName",UserHoder.getLoginUser().getHospName());
}
return ajax;
}
diff --git a/ltkj-common/src/main/java/com/ltkj/common/core/domain/model/LoginUser.java b/ltkj-common/src/main/java/com/ltkj/common/core/domain/model/LoginUser.java
index 67e2b2f..b681c16 100644
--- a/ltkj-common/src/main/java/com/ltkj/common/core/domain/model/LoginUser.java
+++ b/ltkj-common/src/main/java/com/ltkj/common/core/domain/model/LoginUser.java
@@ -3,7 +3,9 @@
import java.util.Collection;
import java.util.Set;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.ltkj.common.core.domain.entity.SysUser;
+import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -79,6 +81,8 @@
private String message;
+ private String hospName;
+
/* */
/**
@@ -99,6 +103,16 @@
this.wxUser = wxUser;
}*/
+ public String getHospName()
+ {
+ return hospName;
+ }
+
+ public void setHospName(String hospName)
+ {
+ this.hospName = hospName;
+ }
+
public String getMessage()
{
return message;
@@ -108,6 +122,7 @@
{
this.message = message;
}
+
public Long getDeptId() {
return deptId;
}
diff --git a/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java b/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java
index 171dd14..355c5b8 100644
--- a/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java
+++ b/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java
@@ -140,25 +140,26 @@
Long userId =loginUser.getUser().getUserId();
SysUser user = userService.getById(userId);
if(null !=user && null !=user.getDeptId()){
-// loginUser.getUser().setOrgId(user.getOrgId());
- 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())) {
- throw new SecretKeyException("鍟嗗宸茶繃鏈熻缁垂浣跨敤");
- }
- long between = DateUtil.between(new Date(), DateUtil.endOfDay(dictHosp.getExpirationTime()), DateUnit.DAY);
- if(between<=30){
- loginUser.setMessage("杩樻湁 "+between+" 澶╁埌鏈� 璇锋敞鎰忕画璐�! 浠ュ厤褰卞搷姝ｅ父浣跨敤!");
- }else {
- loginUser.setMessage(null);
- }
-
- }else {
- throw new SecretKeyException("璇风即璐逛娇鐢�");
+ if(null !=dictHosp){
+ loginUser.setHospName(dictHosp.getHospAreaName());
+ if(!SecurityUtils.isAdmin(user.getUserId())){
+ if(dictHosp.getSecretKey() != null && dictHosp.getExpirationTime() != null){
+ if (!SecurityUtils.matchesMallMerchantSecretKey(secret,dictHosp.getHospAreaId(),dictHosp.getAreaid(),
+ dictHosp.getExpirationTime(),dictHosp.getSecretKey())) {
+ throw new SecretKeyException("鍟嗗宸茶繃鏈熻缁垂浣跨敤");
+ }
+ long between = DateUtil.between(new Date(), DateUtil.endOfDay(dictHosp.getExpirationTime()), DateUnit.DAY);
+ if(between<=30){
+ loginUser.setMessage("杩樻湁 "+between+" 澶╁埌鏈� 璇锋敞鎰忕画璐�! 浠ュ厤褰卞搷姝ｅ父浣跨敤!");
+ }else {
+ loginUser.setMessage(null);
+ }
+ }else {
+ throw new SecretKeyException("璇风即璐逛娇鐢�");
+ }
}
}
}
--
Gitblit v1.8.0