Quellcode durchsuchen

refactor(s8): remove config wizard rule payload API compatibility

YY968XX vor 5 Tagen
Ursprung
Commit
8c68bfc8dd

+ 2 - 3
Web/src/views/aidop/s8/api/s8ConfigApi.ts

@@ -361,10 +361,9 @@ export interface S8WizardDraftDetail extends S8WizardDraftListItem {
 	wizardJson: string;
 }
 
+// CONFIG-WIZARD-API-RULEPAYLOAD-CLEANUP-1:
+// generate-rule 请求体已固化为 {};规则由后端基于 draft.wizard_json + 字典重建。
 export interface S8WizardDraftGenerateRulePayload {
-	// CONFIG-WIZARD-FRONTEND-RULE-PAYLOAD-CLEANUP-1:
-	// 后端兼容模式 — 缺省时由后端从 draft.wizard_json + 字典重建。前端保留 optional 以便未来 override。
-	rulePayload?: S8WatchRuleCreatePayload;
 }
 
 export interface S8WizardDraftGenerateRuleResult {

+ 4 - 6
server/Plugins/Admin.NET.Plugin.AiDOP/Dto/S8/AdoS8ConfigDraftDtos.cs

@@ -70,14 +70,12 @@ public class AdoS8ConfigDraftDetailDto : AdoS8ConfigDraftListItemDto
     public string WizardJson { get; set; } = string.Empty;
 }
 
+/// <summary>
+/// CONFIG-WIZARD-API-RULEPAYLOAD-CLEANUP-1:generate-rule 请求体已收口为 {};
+/// 规则始终由后端基于 draft.wizard_json + 字典重建,不再接受前端构造的 RulePayload。
+/// </summary>
 public class AdoS8ConfigDraftGenerateRuleDto
 {
-    /// <summary>
-    /// 兼容模式(CONFIG-WIZARD-GENERATE-RULE-SERVER-BUILD-1):
-    /// - 非空:沿用旧路径,直接信任前端构造好的 watch_rule payload。
-    /// - null/缺省:后端基于 draft.wizard_json + 字典(monitor_object/metric, exception_type, data_source, scene_config)重建。
-    /// </summary>
-    public AdoS8WatchRule? RulePayload { get; set; }
 }
 
 public class AdoS8ConfigDraftGenerateRuleResultDto

+ 2 - 2
server/Plugins/Admin.NET.Plugin.AiDOP/Service/S8/S8ConfigDraftService.cs

@@ -185,8 +185,8 @@ public class S8ConfigDraftService : ITransient
         if (draft.Status == S8ConfigDraftStatus.Generated)
             throw new S8BizException("草稿状态异常:已标记 GENERATED 但未回写规则 ID");
 
-        // CONFIG-WIZARD-GENERATE-RULE-SERVER-BUILD-1:兼容模式 — RulePayload 缺省时按 wizard_json 重建
-        var payload = dto.RulePayload ?? await RebuildPayloadFromWizardJsonAsync(draft);
+        // CONFIG-WIZARD-API-RULEPAYLOAD-CLEANUP-1:始终由后端基于 wizard_json + 字典重建,dto 已不再承载 RulePayload
+        var payload = await RebuildPayloadFromWizardJsonAsync(draft);
         if (string.IsNullOrWhiteSpace(payload.RuleCode))
             throw new S8BizException("规则编码不能为空");