Skip to content

Commit dda94a6

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

File tree

49 files changed

+667
-357
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

+667
-357
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
@@ -67,6 +67,9 @@ public class BatteryTabInfos extends ElementInfosWithProperties {
6767
@JsonInclude(JsonInclude.Include.NON_NULL)
6868
private Country country;
6969

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

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
@@ -36,6 +36,9 @@ public class BusTabInfos extends ElementInfosWithProperties {
3636
@JsonInclude(JsonInclude.Include.NON_NULL)
3737
private Country country;
3838

39+
@JsonInclude(JsonInclude.Include.NON_NULL)
40+
private String substationId;
41+
3942
@JsonInclude(JsonInclude.Include.NON_NULL)
4043
private Map<String, String> substationProperties;
4144

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
@@ -34,4 +34,7 @@ public class BusBarSectionTabInfos extends ElementInfosWithProperties {
3434

3535
@JsonInclude(JsonInclude.Include.NON_NULL)
3636
private Map<String, String> voltageLevelProperties;
37+
38+
@JsonInclude(JsonInclude.Include.NON_NULL)
39+
private String substationId;
3740
}

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
@@ -32,6 +32,9 @@ public class DanglingLineTabInfos 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 Boolean terminalConnected;
3639

3740
@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
@@ -47,6 +47,12 @@ public class HvdcTabInfos extends ElementInfosWithProperties {
4747
@JsonInclude(JsonInclude.Include.NON_NULL)
4848
private Country country2;
4949

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

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
@@ -36,6 +36,9 @@ public class LccConverterStationTabInfos extends ElementInfosWithProperties {
3636
@JsonInclude(JsonInclude.Include.NON_NULL)
3737
private Country country;
3838

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

4144
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
@@ -33,6 +33,9 @@ public class LoadTabInfos extends ElementInfosWithProperties {
3333
@JsonInclude(JsonInclude.Include.NON_NULL)
3434
private Country country;
3535

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

3841
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
@@ -31,6 +31,9 @@ public class ShuntCompensatorTabInfos 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/staticvarcompensator/StaticVarCompensatorTabInfos.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ public class StaticVarCompensatorTabInfos 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 Boolean terminalConnected;
3639

3740
private StaticVarCompensator.RegulationMode regulationMode;

0 commit comments

Comments
 (0)