Joseph Doherty
13d3aeab09
Phase 1b of the v2 entity-model rewrite. The design's live-edit model means
the 12 v2 live-edit entities no longer carry a generation scope — they're
edited directly via AdminOperationsActor, with RowVersion (added in Task 14a)
providing last-write-wins detection.
Entity changes (12 files):
Equipment, DriverInstance, Device, Tag, PollGroup, Namespace,
UnsArea, UnsLine, NodeAcl, Script, VirtualTag, ScriptedAlarm
- Removed: public long GenerationId
- Removed: public ConfigGeneration? Generation (navigation)
DbContext changes (OtOpcUaConfigDbContext.cs):
- Removed 12 HasOne(x => x.Generation).WithMany().HasForeignKey... mappings
- Rewrote ~36 indexes: dropped the GenerationId column from each composite
key, renamed UX_<Table>_Generation_<X> -> UX_<Table>_<X> and
IX_<Table>_Generation_<X> -> IX_<Table>_<X>. Logical IDs become globally
unique (UX_<Table>_LogicalId on the LogicalId column alone).
- Removed Namespace's redundant UX_Namespace_Generation_LogicalId_Cluster
index (subsumed by the new UX_Namespace_LogicalId).
Core.Tests fixtures (4 files):
Removed "GenerationId = 1," lines from:
- PermissionTrieBuilderTests.cs (NodeAcl Row factory)
- PermissionTrieTests.cs (NodeAcl Row factory)
- TriePermissionEvaluatorTests.cs (NodeAcl Row factory + 2 gen{1,5}Row
mutations that test stale-generation evaluation; the trie itself still
carries a generation tag via PermissionTrie.GenerationId, fed in via
PermissionTrieBuilder.Build's generationId parameter, so the tests
still exercise the production code path)
- EquipmentNodeWalkerTests.cs (Area/Line/Eq/Tag/VirtualTag/ScriptedAlarm
builders)
Expected breakage (accepted per Task 56 policy):
src/Server/ZB.MOM.WW.OtOpcUa.Server ~25 errors (DriverInstanceBootstrapper,
AuthorizationBootstrap,
EquipmentNamespaceContentLoader,
Phase7Composer, ...)
src/Server/ZB.MOM.WW.OtOpcUa.Admin ~45 errors (VirtualTags.razor,
ScriptedAlarms.razor,
DriverInstanceService,
EquipmentService,
EquipmentImportBatchService,
UnsService,
FocasDriverDetailService,
...)
Server.Tests, Admin.Tests, Admin.E2ETests also break transitively (they
project-reference Server/Admin). All deleted in Task 56.
Verification:
dotnet build src/Core/ZB.MOM.WW.OtOpcUa.Configuration -> 0 errors
dotnet build tests/Core/ZB.MOM.WW.OtOpcUa.Core.Tests -> 0 errors
dotnet build tests/Core/ZB.MOM.WW.OtOpcUa.Configuration.Tests -> 0 errors
dotnet build (whole solution) -> 70 errors, all in Server/Admin
60 lines
2.8 KiB
C#
60 lines
2.8 KiB
C#
namespace ZB.MOM.WW.OtOpcUa.Configuration.Entities;
|
|
|
|
/// <summary>
|
|
/// Per Phase 7 plan decisions #5, #13, #15 — a scripted OPC UA Part 9 alarm whose
|
|
/// condition is the predicate <see cref="Script"/> referenced by
|
|
/// <see cref="PredicateScriptId"/>. Materialized by <c>Core.ScriptedAlarms</c> as a
|
|
/// concrete <c>AlarmConditionType</c> subtype per <see cref="AlarmType"/>.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// <para>
|
|
/// Message tokens (<c>{TagPath}</c>) resolved at emission time per plan decision #13.
|
|
/// <see cref="HistorizeToAveva"/> (plan decision #15) gates whether transitions
|
|
/// route through the Core.AlarmHistorian SQLite queue + Galaxy.Host to the Aveva
|
|
/// Historian alarm schema.
|
|
/// </para>
|
|
/// </remarks>
|
|
public sealed class ScriptedAlarm
|
|
{
|
|
public Guid ScriptedAlarmRowId { get; set; }
|
|
|
|
/// <summary>Stable logical id — drives <c>AlarmConditionType.ConditionName</c>. Globally unique in v2.</summary>
|
|
public required string ScriptedAlarmId { get; set; }
|
|
|
|
/// <summary>Logical FK to <see cref="Equipment.EquipmentId"/> — owner of this alarm.</summary>
|
|
public required string EquipmentId { get; set; }
|
|
|
|
/// <summary>Operator-facing alarm name.</summary>
|
|
public required string Name { get; set; }
|
|
|
|
/// <summary>Concrete Part 9 type — "AlarmCondition" / "LimitAlarm" / "OffNormalAlarm" / "DiscreteAlarm".</summary>
|
|
public required string AlarmType { get; set; }
|
|
|
|
/// <summary>Numeric severity 1..1000 per OPC UA Part 9 (usual bands: 1-250 Low, 251-500 Medium, 501-750 High, 751-1000 Critical).</summary>
|
|
public int Severity { get; set; } = 500;
|
|
|
|
/// <summary>Template with <c>{TagPath}</c> tokens resolved at emission time.</summary>
|
|
public required string MessageTemplate { get; set; }
|
|
|
|
/// <summary>Logical FK to <see cref="Script.ScriptId"/> — predicate script returning <c>bool</c>.</summary>
|
|
public required string PredicateScriptId { get; set; }
|
|
|
|
/// <summary>
|
|
/// Plan decision #15 — when true, transitions route through the SQLite store-and-forward
|
|
/// queue to the Aveva Historian. Defaults on for scripted alarms because they are the
|
|
/// primary motivation for the historian sink; operator can disable per alarm.
|
|
/// </summary>
|
|
public bool HistorizeToAveva { get; set; } = true;
|
|
|
|
/// <summary>
|
|
/// OPC UA Part 9 <c>Retain</c> flag — whether the alarm keeps active-state between
|
|
/// sessions. Most plant alarms are retained; one-shot event-style alarms are not.
|
|
/// </summary>
|
|
public bool Retain { get; set; } = true;
|
|
|
|
public bool Enabled { get; set; } = true;
|
|
|
|
/// <summary>Optimistic concurrency token for last-write-wins detection in the v2 live-edit model.</summary>
|
|
public byte[] RowVersion { get; set; } = Array.Empty<byte>();
|
|
}
|