Merge branch 'DEVELOP' of ssh://git.eclipse.org:29418/openk-usermodules/org.eclipse.openk-usermodules.gridFailureInformation.backend into DEVELOP
diff --git a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationService.java b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationService.java
index 78e3522..768a9ef 100644
--- a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationService.java
+++ b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationService.java
@@ -611,6 +611,7 @@
condensedFailureInformation.setLongitude(tblInfTocheck.get().getLongitude());
condensedFailureInformation.setLatitude(tblInfTocheck.get().getLatitude());
condensedFailureInformation.setAddressType(tblInfTocheck.get().getAddressType());
+ condensedFailureInformation.setFaultLocationArea(tblInfTocheck.get().getFaultLocationArea());
}
}
else {
@@ -629,6 +630,7 @@
if (firstFailureInformationFiltered.isPresent()) {
condensedFailureInformation.setLongitude(firstFailureInformationFiltered.get().getLongitude());
condensedFailureInformation.setLatitude(firstFailureInformationFiltered.get().getLatitude());
+ condensedFailureInformation.setFaultLocationArea(firstFailureInformationFiltered.get().getFaultLocationArea());
}
}
diff --git a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/StationService.java b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/StationService.java
index 13d4bb1..142cbd3 100644
--- a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/StationService.java
+++ b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/StationService.java
@@ -43,6 +43,8 @@
public List<StationDto> getStations() {
return stationRepository.findAll().stream()
.map(stationMapper::toStationDto)
+ .sorted( (x, y) -> (x.getStationName()+"@"+ x.getStationId())
+ .compareTo(y.getStationName()+"@"+y.getStationId()))
.collect(Collectors.toList());
}
diff --git a/gfsBackendService/src/main/resources/application.yml b/gfsBackendService/src/main/resources/application.yml
index 25173c5..ef6e0bd 100644
--- a/gfsBackendService/src/main/resources/application.yml
+++ b/gfsBackendService/src/main/resources/application.yml
@@ -352,7 +352,9 @@
- name: Störungsauskunft.de
exportQueue: sit_stoerungsauskunft_export_queue_branch
exportKey: sit_stoerungsauskunft_export_key
-
+ - name: Störinfotool-eigene-Web-Komponenten
+ exportQueue: sit_own_export_queue
+ exportKey: sit_own_export_key
logging:
level:
root: INFO
@@ -403,7 +405,9 @@
- name: Störungsauskunft.de
exportQueue: sit_stoerungsauskunft_export_queue
exportKey: sit_stoerungsauskunft_export_key
-
+ - name: Störinfotool-eigene-Web-Komponenten
+ exportQueue: sit_own_export_queue
+ exportKey: sit_own_export_key
logging:
level:
root: INFO
