Skip to content

Release 0.2.69 #612

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
redaneuhaus merged 2 commits into from
Jun 18, 2026
Merged

Release 0.2.69 #612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a28c379
feat(#610): RSR-1605 - Configuration LSVS LGOS setSrcCB value
redaneuhaus Jun 18, 2026
b19fc1a
Merge pull request #611 from com-pas/feat/#610-RSR-1603_configuration…
redaneuhaus Jun 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 28 additions & 4 deletions sct-commons/src/main/java/org/lfenergy/compas/sct/commons/SclService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import org.lfenergy.compas.sct.commons.api.SclEditor;
import org.lfenergy.compas.sct.commons.domain.DaVal;
import org.lfenergy.compas.sct.commons.domain.DataRef;
import org.lfenergy.compas.sct.commons.domain.DoLinkedToDa;
import org.lfenergy.compas.sct.commons.dto.*;
import org.lfenergy.compas.sct.commons.exception.ScdException;
import org.lfenergy.compas.sct.commons.scl.ExtRefService;
Expand Down Expand Up @@ -47,6 +48,7 @@ public class SclService implements SclEditor {
private static final String DO_GOCBREF = "GoCBRef";
private static final String DO_SVCBREF = "SvCBRef";
private static final String DA_SETSRCREF = "setSrcRef";
private static final String DA_SETSRCCB = "setSrcCB";

private final IedService iedService;
private final LdeviceService ldeviceService;
Expand Down Expand Up @@ -248,12 +250,17 @@ private void manageMonitoringLns(List<IedSource> iedSources, SCL scd, TIED tied,
List<TLN> lgosOrLsvsLns = lnService.getFilteredLns(ldsuiedLdevice, tln -> monitoringLnClassEnum.value().equals(tln.getLnClass().getFirst())).toList();
if (lgosOrLsvsLns.isEmpty())
errorHandler.get().add(SclReportItem.warning(tied.getName() + "/" + LDEVICE_LDSUIED + "/" + monitoringLnClassEnum.value(), "There is no LN %s present in LDevice".formatted(monitoringLnClassEnum.value())));
DataRef dataRef = new DataRef(doName, List.of(), DA_SETSRCREF, List.of());
lgosOrLsvsLns.forEach(lgosOrLsvs -> dataTypeTemplateService.findDoLinkedToDa(scd.getDataTypeTemplates(), lgosOrLsvs.getLnType(), dataRef)
DataRef dataRefDaRef = new DataRef(doName, List.of(), DA_SETSRCREF, List.of());
DataRef dataRefDaCb = new DataRef(doName, List.of(), DA_SETSRCCB, List.of());
dataRefSetDaVal(iedSources, scd, tied, ldsuiedLdevice, doName, monitoringLnClassEnum, lgosOrLsvsLns, dataRefDaRef, dataRefDaCb);
}

private void dataRefSetDaVal(List<IedSource> iedSources, SCL scd, TIED tied, TLDevice ldsuiedLdevice, String doName, MonitoringLnClassEnum monitoringLnClassEnum, List<TLN> lgosOrLsvsLns, DataRef dataRefDaRef, DataRef dataRefDaCB) {
lgosOrLsvsLns.forEach(lgosOrLsvs -> dataTypeTemplateService.findDoLinkedToDa(scd.getDataTypeTemplates(), lgosOrLsvs.getLnType(), dataRefDaRef)
.map(doLinkedToDa -> lnService.getDoLinkedToDaCompletedFromDAI(tied, LDEVICE_LDSUIED, lgosOrLsvs, doLinkedToDa))
.filter(doLinkedToDa -> {
if (!doLinkedToDa.isUpdatable())
errorHandler.get().add(SclReportItem.warning(tied.getName() + "/" + LDEVICE_LDSUIED + "/" + monitoringLnClassEnum.value() + "/DOI@name=\"" + doName + "\"/DAI@name=\"setSrcRef\"/Val", "The DAI cannot be updated"));
errorHandler.get().add(SclReportItem.warning(tied.getName() + "/" + LDEVICE_LDSUIED + "/" + monitoringLnClassEnum.value() + "/DOI@name=\"" + doName + "\"/DAI@name=\"" + dataRefDaRef.daName() + "\"/Val", "The DAI cannot be updated"));
return doLinkedToDa.isUpdatable();
})
.ifPresent(doLinkedToDa -> {
Expand All @@ -268,13 +275,30 @@ private void manageMonitoringLns(List<IedSource> iedSources, SCL scd, TIED tied,
doLinkedToDa.dataAttribute().getDaiValues().clear();
doLinkedToDa.dataAttribute().getDaiValues().add(newVal);
lnService.updateOrCreateDOAndDAInstances(lnToAdd, doLinkedToDa);
log.info("Processing %d IED Source in LDName=%s - added LN (lnClass=%s, inst=%s, prefix=%s) - update DOI(name=%s)/DAI(name=%s) with value=%s".formatted(iedSources.size(), ldsuiedLdevice.getLdName(), lgosOrLsvs.getLnClass().getFirst(), String.valueOf(i + 1), lgosOrLsvs.getPrefix(), doName, DA_SETSRCREF, newVal.val()));
addValDaCB(scd, tied, doName, monitoringLnClassEnum, dataRefDaCB, lgosOrLsvs, newVal, lnToAdd);
log.info("Processing %d IED Source in LDName=%s - added LN (lnClass=%s, inst=%s, prefix=%s) - update DOI(name=%s)/DAI(name=%s) with value=%s".formatted(iedSources.size(), ldsuiedLdevice.getLdName(), lgosOrLsvs.getLnClass().getFirst(), String.valueOf(i + 1), lgosOrLsvs.getPrefix(), doName, dataRefDaCB.daName(), newVal.val()));
ldsuiedLdevice.getLN().add(lnToAdd);
}
ldsuiedLdevice.getLN().remove(lgosOrLsvs); //We can remove this LGOS or LSVS as we already added new ones
}));
}

private void addValDaCB(SCL scd, TIED tied, String doName, MonitoringLnClassEnum monitoringLnClassEnum, DataRef dataRefDaCB, TLN lgosOrLsvs, DaVal newVal, TLN lnToAdd) {
Optional<DoLinkedToDa> daCB = dataTypeTemplateService.findDoLinkedToDa(scd.getDataTypeTemplates(), lgosOrLsvs.getLnType(), dataRefDaCB);
daCB.ifPresent(doLinkedToDaCB -> {
DoLinkedToDa doLinkedToDaCBCopy = lnService.getDoLinkedToDaCompletedFromDAI(tied, LDEVICE_LDSUIED, lgosOrLsvs, doLinkedToDaCB);
if (doLinkedToDaCBCopy.isUpdatable()) {
doLinkedToDaCBCopy.dataAttribute().getDaiValues().clear();
doLinkedToDaCBCopy.dataAttribute().getDaiValues().add(newVal);
lnService.updateOrCreateDOAndDAInstances(lnToAdd, doLinkedToDaCBCopy);
}
else{
errorHandler.get().add(SclReportItem.warning(
tied.getName() + "/" + LDEVICE_LDSUIED + "/" + monitoringLnClassEnum.value() + "/DOI@name=\"" + doName + "\"/DAI@name=\"" + dataRefDaCB.daName() + "\"/Val", "The DAI cannot be updated"));
}
});
}

record IedSource(String iedName, String srcCBName, String srcLdInst, TServiceType serviceType){}

}
21 changes: 21 additions & 0 deletions sct-commons/src/test/java/org/lfenergy/compas/sct/commons/SclServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,27 @@ void manageMonitoringLns_should_update_and_create_lsvs_and_goose() {
.filteredOn(tUnNaming -> tUnNaming.getClass().equals(TDAI.class) && ((TDAI)tUnNaming).getName().equals("setSrcRef"))
.map(tUnNaming -> ((TDAI)tUnNaming).getVal().getFirst().getValue())
.containsExactlyInAnyOrder("IED_NAME2LD_INST21/LLN0.smv2", "IED_NAME2LD_INST22/LLN0.smv2");

// LGOS setSrcCb values
assertThat(tlns)
.filteredOn(tln -> tln.getLnClass().contains("LGOS") && tln.getInst().equals("1")
|| tln.getLnClass().contains("LGOS") && tln.getInst().equals("2"))
.flatExtracting(TAnyLN::getDOI)
.filteredOn(tdoi -> tdoi.getName().equals("GoCBRef"))
.flatExtracting(TDOI::getSDIOrDAI)
.filteredOn(tUnNaming -> tUnNaming.getClass().equals(TDAI.class) && ((TDAI)tUnNaming).getName().equals("setSrcCB"))
.map(tUnNaming -> ((TDAI)tUnNaming).getVal().getFirst().getValue())
.containsExactlyInAnyOrder("IED_NAME2LD_INST21/LLN0.goose1", "IED_NAME2LD_INST22/LLN0.goose1");
// LSVS setSrcCb values
assertThat(tlns)
.filteredOn(tln -> (tln.getLnClass().contains("LSVS") && tln.getInst().equals("1")
|| tln.getLnClass().contains("LSVS") && tln.getInst().equals("2")))
.flatExtracting(TAnyLN::getDOI)
.filteredOn(tdoi -> tdoi.getName().equals("SvCBRef"))
.flatExtracting(TDOI::getSDIOrDAI)
.filteredOn(tUnNaming -> tUnNaming.getClass().equals(TDAI.class) && ((TDAI)tUnNaming).getName().equals("setSrcCB"))
.map(tUnNaming -> ((TDAI)tUnNaming).getVal().getFirst().getValue())
.containsExactlyInAnyOrder("IED_NAME2LD_INST21/LLN0.smv2", "IED_NAME2LD_INST22/LLN0.smv2");
});
}

Expand Down
5 changes: 5 additions & 0 deletions sct-commons/src/test/resources/monitoring_lns/scd_monitoring_lsvs_lgos.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,16 @@
<DOI name="SvCBRef">
<DAI name="setSrcRef" valKind="RO" valImport="true">
</DAI>
<DAI name="setSrcCB" valKind="RO" valImport="true">
</DAI>
</DOI>
</LN>
<LN lnClass="LGOS" inst="1" lnType="LNLGOS">
<DOI name="GoCBRef">
<DAI name="setSrcRef" valKind="RO" valImport="true">
</DAI>
<DAI name="setSrcCB" valKind="RO" valImport="true">
</DAI>
</DOI>
</LN>
</LDevice>
Expand Down Expand Up @@ -121,6 +125,7 @@
</DOType>
<DOType id="DOLN" cdc="ORG">
<DA name="setSrcRef" bType="ObjRef" dchg="true" fc="SP"/>
<DA name="setSrcCB" bType="ObjRef" dchg="true" fc="SP"/>
</DOType>
</DataTypeTemplates>
</SCL>
Loading