Skip to content

Commit 2aea17a

Browse files
committed
Add substationId on all equipments TAB view
Signed-off-by: Franck LECUYER <[email protected]>
1 parent 3be1bcf commit 2aea17a

File tree

49 files changed

+480
-190
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+480
-190
lines changed

src/main/java/org/gridsuite/network/map/dto/definition/battery/BatteryTabInfos.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ public class BatteryTabInfos extends ElementInfosWithProperties {
6666
@JsonInclude(JsonInclude.Include.NON_NULL)
6767
private Country country;
6868

69+
@JsonInclude(JsonInclude.Include.NON_NULL)
70+
private String substationId;
71+
6972
@JsonInclude(JsonInclude.Include.NON_ABSENT)
7073
private Optional<MeasurementsInfos> measurementP;
7174

src/main/java/org/gridsuite/network/map/dto/definition/bus/BusTabInfos.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,7 @@ public class BusTabInfos extends ElementInfosWithProperties {
3232

3333
@JsonInclude(JsonInclude.Include.NON_NULL)
3434
private Country country;
35+
36+
@JsonInclude(JsonInclude.Include.NON_NULL)
37+
private String substationId;
3538
}

src/main/java/org/gridsuite/network/map/dto/definition/busbarsection/BusBarSectionTabInfos.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,7 @@ public class BusBarSectionTabInfos extends ElementInfosWithProperties {
2727

2828
@JsonInclude(JsonInclude.Include.NON_ABSENT)
2929
private Optional<MeasurementsInfos> measurementAngle;
30+
31+
@JsonInclude(JsonInclude.Include.NON_NULL)
32+
private String substationId;
3033
}

src/main/java/org/gridsuite/network/map/dto/definition/danglingline/DanglingLineTabInfos.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ public class DanglingLineTabInfos extends ElementInfosWithProperties {
3131
@JsonInclude(JsonInclude.Include.NON_NULL)
3232
private Country country;
3333

34+
@JsonInclude(JsonInclude.Include.NON_NULL)
35+
private String substationId;
36+
3437
private Boolean terminalConnected;
3538

3639
@JsonInclude(JsonInclude.Include.NON_NULL)

src/main/java/org/gridsuite/network/map/dto/definition/hvdc/HvdcTabInfos.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,12 @@ public class HvdcTabInfos extends ElementInfosWithProperties {
4646
@JsonInclude(JsonInclude.Include.NON_NULL)
4747
private Country country2;
4848

49+
@JsonInclude(JsonInclude.Include.NON_NULL)
50+
private String substationId1;
51+
52+
@JsonInclude(JsonInclude.Include.NON_NULL)
53+
private String substationId2;
54+
4955
@JsonInclude(JsonInclude.Include.NON_NULL)
5056
private Double activePowerSetpoint;
5157

src/main/java/org/gridsuite/network/map/dto/definition/lccconverterstation/LccConverterStationTabInfos.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ public class LccConverterStationTabInfos extends ElementInfosWithProperties {
3535
@JsonInclude(JsonInclude.Include.NON_NULL)
3636
private Country country;
3737

38+
@JsonInclude(JsonInclude.Include.NON_NULL)
39+
private String substationId;
40+
3841
private Boolean terminalConnected;
3942

4043
private String hvdcLineId;

src/main/java/org/gridsuite/network/map/dto/definition/line/LineTabInfos.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,12 @@ public class LineTabInfos extends ElementInfosWithProperties {
4646
@JsonInclude(JsonInclude.Include.NON_NULL)
4747
private Country country2;
4848

49+
@JsonInclude(JsonInclude.Include.NON_NULL)
50+
private String substationId1;
51+
52+
@JsonInclude(JsonInclude.Include.NON_NULL)
53+
private String substationId2;
54+
4955
private Boolean terminal1Connected;
5056

5157
private Boolean terminal2Connected;

src/main/java/org/gridsuite/network/map/dto/definition/load/LoadTabInfos.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ public class LoadTabInfos extends ElementInfosWithProperties {
3232
@JsonInclude(JsonInclude.Include.NON_NULL)
3333
private Country country;
3434

35+
@JsonInclude(JsonInclude.Include.NON_NULL)
36+
private String substationId;
37+
3538
private Double nominalVoltage;
3639

3740
private Boolean terminalConnected;

src/main/java/org/gridsuite/network/map/dto/definition/shuntcompensator/ShuntCompensatorTabInfos.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ public class ShuntCompensatorTabInfos extends ElementInfosWithProperties {
3030
@JsonInclude(JsonInclude.Include.NON_NULL)
3131
private Country country;
3232

33+
@JsonInclude(JsonInclude.Include.NON_NULL)
34+
private String substationId;
35+
3336
private Boolean terminalConnected;
3437

3538
@JsonInclude(JsonInclude.Include.NON_NULL)

src/main/java/org/gridsuite/network/map/dto/definition/staticvarcompensator/StaticVarCompensatorTabInfos.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ public class StaticVarCompensatorTabInfos extends ElementInfosWithProperties {
3131
@JsonInclude(JsonInclude.Include.NON_NULL)
3232
private Country country;
3333

34+
@JsonInclude(JsonInclude.Include.NON_NULL)
35+
private String substationId;
36+
3437
private Boolean terminalConnected;
3538

3639
private StaticVarCompensator.RegulationMode regulationMode;

0 commit comments

Comments
 (0)