XW-AIOT/aiot-platform-cloud
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refactor(ops): 15 个 DO 基类从 BaseDO 规范化为 TenantBaseDO
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Details
Java CI with Maven / build (17) (push) Has been cancelled
Details
Java CI with Maven / build (8) (push) Has been cancelled
Details

Browse Source 
数据库表已有 tenant_id 列，拦截器实际可正常工作，但 DO 继承
BaseDO 语义不明确。统一改为 TenantBaseDO 以明确租户隔离语义。

ops-biz: OpsOrderDO, OpsOrderDispatchDO, OpsOrderEventDO,
  OpsOrderQueueDO, OpsBusAreaDO, OpsAreaDeviceRelationDO,
  OpsBusinessEventLogDO
environment-biz: OpsOrderCleanExtDO, OpsInspectionRecordDO,
  OpsInspectionTemplateDO, OpsInspectionRecordItemDO,
  OpsCleanerStatusDO, OpsCleanerPerformanceMonthlyDO
security-biz: OpsOrderSecurityExtDO, OpsAreaSecurityUserDO

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
lzh
2026-03-30 11:42:09 +08:00
parent fef3e13ff4
commit 19cb25b0ea
15 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/dal/dataobject/cleaner/OpsCleanerPerformanceMonthlyDO.java
View File

