|
|
@@ -32,16 +32,16 @@ public class S8MonitoringService : ITransient
|
|
|
{
|
|
|
var (periodFrom, periodTo) = S8PeriodHelper.Resolve(period);
|
|
|
|
|
|
- // S8-DASHBOARD-DATA-ALIGN-S1S7-1:统一统计基准 module_code IN S1-S7;
|
|
|
- // module_code IS NULL 的 legacy/demo 行不参与大屏聚合(不依赖 scene_code、不映射 legacy scene)。
|
|
|
+ // TASK-002-RESET-DIMENSION-MODEL-DEV-4A:聚合源切到 stage_code(DEV-2A 已与 module_code 对齐);
|
|
|
+ // DTO 字段名保持 ModuleCode 以兼容前端,仅来源字段改为 StageCode。
|
|
|
var events = await _rep.AsQueryable()
|
|
|
.Where(e => e.TenantId == tenantId && e.FactoryId == factoryId && !e.IsDeleted)
|
|
|
- .Where(e => S8ModuleCode.All.Contains(e.ModuleCode))
|
|
|
+ .Where(e => S8ModuleCode.All.Contains(e.StageCode))
|
|
|
.WhereIF(periodFrom.HasValue, e => e.CreatedAt >= periodFrom!.Value)
|
|
|
.WhereIF(periodTo.HasValue, e => e.CreatedAt < periodTo!.Value)
|
|
|
.Select(e => new
|
|
|
{
|
|
|
- e.ModuleCode,
|
|
|
+ ModuleCode = e.StageCode,
|
|
|
e.Severity,
|
|
|
e.Status,
|
|
|
e.TimeoutFlag,
|
|
|
@@ -300,10 +300,10 @@ public class S8MonitoringService : ITransient
|
|
|
|
|
|
var query = _rep.AsQueryable()
|
|
|
.Where(e => e.TenantId == q.TenantId && e.FactoryId == q.FactoryId && !e.IsDeleted)
|
|
|
- // S8-DASHBOARD-DATA-ALIGN-S1S7-1:统一统计基准 module_code IN S1-S7。
|
|
|
- .Where(e => S8ModuleCode.All.Contains(e.ModuleCode))
|
|
|
+ // TASK-002-RESET-DIMENSION-MODEL-DEV-4A:聚合源 module_code → stage_code。
|
|
|
+ .Where(e => S8ModuleCode.All.Contains(e.StageCode))
|
|
|
.WhereIF(!string.IsNullOrWhiteSpace(q.SceneCode), e => e.SceneCode == q.SceneCode)
|
|
|
- .WhereIF(!string.IsNullOrWhiteSpace(q.ModuleCode), e => e.ModuleCode == q.ModuleCode)
|
|
|
+ .WhereIF(!string.IsNullOrWhiteSpace(q.ModuleCode), e => e.StageCode == q.ModuleCode)
|
|
|
.WhereIF(effectiveFrom.HasValue, e => e.CreatedAt >= effectiveFrom!.Value)
|
|
|
.WhereIF(effectiveTo.HasValue, e => e.CreatedAt < effectiveTo!.Value);
|
|
|
|
|
|
@@ -312,7 +312,7 @@ public class S8MonitoringService : ITransient
|
|
|
var raw = await query
|
|
|
.Select(e => new
|
|
|
{
|
|
|
- e.ModuleCode,
|
|
|
+ ModuleCode = e.StageCode,
|
|
|
e.SceneCode,
|
|
|
e.Severity,
|
|
|
e.SlaDeadline,
|
|
|
@@ -381,7 +381,7 @@ public class S8MonitoringService : ITransient
|
|
|
|
|
|
var rows = await _rep.AsQueryable()
|
|
|
.Where(e => e.TenantId == tenantId && e.FactoryId == factoryId && !e.IsDeleted)
|
|
|
- .Where(e => deliveryModules.Contains(e.ModuleCode))
|
|
|
+ .Where(e => deliveryModules.Contains(e.StageCode))
|
|
|
.Where(e => e.ExceptionTypeCode != null && deliveryTypes.Contains(e.ExceptionTypeCode))
|
|
|
.Where(e => e.CreatedAt >= from && e.CreatedAt < toExclusive)
|
|
|
.Select(e => new { e.ExceptionTypeCode, e.CreatedAt })
|
|
|
@@ -459,7 +459,7 @@ public class S8MonitoringService : ITransient
|
|
|
|
|
|
var rows = await _rep.AsQueryable()
|
|
|
.Where(e => e.TenantId == tenantId && e.FactoryId == factoryId && !e.IsDeleted)
|
|
|
- .Where(e => prodModules.Contains(e.ModuleCode))
|
|
|
+ .Where(e => prodModules.Contains(e.StageCode))
|
|
|
.Where(e => e.ExceptionTypeCode != null && prodTypes.Contains(e.ExceptionTypeCode))
|
|
|
.Where(e => e.CreatedAt >= from && e.CreatedAt < toExclusive)
|
|
|
.Select(e => new { e.ExceptionTypeCode, e.CreatedAt })
|
|
|
@@ -540,7 +540,7 @@ public class S8MonitoringService : ITransient
|
|
|
|
|
|
var rows = await _rep.AsQueryable()
|
|
|
.Where(e => e.TenantId == tenantId && e.FactoryId == factoryId && !e.IsDeleted)
|
|
|
- .Where(e => supplyModules.Contains(e.ModuleCode))
|
|
|
+ .Where(e => supplyModules.Contains(e.StageCode))
|
|
|
.Where(e => e.ExceptionTypeCode != null && supplyTypes.Contains(e.ExceptionTypeCode))
|
|
|
.Where(e => e.CreatedAt >= from && e.CreatedAt < toExclusive)
|
|
|
.Select(e => new { e.ExceptionTypeCode, e.CreatedAt })
|
|
|
@@ -663,7 +663,7 @@ public class S8MonitoringService : ITransient
|
|
|
|
|
|
var rows = await _rep.AsQueryable()
|
|
|
.Where(e => e.TenantId == tenantId && e.FactoryId == factoryId && !e.IsDeleted)
|
|
|
- .Where(e => S8ModuleCode.All.Contains(e.ModuleCode))
|
|
|
+ .Where(e => S8ModuleCode.All.Contains(e.StageCode))
|
|
|
.Where(e => e.ExceptionTypeCode != null && typeCodes.Contains(e.ExceptionTypeCode))
|
|
|
.Where(e => e.CreatedAt >= from && e.CreatedAt < to)
|
|
|
.Select(e => new { e.ExceptionTypeCode, e.Status, e.CreatedAt, e.ClosedAt })
|