feat(tenant): 租户-项目两级架构 Phase 2 — IoT + Ops 业务迁移
DO 迁移 (15个 TenantBaseDO → ProjectBaseDO): - IoT: IotDeviceDO - Ops 核心: OpsOrderDO, OpsOrderEventDO, OpsOrderDispatchDO, OpsOrderQueueDO, OpsBusAreaDO, OpsAreaDeviceRelationDO, OpsDeviceTrajectoryDO - Ops 保洁: OpsOrderCleanExtDO, OpsCleanerStatusDO, OpsCleanerPerformanceMonthlyDO, OpsInspectionRecordDO, OpsInspectionRecordItemDO - Ops 安保: OpsOrderSecurityExtDO, OpsAreaSecurityUserDO IoT 适配: - IotDeviceRespDTO 新增 projectId 字段 - IotDeviceMessage 新增 projectId 字段 - IotDeviceMessageServiceImpl.appendDeviceMessage() 设置 projectId - IotCleanRuleMessageHandler 嵌套 ProjectUtils.execute() 设置项目上下文 缓存改造: - ProjectRedisCacheManager extends TenantRedisCacheManager,追加 :projectId 后缀 - ViewshTenantAutoConfiguration 替换为 ProjectRedisCacheManager SQL 迁移脚本 (sql/mysql/project/): - 01-create-tables.sql: system_project + system_user_project 建表 - 02-default-data.sql: 默认项目 + 用户关联回填 - 03-alter-business-tables.sql: 15 张表添加 project_id (NULL → 回填 → NOT NULL → 索引) - 04-index-audit.sql: 现有索引审计 + project_id 补充建议 - 99-rollback.sql: 完整回滚方案 附带修复: - fix(ops): UserDispatchStatusServiceImpl 添加缺失的 KEY_PREFIX 常量 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
package com.viewsh.module.iot.dal.dataobject.device;
|
||||
|
||||
import com.viewsh.framework.mybatis.core.type.LongSetTypeHandler;
|
||||
import com.viewsh.framework.tenant.core.db.TenantBaseDO;
|
||||
import com.viewsh.framework.tenant.core.db.ProjectBaseDO;
|
||||
import com.viewsh.module.iot.dal.dataobject.ota.IotOtaFirmwareDO;
|
||||
import com.viewsh.module.iot.dal.dataobject.product.IotProductDO;
|
||||
import com.viewsh.module.iot.core.enums.IotDeviceStateEnum;
|
||||
@@ -26,7 +26,7 @@ import java.util.Set;
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class IotDeviceDO extends TenantBaseDO {
|
||||
public class IotDeviceDO extends ProjectBaseDO {
|
||||
|
||||
/**
|
||||
* 设备编号 - 全部设备
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.viewsh.module.iot.mq.consumer.rule;
|
||||
|
||||
import com.viewsh.framework.tenant.core.util.ProjectUtils;
|
||||
import com.viewsh.framework.tenant.core.util.TenantUtils;
|
||||
import com.viewsh.module.iot.core.messagebus.core.IotMessageBus;
|
||||
import com.viewsh.module.iot.core.messagebus.core.IotMessageSubscriber;
|
||||
@@ -50,12 +51,14 @@ public class IotCleanRuleMessageHandler implements IotMessageSubscriber<IotDevic
|
||||
@Override
|
||||
public void onMessage(IotDeviceMessage message) {
|
||||
TenantUtils.execute(message.getTenantId(), () -> {
|
||||
try {
|
||||
cleanRuleProcessorManager.processMessage(message);
|
||||
} catch (Exception e) {
|
||||
// 规则处理异常不影响其他消息处理
|
||||
log.error("[onMessage][消息({}) 保洁规则处理异常]", message.getRequestId(), e);
|
||||
}
|
||||
ProjectUtils.execute(message.getProjectId(), () -> {
|
||||
try {
|
||||
cleanRuleProcessorManager.processMessage(message);
|
||||
} catch (Exception e) {
|
||||
// 规则处理异常不影响其他消息处理
|
||||
log.error("[onMessage][消息({}) 保洁规则处理异常]", message.getRequestId(), e);
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user