@@ -1,6 +1,6 @@
package com.viewsh.module.ops.environment.dal.dataobject.cleaner;
import com.viewsh.framework.mybatis.core.dataobject.BaseDO;
import com.viewsh.framework.tenant.core.db.TenantBaseDO;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,7 +21,7 @@ import java.math.BigDecimal;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class OpsCleanerPerformanceMonthlyDO extends BaseDO {
public class OpsCleanerPerformanceMonthlyDO extends TenantBaseDO {
/**
* 汇总ID

4
viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/dal/dataobject/cleaner/OpsCleanerStatusDO.java
View File

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.viewsh.framework.mybatis.core.dataobject.BaseDO;
import com.viewsh.framework.tenant.core.db.TenantBaseDO;
import com.viewsh.module.ops.enums.CleanerStatusEnum;
import lombok.*;
@@ -22,7 +22,7 @@ import java.time.LocalDateTime;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class OpsCleanerStatusDO extends BaseDO {
public class OpsCleanerStatusDO extends TenantBaseDO {
/**
* 主键ID

4
viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/dal/dataobject/inspection/OpsInspectionRecordDO.java
View File

@@ -1,6 +1,6 @@
package com.viewsh.module.ops.environment.dal.dataobject.inspection;
import com.viewsh.framework.mybatis.core.dataobject.BaseDO;
import com.viewsh.framework.tenant.core.db.TenantBaseDO;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -21,7 +21,7 @@ import java.util.List;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class OpsInspectionRecordDO extends BaseDO {
public class OpsInspectionRecordDO extends TenantBaseDO {
/**
* 巡检记录ID

4
viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/dal/dataobject/inspection/OpsInspectionRecordItemDO.java
View File

@@ -1,6 +1,6 @@
package com.viewsh.module.ops.environment.dal.dataobject.inspection;
import com.viewsh.framework.mybatis.core.dataobject.BaseDO;
import com.viewsh.framework.tenant.core.db.TenantBaseDO;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -21,7 +21,7 @@ import java.util.List;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class OpsInspectionRecordItemDO extends BaseDO {
public class OpsInspectionRecordItemDO extends TenantBaseDO {
/**
* 明细ID

4
viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/dal/dataobject/inspection/OpsInspectionTemplateDO.java
View File

@@ -1,6 +1,6 @@
package com.viewsh.module.ops.environment.dal.dataobject.inspection;
import com.viewsh.framework.mybatis.core.dataobject.BaseDO;
import com.viewsh.framework.tenant.core.db.TenantBaseDO;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -17,7 +17,7 @@ import lombok.*;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class OpsInspectionTemplateDO extends BaseDO {
public class OpsInspectionTemplateDO extends TenantBaseDO {
/**
* 模板ID

4
viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/dal/dataobject/workorder/OpsOrderCleanExtDO.java
View File

@@ -1,6 +1,6 @@
package com.viewsh.module.ops.environment.dal.dataobject.workorder;
import com.viewsh.framework.mybatis.core.dataobject.BaseDO;
import com.viewsh.framework.tenant.core.db.TenantBaseDO;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.*;
@@ -19,7 +19,7 @@ import java.time.LocalDateTime;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class OpsOrderCleanExtDO extends BaseDO {
public class OpsOrderCleanExtDO extends TenantBaseDO {
/**
* 主键

4
viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/area/OpsAreaDeviceRelationDO.java
View File

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import com.viewsh.framework.mybatis.core.dataobject.BaseDO;
import com.viewsh.framework.tenant.core.db.TenantBaseDO;
import lombok.*;
import java.util.Map;
@@ -27,7 +27,7 @@ import java.util.Map;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class OpsAreaDeviceRelationDO extends BaseDO {
public class OpsAreaDeviceRelationDO extends TenantBaseDO {
/**
* 主键

4
viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/area/OpsBusAreaDO.java
View File

@@ -1,6 +1,6 @@
package com.viewsh.module.ops.dal.dataobject.area;
import com.viewsh.framework.mybatis.core.dataobject.BaseDO;
import com.viewsh.framework.tenant.core.db.TenantBaseDO;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -19,7 +19,7 @@ import lombok.*;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class OpsBusAreaDO extends BaseDO {
public class OpsBusAreaDO extends TenantBaseDO {
/**
* 区域ID，主键

4
viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/log/OpsBusinessEventLogDO.java
View File

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import com.viewsh.framework.mybatis.core.dataobject.BaseDO;
import com.viewsh.framework.tenant.core.db.TenantBaseDO;
import lombok.*;
import java.time.LocalDateTime;
@@ -26,7 +26,7 @@ import java.util.Map;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class OpsBusinessEventLogDO extends BaseDO {
public class OpsBusinessEventLogDO extends TenantBaseDO {
// ==================== 主键 ====================

4
viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/queue/OpsOrderQueueDO.java
View File

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.viewsh.framework.mybatis.core.dataobject.BaseDO;
import com.viewsh.framework.tenant.core.db.TenantBaseDO;
import com.viewsh.module.ops.enums.OrderQueueStatusEnum;
import com.viewsh.module.ops.enums.PriorityEnum;
import lombok.*;
@@ -24,7 +24,7 @@ import java.time.LocalDateTime;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class OpsOrderQueueDO extends BaseDO {
public class OpsOrderQueueDO extends TenantBaseDO {
/**
* 队列ID（主键）

4
viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/workorder/OpsOrderDO.java
View File

@@ -1,6 +1,6 @@
package com.viewsh.module.ops.dal.dataobject.workorder;
import com.viewsh.framework.mybatis.core.dataobject.BaseDO;
import com.viewsh.framework.tenant.core.db.TenantBaseDO;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,7 +21,7 @@ import java.time.LocalDateTime;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class OpsOrderDO extends BaseDO {
public class OpsOrderDO extends TenantBaseDO {
/**
* 工单ID

4
viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/workorder/OpsOrderDispatchDO.java
View File

@@ -1,7 +1,7 @@
package com.viewsh.module.ops.dal.dataobject.workorder;
import com.baomidou.mybatisplus.annotation.TableField;
import com.viewsh.framework.mybatis.core.dataobject.BaseDO;
import com.viewsh.framework.tenant.core.db.TenantBaseDO;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -24,7 +24,7 @@ import java.util.Map;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class OpsOrderDispatchDO extends BaseDO {
public class OpsOrderDispatchDO extends TenantBaseDO {
/**
* 派单ID

4
viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/workorder/OpsOrderEventDO.java
View File

@@ -1,7 +1,7 @@
package com.viewsh.module.ops.dal.dataobject.workorder;
import com.baomidou.mybatisplus.annotation.IdType;
import com.viewsh.framework.mybatis.core.dataobject.BaseDO;
import com.viewsh.framework.tenant.core.db.TenantBaseDO;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.*;
@@ -20,7 +20,7 @@ import java.time.LocalDateTime;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class OpsOrderEventDO extends BaseDO {
public class OpsOrderEventDO extends TenantBaseDO {
/**
* 事件ID（使用<E4BDBF><E794A8>花算法生成）

4
viewsh-module-ops/viewsh-module-security-biz/src/main/java/com/viewsh/module/ops/security/dal/dataobject/area/OpsAreaSecurityUserDO.java
View File

@@ -1,6 +1,6 @@
package com.viewsh.module.ops.security.dal.dataobject.area;
import com.viewsh.framework.mybatis.core.dataobject.BaseDO;
import com.viewsh.framework.tenant.core.db.TenantBaseDO;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.*;
@@ -17,7 +17,7 @@ import lombok.*;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class OpsAreaSecurityUserDO extends BaseDO {
public class OpsAreaSecurityUserDO extends TenantBaseDO {
/**
* 主键

4
viewsh-module-ops/viewsh-module-security-biz/src/main/java/com/viewsh/module/ops/security/dal/dataobject/workorder/OpsOrderSecurityExtDO.java
View File

@@ -1,6 +1,6 @@
package com.viewsh.module.ops.security.dal.dataobject.workorder;
import com.viewsh.framework.mybatis.core.dataobject.BaseDO;
import com.viewsh.framework.tenant.core.db.TenantBaseDO;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.*;
@@ -19,7 +19,7 @@ import java.time.LocalDateTime;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class OpsOrderSecurityExtDO extends BaseDO {
public class OpsOrderSecurityExtDO extends TenantBaseDO {
/**
* 主键