SI-2433 Verheiraten von FE und BE
diff --git a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/api/SitCacheApi.java b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/api/SitCacheApi.java
index a79fa66..5d863a9 100644
--- a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/api/SitCacheApi.java
+++ b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/api/SitCacheApi.java
@@ -15,6 +15,7 @@
package org.eclipse.openk.gridfailureinformation.api;
+import org.eclipse.openk.gridfailureinformation.viewmodel.FESettingsDto;
import org.eclipse.openk.gridfailureinformation.viewmodel.FailureInformationDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@@ -29,4 +30,8 @@
public void postPublicFailureInfos(
@RequestBody List<FailureInformationDto> failureInfoToPublish);
+ @PostMapping("/fe-settings")
+ public void postFeSettings(
+ @RequestBody FESettingsDto feSettings);
+
}
diff --git a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/config/DmzExportSchedulerConfig.java b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/config/DmzExportSchedulerConfig.java
index a0051a5..54edae4 100644
--- a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/config/DmzExportSchedulerConfig.java
+++ b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/config/DmzExportSchedulerConfig.java
@@ -31,8 +31,12 @@
@Scheduled(cron = "${export-to-dmz.cron}")
public void scheduleTaskDmzExport() {
- log.info("Executing" + SCHEDULER_NAME + " task: Exporting FailureInformations with Status 'published' to DMZ" );
+ log.debug("Executing" + SCHEDULER_NAME + " task: Exporting FailureInformations with Status 'published' to DMZ" );
exportService.exportFailureInformationsToDMZ();
- log.info("Finished " + SCHEDULER_NAME + " task: Exporting FailureInformations with Status 'published' to DMZ");
+ log.debug("Finished " + SCHEDULER_NAME + " task: Exporting FailureInformations with Status 'published' to DMZ");
+ log.debug("Executing" + SCHEDULER_NAME + " task: Exporting FE-Settings to DMZ" );
+ exportService.exportFeSettingsToDMZ();
+ log.debug("Finished " + SCHEDULER_NAME + " task: Exporting FE-Settings to DMZ");
+
}
}
diff --git a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/config/FESettings.java b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/config/FESettings.java
index b9e03b3..ad3ad37 100644
--- a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/config/FESettings.java
+++ b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/config/FESettings.java
@@ -22,6 +22,10 @@
public String overviewMapInitialZoom;
@Value("${spring.settings.detailMapInitialZoom}")
public String detailMapInitialZoom;
+ @Value("${spring.settings.overviewMapInitialLatitude}")
+ public String overviewMapInitialLatitude;
+ @Value("${spring.settings.overviewMapInitialLongitude}")
+ public String overviewMapInitialLongitude;
}
diff --git a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/controller/DistributionGroupController.java b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/controller/DistributionGroupController.java
index 495ed62..b1f5779 100644
--- a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/controller/DistributionGroupController.java
+++ b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/controller/DistributionGroupController.java
@@ -92,7 +92,7 @@
distributionGroupService.deleteDistributionGroup(groupUuid);
}
catch ( Exception e ) {
- log.info("Exception in delete distribution group: ", e);
+ log.error("Exception in delete distribution group: ", e);
throw new ConflictException("distribution.group.still.in.use");
}
}
diff --git a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/ExportService.java b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/ExportService.java
index 2f842ec..0a04974 100644
--- a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/ExportService.java
+++ b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/ExportService.java
@@ -102,6 +102,9 @@
@Autowired
private SitCacheApi sitCacheApi;
+ @Autowired
+ private SettingsService settingsService;
+
private static final String SUBJECT_DATE_PATTERN_APPLIED = "EEEE', den' dd.MM.yy 'um' HH:mm:ss";
protected Map<String,String> contentReplaceMap;
protected int countExportedMessages;
@@ -215,12 +218,19 @@
.collect(Collectors.toList());
- try{
+ try {
sitCacheApi.postPublicFailureInfos(failureInfoDtossVeroeffentlicht);
- }
- catch(Exception e){
+ } catch (Exception e) {
log.error("error.exporting.published.failure.infos", e);
- }
+ }
+ }
+
+ public void exportFeSettingsToDMZ(){
+ try {
+ sitCacheApi.postFeSettings(settingsService.getFESettings());
+ } catch (Exception e) {
+ log.error("error.exporting.feSettings.to.DMZ", e);
+ }
}
private boolean isChannelAlreadyPublished(String targetChannel, TblFailureInformation existingTblFailureInfo) {
@@ -349,7 +359,7 @@
log.info("RabbitMq: Successfully sent msg: Export-Exchange: " + rabbitMqProperties.getExportExchange() + " Export-Queue: " + rabbitMqChannel.getExportQueue()
+ " Export-Key: " + rabbitMqChannel.getExportKey());
} catch (Exception e) {
- log.debug(e.getMessage(), e);
+ log.error(e.getMessage(), e);
throw new InternalServerErrorException("could.not.push.rabbitMqMessage");
}
}
diff --git a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/SettingsService.java b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/SettingsService.java
index b69eb45..a5af236 100644
--- a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/SettingsService.java
+++ b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/SettingsService.java
@@ -31,9 +31,13 @@
@Autowired
private FESettings feSettings;
+ private FESettingsDto feSettingsDto;
+
public FESettingsDto getFESettings(){
- FESettingsDto feSettingsDto = new FESettingsDto();
+ if (feSettingsDto != null) return feSettingsDto;
+
+ feSettingsDto = new FESettingsDto();
List<RabbitMqChannel> rabbitMqChannels = feSettings.getChannels();
List<String> channelNames = new LinkedList();
@@ -44,6 +48,8 @@
feSettingsDto.setExportChannels(channelNames);
feSettingsDto.setDetailMapInitialZoom(feSettings.getDetailMapInitialZoom());
feSettingsDto.setOverviewMapInitialZoom(feSettings.getOverviewMapInitialZoom());
+ feSettingsDto.setOverviewMapInitialLatitude(feSettings.getOverviewMapInitialLatitude());
+ feSettingsDto.setOverviewMapInitialLongitude(feSettings.getOverviewMapInitialLongitude());
return feSettingsDto;
}
diff --git a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/viewmodel/FESettingsDto.java b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/viewmodel/FESettingsDto.java
index e02af47..b3f2fcc 100644
--- a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/viewmodel/FESettingsDto.java
+++ b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/viewmodel/FESettingsDto.java
@@ -25,4 +25,7 @@
public String overviewMapInitialZoom;
public String detailMapInitialZoom;
+ public String overviewMapInitialLatitude;
+ public String overviewMapInitialLongitude;
+
}
diff --git a/gfsBackendService/src/main/resources/application.yml b/gfsBackendService/src/main/resources/application.yml
index 1309fc1..5831633 100644
--- a/gfsBackendService/src/main/resources/application.yml
+++ b/gfsBackendService/src/main/resources/application.yml
@@ -45,6 +45,8 @@
settings:
overviewMapInitialZoom: 10
detailMapInitialZoom: 10
+ overviewMapInitialLatitude: 49.656634
+ overviewMapInitialLongitude: 8.423207
jpa:
show-sql: false
diff --git a/gfsBackendService/src/main/resources/application_localdev.yml b/gfsBackendService/src/main/resources/application_localdev.yml
index 1b7dc6d..d7b1c67 100644
--- a/gfsBackendService/src/main/resources/application_localdev.yml
+++ b/gfsBackendService/src/main/resources/application_localdev.yml
@@ -46,6 +46,8 @@
settings:
overviewMapInitialZoom: 10
detailMapInitialZoom: 10
+ overviewMapInitialLatitude: 49.656634
+ overviewMapInitialLongitude: 8.423207
jpa:
show-sql: false
@@ -87,6 +89,7 @@
portalFeLoginURL: http://entopkon:8880/portalFE/#/login
portalFeModulename: SIT DEV
+
authNAuthService:
ribbon:
listOfServers: http://entopkon:8880
@@ -95,6 +98,10 @@
ribbon:
listOfServers: http://entdockergss:9156
+sitCacheService:
+ ribbon:
+ listOfServers: http://localhost:3000
+
cors:
corsEnabled: true
diff --git a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/SettingsServiceTest.java b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/SettingsServiceTest.java
index f85d4d4..c9e17e9 100644
--- a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/SettingsServiceTest.java
+++ b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/SettingsServiceTest.java
@@ -47,5 +47,7 @@
assertFalse(feSettingsDto.getDetailMapInitialZoom() == null);
assertFalse(feSettingsDto.getOverviewMapInitialZoom()== null);
assertFalse(feSettingsDto.getExportChannels() == null);
+ assertFalse(feSettingsDto.getOverviewMapInitialLatitude() == null);
+ assertFalse(feSettingsDto.getOverviewMapInitialLongitude() == null);
}
}
