From c9b1a88ad8f42454673c411cfac74284e68c1ac0 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 12 十二月 2023 09:48:19 +0800
Subject: [PATCH] zjh 2023/12/12--1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysUserController.java | 1
ltkj-common/src/main/java/com/ltkj/common/core/domain/entity/SysUser.java | 5 ++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java | 46 ++++++++++++-----------
ltkj-admin/src/main/resources/application.yml | 12 +++---
4 files changed, 36 insertions(+), 28 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 3982474..06d11c7 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
@@ -92,9 +92,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("璇ヨ处鍙锋鍦ㄤ娇鐢ㄤ腑");
@@ -113,31 +113,33 @@
AjaxResult ajax = success();
SysUser user = UserHoder.getLoginUser().getUser();
if (null != user.getUserId()) {
- 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.getHospAreaName(),
- 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){
- UserHoder.getLoginUser().setMessage("杩樻湁 "+between+" 澶╁埌鏈� 璇锋敞鎰忕画璐�! 浠ュ厤褰卞搷姝ｅ父浣跨敤!");
+ if (between <= 30) {
+ UserHoder.getLoginUser().setMessage("杩樻湁 " + between + " 澶╁埌鏈� 璇锋敞鎰忕画璐�! 浠ュ厤褰卞搷姝ｅ父浣跨敤!");
}
- }else {
+ } else {
throw new SecretKeyException("璇风即璐逛娇鐢�");
}
}
@@ -150,8 +152,8 @@
ajax.put("user", user);
ajax.put("roles", roles);
ajax.put("permissions", permissions);
- ajax.put("securitMessage",UserHoder.getLoginUser().getMessage());
- ajax.put("hospName",UserHoder.getLoginUser().getHospName());
+ ajax.put("securitMessage", UserHoder.getLoginUser().getMessage());
+ ajax.put("hospName", UserHoder.getLoginUser().getHospName());
} else {
Set<String> roles = new HashSet<>();
LambdaQueryWrapper<SysRole> wq = new LambdaQueryWrapper<>();
@@ -170,9 +172,9 @@
ajax.put("user", user1);
ajax.put("roles", roles);
ajax.put("permissions", permissions);
- ajax.put("post",null);
- ajax.put("securitMessage",null);
- ajax.put("hospName",UserHoder.getLoginUser().getHospName());
+ ajax.put("post", null);
+ ajax.put("securitMessage", null);
+ ajax.put("hospName", UserHoder.getLoginUser().getHospName());
}
return ajax;
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysUserController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysUserController.java
index 5f84df5..269d29a 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysUserController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysUserController.java
@@ -98,6 +98,7 @@
DictHosp dictHosp = hospService.getById(sysDept.getHospId());
if (null != dictHosp) {
sysUser.setHospName(dictHosp.getHospAreaName());
+ sysUser.setHospId(dictHosp.getHospAreaId());
}
}
LambdaQueryWrapper<DictUserInfo> wq = new LambdaQueryWrapper<>();
diff --git a/ltkj-admin/src/main/resources/application.yml b/ltkj-admin/src/main/resources/application.yml
index ff73d25..863dbee 100644
--- a/ltkj-admin/src/main/resources/application.yml
+++ b/ltkj-admin/src/main/resources/application.yml
@@ -180,8 +180,8 @@
# 浣撴濂楅鍜岃疆鎾浘瀛樺偍璺緞
photoPath: D:\AppPhoto\uploadPath\
# nginx鍥剧墖鏈嶅姟鍣�
-#photoServer: https://ltpeis.xaltjdkj.cn:5502/uploadPath/
-photoServer: http://192.168.0.5:5502/uploadPath/
+photoServer: https://ltpeis.xaltjdkj.cn:5502/uploadPath/
+#photoServer: http://192.168.0.5:5502/uploadPath/
# 寰俊灏忕▼搴廰ppid secret
xcx:
@@ -205,13 +205,13 @@
#key-path: E:\mycode\apppwd\1643225121_20230427_cert\apiclient_cert.p12 #鏈湴璇佷功璺緞锛屽湪寰俊鍟嗘埛鍚庡彴涓嬭浇
key-path: D:\WXCertUtil\tjcert\apiclient_cert.p12 #鏈嶅姟鍣ㄨ瘉涔﹁矾寰勶紝鍦ㄥ井淇″晢鎴峰悗鍙颁笅杞�
# pay-score-notify-url: http://192.168.0.101:5011/cus/order/pay-notify #寰俊鏀粯鍥炶皟鍦板潃
-# pay-score-notify-url: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin/cus/order/pay-notify #寰俊鏀粯鍥炶皟鍦板潃
- pay-score-notify-url: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin/cus/order/pay-notify #寰俊鏀粯鍥炶皟鍦板潃
+ pay-score-notify-url: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin/cus/order/pay-notify #寰俊鏀粯鍥炶皟鍦板潃
+# pay-score-notify-url: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin/cus/order/pay-notify #寰俊鏀粯鍥炶皟鍦板潃
#绉湪鎶ヨ〃璁块棶鍦板潃
jimu:
-# path: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin
- path: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin
+ path: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin
+# path: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin
# path: http://192.168.0.5:5000/ltkj-admin
# path: http://192.168.0.99:8081/ltkj-admin
# path: http://192.168.0.101:5011
diff --git a/ltkj-common/src/main/java/com/ltkj/common/core/domain/entity/SysUser.java b/ltkj-common/src/main/java/com/ltkj/common/core/domain/entity/SysUser.java
index 204d670..aaef4c1 100644
--- a/ltkj-common/src/main/java/com/ltkj/common/core/domain/entity/SysUser.java
+++ b/ltkj-common/src/main/java/com/ltkj/common/core/domain/entity/SysUser.java
@@ -163,6 +163,11 @@
@ApiModelProperty(value = "鎵�鍦ㄦ満鏋�")
private String hospName;
+ //鎵�鍦ㄦ満鏋処D
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鎵�鍦ㄦ満鏋処D")
+ private String hospId;
+
//鍏ヨ亴鏃ユ湡
@TableField(exist = false)
@JsonFormat(pattern = "yyyy-MM-dd")
--
Gitblit v1.8.0