yuhaiming/water
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

设备心跳调整 app新增增设备时绑定联网设备

Browse Source
This commit is contained in:
yuhaiming
2026-06-13 10:51:45 +08:00
parent c7f9df980a
commit c74363afa4
65 changed files with 1622 additions and 592 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
water-common/water-common-tenant/src/main/java/org/dromara/common/tenant/handle/PlusTenantLineHandler.java
View File

@@ -28,7 +28,7 @@ public class PlusTenantLineHandler implements TenantLineHandler {
public Expression getTenantId() {
String tenantId = TenantHelper.getTenantId();
if (StringUtils.isBlank(tenantId)) {
log.error("无法获取有效的租户id -> Null");
log.error("无法获取有效的租户ID -> 空");
return new NullValue();
}
// 返回固定租户

8
water-common/water-common-tenant/src/main/java/org/dromara/common/tenant/handle/TenantKeyPrefixHandler.java
View File

@@ -39,10 +39,10 @@ public class TenantKeyPrefixHandler extends KeyPrefixHandler {
}
String tenantId = TenantHelper.getTenantId();
if (StringUtils.isBlank(tenantId)) {
log.debug("无法获取有效的租户id -> Null");
log.debug("无法获取有效的租户ID -> 空");
return super.map(name);
}
if (StringUtils.startsWith(name, tenantId + "")) {
if (StringUtils.startsWith(name, tenantId)) {
// 如果存在则直接返回
return super.map(name);
}
@@ -70,10 +70,10 @@ public class TenantKeyPrefixHandler extends KeyPrefixHandler {
}
String tenantId = TenantHelper.getTenantId();
if (StringUtils.isBlank(tenantId)) {
log.debug("无法获取有效的租户id -> Null");
log.debug("无法获取有效的租户ID -> 空");
return unmap;
}
if (StringUtils.startsWith(unmap, tenantId + "")) {
if (StringUtils.startsWith(unmap, tenantId)) {
// 如果存在则删除
return unmap.substring((tenantId + ":").length());
}

2
water-common/water-common-tenant/src/main/java/org/dromara/common/tenant/manager/TenantSpringCacheManager.java
View File

@@ -29,7 +29,7 @@ public class TenantSpringCacheManager extends PlusSpringCacheManager {
}
String tenantId = TenantHelper.getTenantId();
if (StringUtils.isBlank(tenantId)) {
log.error("无法获取有效的租户id -> Null");
log.error("无法获取有效的租户ID -> 空");
}
if (StringUtils.startsWith(name, tenantId)) {
// 如果存在则直接返回