| commit | ed0805ffe1673c485811cea2b8f5dfec782895e5 | [log] [tgz] |
|---|---|---|
| author | Simon Reis <simon.reis@pta.de> | Mon Nov 02 11:29:19 2020 +0100 |
| committer | Simon Reis <simon.reis@pta.de> | Mon Nov 02 11:29:19 2020 +0100 |
| tree | 2bd32efcaca933fbadf4fac8349c66b69821a37a | |
| parent | 516fc1d528519666d8039af5fec609de40851475 [diff] | |
| parent | c468a9f0a2bf86b9c00ef5d0f72461a7f6c571f1 [diff] |
Merge branch 'DEVELOP'
diff --git a/SARIS-Interface/src/main/java/org/eclipse/openk/gridfailureinformation/sarisinterface/controller/ImportController.java b/SARIS-Interface/src/main/java/org/eclipse/openk/gridfailureinformation/sarisinterface/controller/ImportController.java index bb064ac..8ad134d 100644 --- a/SARIS-Interface/src/main/java/org/eclipse/openk/gridfailureinformation/sarisinterface/controller/ImportController.java +++ b/SARIS-Interface/src/main/java/org/eclipse/openk/gridfailureinformation/sarisinterface/controller/ImportController.java
@@ -53,8 +53,8 @@ @ResponseStatus(HttpStatus.OK) public void importUserNotification() { importService.importForeignFailures(Constants.SARIS_ELECTRICITY_BRANCH_ID); - /*importService.importForeignFailures(Constants.SARIS_GAS_BRANCH_ID); - importService.importForeignFailures(Constants.SARIS_WATER_BRANCH_ID);*/ + importService.importForeignFailures(Constants.SARIS_GAS_BRANCH_ID); + importService.importForeignFailures(Constants.SARIS_WATER_BRANCH_ID); } @GetMapping("/response-test")
diff --git a/SARIS-Interface/src/main/java/org/eclipse/openk/gridfailureinformation/sarisinterface/service/ImportService.java b/SARIS-Interface/src/main/java/org/eclipse/openk/gridfailureinformation/sarisinterface/service/ImportService.java index a77ce54..923a154 100644 --- a/SARIS-Interface/src/main/java/org/eclipse/openk/gridfailureinformation/sarisinterface/service/ImportService.java +++ b/SARIS-Interface/src/main/java/org/eclipse/openk/gridfailureinformation/sarisinterface/service/ImportService.java
@@ -68,9 +68,9 @@ public void importForeignFailures(int sarisSparteId) { -// GetAktuelleGVUsInfoAllgemeinResponse sarisResponse = sarisWebservice.getAktuelleGVU(sarisSparteId, false); + GetAktuelleGVUsInfoAllgemeinResponse sarisResponse = sarisWebservice.getAktuelleGVU(sarisSparteId, false); - GetAktuelleGVUsInfoAllgemeinResponse sarisResponse = getMockedSarisResponse("sarisRealMockResponse.xml"); + //GetAktuelleGVUsInfoAllgemeinResponse sarisResponse = getMockedSarisResponse("sarisRealMockResponse.xml"); ArrayOfViewGeplanteVU getAktuelleGVUsInfoAllgemeinResult = sarisResponse.getGetAktuelleGVUsInfoAllgemeinResult();