From 0d103102d321fd5b227df39a4fc091a0a6b4ba5c Mon Sep 17 00:00:00 2001 From: liu Date: Tue, 28 Nov 2023 10:36:22 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=A4=8D=E7=99=BB=E5=BD=95=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supervision/config/JwtInterceptor.java | 46 +++++++++++++++---- .../java/com/supervision/util/TokenUtil.java | 2 +- .../vo/manage/MedicalRecPageResVO.java | 4 ++ .../resources/mapper/MedicalRecMapper.xml | 5 +- 4 files changed, 44 insertions(+), 13 deletions(-) diff --git a/virtual-patient-common/src/main/java/com/supervision/config/JwtInterceptor.java b/virtual-patient-common/src/main/java/com/supervision/config/JwtInterceptor.java index db788c39..1da7c785 100644 --- a/virtual-patient-common/src/main/java/com/supervision/config/JwtInterceptor.java +++ b/virtual-patient-common/src/main/java/com/supervision/config/JwtInterceptor.java @@ -16,28 +16,34 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.HashMap; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; @Slf4j public class JwtInterceptor implements HandlerInterceptor { + private static final ConcurrentHashMap singleLoginTokenCacheMap = new ConcurrentHashMap<>(); @Override + public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) { //请求消息头获取用户ID String token = request.getHeader("token"); - if (StrUtil.isBlank(token) ) { + if (StrUtil.isBlank(token)) { // 如果是swagger来的接口,说明这里是测试的,会伪造一个用户 - if (StrUtil.isNotBlank(request.getHeader("Knife4j-Gateway-Code"))){ - token = devActiveUser(); - }else { - throw new BusinessException("当前用户未登录",HttpStatus.UNAUTHORIZED.value()); + if (StrUtil.isNotBlank(request.getHeader("Knife4j-Gateway-Code"))) { + cacheAuth(JWTUtil.parseToken(devActiveUser())); + return true; + } else { + throw new BusinessException("当前用户未登录", HttpStatus.UNAUTHORIZED.value()); } } JWT jwt = JWTUtil.parseToken(token); // 校验token是否过期,如果过期了,需要提示过期重新登录 checkTokenExpire(jwt); + // 校验是否重复登录 + checkSingleLogin(jwt); cacheAuth(jwt); return true; } @@ -56,7 +62,27 @@ public class JwtInterceptor implements HandlerInterceptor { // 校验是否比当前时间大 long currentTimeMillis = System.currentTimeMillis(); if (currentTimeMillis > l) { - throw new BusinessException("用户登录已过期,请重新登录",HttpStatus.UNAUTHORIZED.value()); + throw new BusinessException("用户登录已过期,请重新登录", HttpStatus.UNAUTHORIZED.value()); + } + } + + private void checkSingleLogin(JWT currentJwt) { + Object id = currentJwt.getPayload("id"); + JWT singleLoginTokenCache = singleLoginTokenCacheMap.get(id); + // 然后将当前的expireTime和singleLoginTokenCache进行比较 + Object expireTime = singleLoginTokenCache.getPayload("expireTime"); + long singleLoginTokenCacheExpireTime = Long.parseLong(String.valueOf(expireTime)); + Object currentJwtExpireTimeObject = currentJwt.getPayload("expireTime"); + long currentJwtExpireTime = Long.parseLong(String.valueOf(currentJwtExpireTimeObject)); + if (singleLoginTokenCacheExpireTime == currentJwtExpireTime) { + // 如果相等,说明这个token就是最新的,直接放行 + return; + } else if (currentJwtExpireTime > singleLoginTokenCacheExpireTime) { + // 如果当前的超时时间要大于缓存的,说明重新登录了,这个时候要把最新的放到缓存中 + singleLoginTokenCacheMap.put(id, currentJwt); + } else { + // 走到这里,说明singleLoginTokenCache是最新的,说明当前请求的token就过期了 + throw new BusinessException("当前用户已在其他地方登录!"); } } @@ -69,11 +95,11 @@ public class JwtInterceptor implements HandlerInterceptor { } } - private String devActiveUser(){ + private String devActiveUser() { Map map = new HashMap<>(); - map.put("id","1"); - map.put("account","test"); - map.put("name","测试账户"); + map.put("id", "1"); + map.put("account", "test"); + map.put("name", "测试账户"); return TokenUtil.creatToken(JSONUtil.toJsonStr(map)); } diff --git a/virtual-patient-common/src/main/java/com/supervision/util/TokenUtil.java b/virtual-patient-common/src/main/java/com/supervision/util/TokenUtil.java index 762ceee6..b33841ca 100644 --- a/virtual-patient-common/src/main/java/com/supervision/util/TokenUtil.java +++ b/virtual-patient-common/src/main/java/com/supervision/util/TokenUtil.java @@ -11,7 +11,7 @@ public class TokenUtil { public static String creatToken(String userInfo){ final JWTSigner signer = JWTSignerUtil.hs256("123456".getBytes()); JSONObject info = JSONUtil.parseObj(userInfo); - // 过期时间一天 + // 过期时间一天,同时这个字段也作为单点登录使用 info.putOnce("expireTime",System.currentTimeMillis() + 1000 * 60 * 60 * 24); return JWTUtil.createToken(info, signer); } diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/manage/MedicalRecPageResVO.java b/virtual-patient-model/src/main/java/com/supervision/vo/manage/MedicalRecPageResVO.java index 715d3940..ce1a20e1 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/manage/MedicalRecPageResVO.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/manage/MedicalRecPageResVO.java @@ -14,6 +14,10 @@ public class MedicalRecPageResVO { private Integer age; private String gender; private LocalDateTime time; + /** + * 初步诊断-> 就是对应的疾病名称 + */ + private String diagnosisPrimaryStr; } diff --git a/virtual-patient-model/src/main/resources/mapper/MedicalRecMapper.xml b/virtual-patient-model/src/main/resources/mapper/MedicalRecMapper.xml index 95a1ba11..4e4c5abf 100644 --- a/virtual-patient-model/src/main/resources/mapper/MedicalRecMapper.xml +++ b/virtual-patient-model/src/main/resources/mapper/MedicalRecMapper.xml @@ -36,14 +36,15 @@ select t1.id as medicalId, t2.id as patientId, + t3.disease_name as diagnosisPrimaryStr, t1.no as no, t2.name as name, t2.age as age, t2.gender as gender, if(t1.update_time is null, t1.create_time, t1.update_time) as time from vp_medical_rec t1 - left join vp_patient t2 - on t1.patient_id = t2.id + left join vp_patient t2 on t1.patient_id = t2.id + left join vp_disease t3 on t1.disease_id = t3.id AND t1.patient_self_desc like concat("%",#{selfDescKeyword}, "%")