18339543638 преди 3 години
родител
ревизия
8faeec2ed0

+ 1 - 1
nb-common/config-common/src/main/java/com/nb/common/config/web/handler/CheckRequestHandler.java

@@ -29,7 +29,7 @@ import java.util.concurrent.TimeUnit;
  * @Description
  * @createTime 2022年06月09日 14:11:00
  */
-@Configuration
+//@Configuration
 @ConditionalOnProperty(value = "request.check.enable",havingValue = "true",matchIfMissing = false)
 @Order(10)
 @Slf4j

+ 1 - 1
nb-core/src/main/java/com/nb/core/doc/SwaggerConfig.java

@@ -26,7 +26,7 @@ import java.util.*;
 @Configuration
 @EnableKnife4j
 @EnableSwagger2WebMvc
-@Profile("dev")
+//@Profile("dev")
 public class SwaggerConfig implements WebMvcConfigurer {
 
     public static final String VERSION = "1.0.0";

+ 2 - 2
nb-service/web-service/src/main/java/com/nb/web/service/bus/hospital/his/HisScriptSession.java

@@ -186,7 +186,7 @@ public class HisScriptSession {
         if(!online){
             BusClinicEntity clinic = clinicService.recentClinicByPatientCode(hospitalId, patientCode);
             if(clinic==null){
-                result.setResult(R.fail("拉取信息超时,请稍后再试"));
+                result.setResult(R.fail(""));
             }else {
                 result.setResult(R.success(clinic));
             }
@@ -207,7 +207,7 @@ public class HisScriptSession {
             if(needResult){
                 BusClinicEntity clinic = clinicService.recentClinicByPatientCode(hospitalId, patientCode);
                 if(clinic==null){
-                    result.setResult(R.fail("拉取信息超时,请稍后再试"));
+                    result.setResult(R.fail("该住院号不存在"));
                 }else {
                     result.setResult(R.success(clinic));
                 }

+ 4 - 3
nb-service/web-service/src/main/java/com/nb/web/service/system/service/impl/SysRoleServiceImpl.java

@@ -1,6 +1,7 @@
 package com.nb.web.service.system.service.impl;
 
 import cn.dev33.satoken.session.SaSession;
+import cn.dev33.satoken.stp.StpLogic;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
@@ -164,15 +165,15 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
                 return sysRoleMenu;
             }).collect(Collectors.toList()));
         }
+        StpLogic stpLogic = SecurityUtil.getStpLogic();
         //分配菜单后将对应的在线人员进行更新
         List<SysUserRole> userRoleList = sysUserRoleService.list(new QueryWrapper<SysUserRole>().lambda().eq(SysUserRole::getRoleId, req.getRoleId()));
         userRoleList
                 .forEach(sysUserRole -> {
                     Set<String> permissionsByUserId = sysMenuService.getPermissionsByUserId(sysUserRole.getUserId());
                     List<String> tokens = SecurityUtil.getStpLogic().getTokenValueListByLoginId(sysUserRole.getUserId());
-                    tokens.parallelStream()
-                            .forEach(token->{
-                                SaSession tokenSessionByToken = SecurityUtil.getStpLogic().getTokenSessionByToken(token);
+                    tokens.forEach(token->{
+                                SaSession tokenSessionByToken = stpLogic.getTokenSessionByToken(token);
                                 LoginUser user = (LoginUser) tokenSessionByToken.get(Constants.LOGIN_USER_KEY);
                                 if(user!=null){
                                     user.setPermissions(permissionsByUserId);