From 814bd251d4e32f75920147fe8e1271ba20e355e7 Mon Sep 17 00:00:00 2001 From: Rehili Ghazwa Date: Tue, 21 Apr 2026 16:26:23 +0200 Subject: [PATCH 1/2] add nmk power cut off result --- .../study/server/service/SecurityAnalysisService.java | 2 ++ .../service/securityanalysis/SecurityAnalysisResultType.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/gridsuite/study/server/service/SecurityAnalysisService.java b/src/main/java/org/gridsuite/study/server/service/SecurityAnalysisService.java index 5c9cf64b2c..c62c501b79 100644 --- a/src/main/java/org/gridsuite/study/server/service/SecurityAnalysisService.java +++ b/src/main/java/org/gridsuite/study/server/service/SecurityAnalysisService.java @@ -98,6 +98,7 @@ private String getPagedPathFromResultType(SecurityAnalysisResultType resultType) return switch (resultType) { case NMK_CONTINGENCIES -> "nmk-contingencies-result/paged"; case NMK_LIMIT_VIOLATIONS -> "nmk-constraints-result/paged"; + case NMK_POWER_CUT_OFF -> "nmk-power-cut-off-result/paged"; case N -> "n-result"; }; } @@ -106,6 +107,7 @@ private String getExportPathFromResultType(SecurityAnalysisResultType resultType return switch (resultType) { case NMK_CONTINGENCIES -> "nmk-contingencies-result/csv"; case NMK_LIMIT_VIOLATIONS -> "nmk-constraints-result/csv"; + case NMK_POWER_CUT_OFF -> "nmk-power-cut-off-result/csv"; case N -> "n-result/csv"; }; } diff --git a/src/main/java/org/gridsuite/study/server/service/securityanalysis/SecurityAnalysisResultType.java b/src/main/java/org/gridsuite/study/server/service/securityanalysis/SecurityAnalysisResultType.java index 2017fd75d1..9fd0a5fbfd 100644 --- a/src/main/java/org/gridsuite/study/server/service/securityanalysis/SecurityAnalysisResultType.java +++ b/src/main/java/org/gridsuite/study/server/service/securityanalysis/SecurityAnalysisResultType.java @@ -12,5 +12,6 @@ public enum SecurityAnalysisResultType { N, NMK_CONTINGENCIES, - NMK_LIMIT_VIOLATIONS + NMK_LIMIT_VIOLATIONS, + NMK_POWER_CUT_OFF } From d74bb29e5de7bf7b2cbe35feefc07b838b80e952 Mon Sep 17 00:00:00 2001 From: Rehili Ghazwa Date: Thu, 21 May 2026 15:00:51 +0200 Subject: [PATCH 2/2] fix renaming --- .../study/server/service/SecurityAnalysisService.java | 4 ++-- .../service/securityanalysis/SecurityAnalysisResultType.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/gridsuite/study/server/service/SecurityAnalysisService.java b/src/main/java/org/gridsuite/study/server/service/SecurityAnalysisService.java index c62c501b79..75a8cb5b48 100644 --- a/src/main/java/org/gridsuite/study/server/service/SecurityAnalysisService.java +++ b/src/main/java/org/gridsuite/study/server/service/SecurityAnalysisService.java @@ -98,7 +98,7 @@ private String getPagedPathFromResultType(SecurityAnalysisResultType resultType) return switch (resultType) { case NMK_CONTINGENCIES -> "nmk-contingencies-result/paged"; case NMK_LIMIT_VIOLATIONS -> "nmk-constraints-result/paged"; - case NMK_POWER_CUT_OFF -> "nmk-power-cut-off-result/paged"; + case NMK_CUT_OFF_POWER -> "nmk-cut-off-power-result/paged"; case N -> "n-result"; }; } @@ -107,7 +107,7 @@ private String getExportPathFromResultType(SecurityAnalysisResultType resultType return switch (resultType) { case NMK_CONTINGENCIES -> "nmk-contingencies-result/csv"; case NMK_LIMIT_VIOLATIONS -> "nmk-constraints-result/csv"; - case NMK_POWER_CUT_OFF -> "nmk-power-cut-off-result/csv"; + case NMK_CUT_OFF_POWER -> "nmk-cut-off-power-result/csv"; case N -> "n-result/csv"; }; } diff --git a/src/main/java/org/gridsuite/study/server/service/securityanalysis/SecurityAnalysisResultType.java b/src/main/java/org/gridsuite/study/server/service/securityanalysis/SecurityAnalysisResultType.java index 9fd0a5fbfd..7528aec5ff 100644 --- a/src/main/java/org/gridsuite/study/server/service/securityanalysis/SecurityAnalysisResultType.java +++ b/src/main/java/org/gridsuite/study/server/service/securityanalysis/SecurityAnalysisResultType.java @@ -13,5 +13,5 @@ public enum SecurityAnalysisResultType { N, NMK_CONTINGENCIES, NMK_LIMIT_VIOLATIONS, - NMK_POWER_CUT_OFF + NMK_CUT_OFF_POWER }