wangyizhe/his
3
3
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

``` refactor(db): 移除SQL语句中的public schema前缀

Browse Source
This commit is contained in:
chenqi
2025-12-30 00:02:59 +08:00
parent a080b4294c
commit a1e07a204b
234 changed files with 3200 additions and 2831 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
openhis-server-new/core-framework/src/main/java/com/core/framework/config/MybatisPlusConfig.java
View File

@@ -116,37 +116,40 @@ public class MybatisPlusConfig {
* 获取当前租户 ID
*/
private Integer getCurrentTenantId() {
Integer result = null;
// 首先尝试从线程局部变量中获取租户ID（适用于定时任务等场景）
Integer threadLocalTenantId = TenantContext.getCurrentTenant();
if (threadLocalTenantId != null) {
return threadLocalTenantId;
}
// 获取当前登录用户的租户ID（优先使用SecurityUtils中储存的LoginUser的租户ID）
try {
if (SecurityUtils.getAuthentication() != null) {
return SecurityUtils.getLoginUser().getTenantId();
result = threadLocalTenantId;
} else {
// 获取当前登录用户的租户ID（优先使用SecurityUtils中储存的LoginUser的租户ID）
try {
if (SecurityUtils.getAuthentication() != null) {
result = SecurityUtils.getLoginUser().getTenantId();
}
} catch (Exception e) {
result = 1; // 默认租户ID
}
} catch (Exception e) {
return 1; // 默认租户ID
}
// 尝试从请求头中获取租户ID
ServletRequestAttributes attributes = (ServletRequestAttributes)RequestContextHolder.getRequestAttributes();
if (attributes != null) {
HttpServletRequest request = attributes.getRequest();
// 从请求头获取租户ID，假设header名称为"X-Tenant-ID" ; 登录接口前端把租户id放到请求头里
String tenantIdHeader = request.getHeader("X-Tenant-ID");
String requestMethodName = request.getHeader("Request-Method-Name");
// 登录
if ("login".equals(requestMethodName)) {
if (tenantIdHeader != null && !tenantIdHeader.isEmpty()) {
return Integer.parseInt(tenantIdHeader);
if (result == null) {
// 尝试从请求头中获取租户ID
ServletRequestAttributes attributes = (ServletRequestAttributes)RequestContextHolder.getRequestAttributes();
if (attributes != null) {
HttpServletRequest request = attributes.getRequest();
// 从请求头获取租户ID，假设header名称为"X-Tenant-ID" ; 登录接口前端把租户id放到请求头里
String tenantIdHeader = request.getHeader("X-Tenant-ID");
String requestMethodName = request.getHeader("Request-Method-Name");
// 登录
if ("login".equals(requestMethodName)) {
if (tenantIdHeader != null && !tenantIdHeader.isEmpty()) {
result = Integer.parseInt(tenantIdHeader);
}
}
}
}
}
return 1; // 默认租户ID
return result != null ? result : 1; // 默认租户ID
}
}

43
openhis-server-new/core-framework/src/main/java/com/core/framework/handler/MybastisColumnsHandler.java
View File

@@ -2,12 +2,17 @@ package com.core.framework.handler;
import java.util.Date;
import javax.servlet.http.HttpServletRequest;
import org.apache.ibatis.reflection.MetaObject;
import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
import com.core.common.core.domain.model.LoginUser;
import com.core.common.utils.SecurityUtils;
import com.core.framework.config.TenantContext;
@Component
public class MybastisColumnsHandler implements MetaObjectHandler {
@@ -47,10 +52,40 @@ public class MybastisColumnsHandler implements MetaObjectHandler {
* 获取当前租户 ID
*/
private Integer getCurrentTenantId() {
// 获取当前登录用户的租户 ID
if (SecurityUtils.getAuthentication() != null) {
return SecurityUtils.getLoginUser().getTenantId();
Integer result = null;
// 首先尝试从线程局部变量中获取租户ID（适用于定时任务等场景）
Integer threadLocalTenantId = TenantContext.getCurrentTenant();
if (threadLocalTenantId != null) {
result = threadLocalTenantId;
} else {
// 获取当前登录用户的租户ID（优先使用SecurityUtils中储存的LoginUser的租户ID）
try {
if (SecurityUtils.getAuthentication() != null) {
result = SecurityUtils.getLoginUser().getTenantId();
}
} catch (Exception e) {
result = 1; // 默认租户ID
}
if (result == null) {
// 尝试从请求头中获取租户ID
ServletRequestAttributes attributes = (ServletRequestAttributes)RequestContextHolder.getRequestAttributes();
if (attributes != null) {
HttpServletRequest request = attributes.getRequest();
// 从请求头获取租户ID，假设header名称为"X-Tenant-ID" ; 登录接口前端把租户id放到请求头里
String tenantIdHeader = request.getHeader("X-Tenant-ID");
String requestMethodName = request.getHeader("Request-Method-Name");
// 登录
if ("login".equals(requestMethodName)) {
if (tenantIdHeader != null && !tenantIdHeader.isEmpty()) {
result = Integer.parseInt(tenantIdHeader);
}
}
}
}
}
return 0;
return result != null ? result : 1; // 默认租户ID
}
}