Merge branch 'DEVELOP'
diff --git a/addressImport/src/main/resources/application.yml b/addressImport/src/main/resources/application.yml
index 9904582..eeab8ac 100644
--- a/addressImport/src/main/resources/application.yml
+++ b/addressImport/src/main/resources/application.yml
@@ -26,10 +26,10 @@
# database-platform: org.hibernate.dialect.Oracle10gDialect
# show-sql: false
#
-#oracle:
-# ucp:
-# minPoolSize: 2
-# maxPoolSize: 10
+oracle:
+ ucp:
+ minPoolSize: 2
+ maxPoolSize: 10
# End Orale Config---------------------------------------------------
server:
@@ -89,6 +89,7 @@
profiles: test
datasource:
url: jdbc:h2:mem:test;DB_CLOSE_DELAY=-1
+ enable-oracle-configuration: false
jpa:
hibernate:
ddl-auto: create
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 66c8ad3..7621a45 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
@@ -406,7 +406,7 @@
public FailureInformationDto enrichFailureInfo(FailureInformationDto failureInformationDto) {
// wenn Mittelspannung dann füge Adress-Polygonpunkte für Kartenanzeige hinzu
- if(failureInformationDto.getVoltageLevel() != null && failureInformationDto.getVoltageLevel().equals("MS")) {
+ if("TK".equalsIgnoreCase(failureInformationDto.getBranch()) || failureInformationDto.getVoltageLevel() != null && failureInformationDto.getVoltageLevel().equals("MS")) {
addPolygonAddressPoints(failureInformationDto);
}
diff --git a/gfsBackendService/src/main/resources/application.yml b/gfsBackendService/src/main/resources/application.yml
index 37ae1c7..903142a 100644
--- a/gfsBackendService/src/main/resources/application.yml
+++ b/gfsBackendService/src/main/resources/application.yml
@@ -401,26 +401,6 @@
database-platform: org.hibernate.dialect.Oracle10gDialect
show-sql: false
- rabbitmq:
- # Importkanal
- importExchange: sitImportExchange_branch
- importQueue: sitImportQueue_branch
- importkey: sitImportExchange.failureImportKey
-
- # Exportkanäle
- exportExchange: sitExportExchange_branch
- channels:
- - name: Mail
- exportQueue: sit_mail_export_queue_branch
- exportKey: sit_mail_export_key
- isMailType: true
- - 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
-
oracle:
ucp:
minPoolSize: 2
