Commit 4f77e4ab authored by Simon Reis's avatar Simon Reis
Browse files

Merge branch 'DEVELOP'

parents 01bdec92 de1fd0d0
......@@ -26,10 +26,10 @@ spring:
# 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 @@ spring:
profiles: test
datasource:
url: jdbc:h2:mem:test;DB_CLOSE_DELAY=-1
enable-oracle-configuration: false
jpa:
hibernate:
ddl-auto: create
......
......@@ -406,7 +406,7 @@ public class FailureInformationService {
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);
}
......
......@@ -401,26 +401,6 @@ spring:
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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment