Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Krueger2015-06-05 07:55:29 -0400
committerJan Krueger2015-06-05 07:55:29 -0400
commit95ffd7cfea9ba0ab7cf4fe5a4d623a91d2619e5a (patch)
tree19b2ef84361e3c3ddebfda90664ade4bf267265a
parentdddd14260c3d24204d6b8c3636aa103af2654dfd (diff)
downloadorg.eclipse.openk-platform.openk-repo-95ffd7cfea9ba0ab7cf4fe5a4d623a91d2619e5a.tar.gz
org.eclipse.openk-platform.openk-repo-95ffd7cfea9ba0ab7cf4fe5a4d623a91d2619e5a.tar.xz
org.eclipse.openk-platform.openk-repo-95ffd7cfea9ba0ab7cf4fe5a4d623a91d2619e5a.zip
start implementation for validation
-rw-r--r--openk-platform/config/liferay-portal-ext/portal-ext.properties8
-rw-r--r--openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/adapter/rest/GeographicalRegionRestConsumer.java16
-rw-r--r--openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/adapter/rest/SubstationRestConsumer.java11
-rw-r--r--openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/adapter/rest/SynchronousMachineRestConsumer.java1
-rw-r--r--openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/controller/rest/GeographicalRegionRestController.java11
-rw-r--r--openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/controller/rest/SynchronousMachineRestController.java2
-rw-r--r--openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/core/Equipment.java8
-rw-r--r--openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/core/EquipmentContainer.java20
-rw-r--r--openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/core/GeographicalRegion.java13
-rw-r--r--openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/core/SubGeographicalRegion.java7
-rw-r--r--openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/core/Substation.java3
-rw-r--r--openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/core/Terminal.java4
-rw-r--r--openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/marketoperations/mktdomain/UnitType.java26
-rw-r--r--openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/marketoperations/referencedata/RegisteredGenerator.java6
-rw-r--r--openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/meas/Analog.java40
-rw-r--r--openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/wires/SynchronousMachine.java7
-rw-r--r--openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/service/GeographicalRegionValidatorService.java25
-rw-r--r--openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/service/SynchronousMachineValidatorService.java54
-rw-r--r--openk-platform/openk-cachedb-service/src/main/resources/flyway-migration/V01/_00/OPENK_CACHEDB_V01_00_001__init.sql54
-rw-r--r--openk-platform/openk-cachedb-service/src/test/java/org/eclipse/openk/adapter/rest/GeographicalRegionRestConsumerTest.java96
-rw-r--r--openk-platform/openk-cachedb-service/src/test/java/org/eclipse/openk/adapter/rest/SubstationRestConsumerTest.java2
-rw-r--r--openk-platform/openk-cachedb-service/src/test/java/org/eclipse/openk/adapter/rest/SynchronousMachineRestConsumerTest.java20
-rw-r--r--openk-platform/openk-cachedb-service/src/test/java/org/eclipse/openk/repository/AbstractRepositoryJpaTest.java27
-rw-r--r--openk-platform/openk-cachedb-service/src/test/java/org/eclipse/openk/service/GeographicalRegionValidatorServiceTest.java41
-rw-r--r--openk-platform/openk-cachedb-service/src/test/java/org/eclipse/openk/service/SynchronousMachineValidatorServiceTest.java39
-rw-r--r--openk-platform/openk-cachedb-service/src/test/resources/json-test-samples/geographicalregion-netstate-sample-01.json141
-rw-r--r--openk-platform/openk-cachedb-service/src/test/resources/json-test-samples/geographicalregion-netstate-sample-02.json201
-rw-r--r--openk-platform/openk-cachedb-service/src/test/resources/json-test-samples/geographicalregion-sample-06.json (renamed from openk-platform/openk-cachedb-service/src/test/resources/json-test-samples/geographicalregion-sample-01.json)0
-rw-r--r--openk-platform/openk-cachedb-service/src/test/resources/json-test-samples/geographicalregion-sample-07.json (renamed from openk-platform/openk-cachedb-service/src/test/resources/json-test-samples/geographicalregion-sample-02.json)0
-rw-r--r--openk-platform/openk-cachedb-service/src/test/resources/json-test-samples/geographicalregion-topology-sample-01.json1470
-rw-r--r--openk-platform/openk-cachedb-service/src/test/resources/json-test-samples/geographicalregion-topology-sample-02.json76
-rw-r--r--openk-platform/openk-cachedb-service/src/test/resources/json-test-samples/synchronousmachine-sample-01.json56
-rw-r--r--openk-platform/openk-cachedb-service/src/test/resources/json-test-samples/synchronousmachine-sample-02.json18
-rw-r--r--openk-platform/openk-cachedb-service/src/test/resources/json-test-samples/synchronousmachine-sample-04.json184
-rw-r--r--openk-platform/openk-cachedb-service/src/test/sql/cachedb-insert-data.sql78
-rw-r--r--openk-platform/openk-eisman-portlet/pom.xml12
-rw-r--r--openk-platform/openk-eisman-portlet/src/main/java/org/eclipse/openk/eisman/adapter/rest/SubGeographicalRegionRestConsumer.java9
-rw-r--r--openk-platform/openk-eisman-portlet/src/main/java/org/eclipse/openk/eisman/adapter/rest/SubstationRestConsumer.java2
-rw-r--r--openk-platform/openk-interfaces/src/main/java/org/eclipse/openk/model/cim/meas/Analog.java6
-rw-r--r--openk-platform/openk-interfaces/uml-diagram/cim-modell.uml326
40 files changed, 2674 insertions, 446 deletions
diff --git a/openk-platform/config/liferay-portal-ext/portal-ext.properties b/openk-platform/config/liferay-portal-ext/portal-ext.properties
index 1df259c0..9dcda28d 100644
--- a/openk-platform/config/liferay-portal-ext/portal-ext.properties
+++ b/openk-platform/config/liferay-portal-ext/portal-ext.properties
@@ -29,14 +29,12 @@ openk.scheduler.job.synchronousMachineDataJob.minute = 43
# ESB and REST URIs running on ESB
esb.url.base=http://localhost:8080
esb.rest.uri.synchronousmachine=/openk-cachedb-service/rest/synchronousmachine/
-esb.rest.uri.substation=/openk-cachedb-service/rest/topology/substation/
+esb.rest.uri.topology.geographicalregion=/openk-cachedb-service/rest/topology/geographicalregion
+esb.rest.uri.netstate.geographicalregion=/openk-cachedb-service/rest/netstate/geographicalregion
esb.rest.uri.substation.lov=/openk-cachedb-service/rest/substation/lov
-esb.rest.uri.geographicalregion=/openk-cachedb-service/rest/topology/geographicalregion
esb.rest.uri.subgeographicalregion.lov=/openk-cachedb-service/rest/subgeographicalregion/lov
-#esb.rest.uri.subgeographicalregion.substationlist=/subgeographicalregion/substationlist
esb.rest.uri.substation.mrid=/openk-cachedb-service/rest/substation/mrid
-esb.rest.substationlist=/synchronousmachinelist
-#esb.rest.uri.substation.synchronousmachinlist=/substationlist/synchronousmachinelist
+esb.rest.synchronousmachinelist=/synchronousmachinelist
# Possible Reduction Settings (Absenkstufen)
reduction.settings=10,20,30,40,50,60,70,80,90
diff --git a/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/adapter/rest/GeographicalRegionRestConsumer.java b/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/adapter/rest/GeographicalRegionRestConsumer.java
index a2becc9b..eefae5c1 100644
--- a/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/adapter/rest/GeographicalRegionRestConsumer.java
+++ b/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/adapter/rest/GeographicalRegionRestConsumer.java
@@ -23,13 +23,23 @@ public class GeographicalRegionRestConsumer {
final RestTemplate restTemplate = new RestTemplate();
/**
- * Get GeographicalRegion from REST-Service
+ * Get GeographicalRegion with topology data from REST-Service
*
* @return
*/
- public GeographicalRegion getGeographicalRegion() {
- final String uri = PropsUtil.get("esb.url.base") + PropsUtil.get("esb.rest.uri.geographicalregion");
+ public GeographicalRegion getGeographicalRegionTopology() {
+ final String uri = PropsUtil.get("esb.url.base") + PropsUtil.get("esb.rest.uri.topology.geographicalregion");
+ // todo: hier ist ein Service aufzurufen, der die Validierung und die Persisitierung übernimmt
return restTemplate.getForObject(uri, GeographicalRegion.class);
}
+ /**
+ * Get GeographicalRegion with topology data from REST-Service
+ *
+ * @return
+ */
+ public GeographicalRegion getGeographicalRegionNetstate() {
+ final String uri = PropsUtil.get("esb.url.base") + PropsUtil.get("esb.rest.uri.netstate.geographicalregion");
+ return restTemplate.getForObject(uri, GeographicalRegion.class);
+ }
}
diff --git a/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/adapter/rest/SubstationRestConsumer.java b/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/adapter/rest/SubstationRestConsumer.java
index 304d9490..0999b2a9 100644
--- a/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/adapter/rest/SubstationRestConsumer.java
+++ b/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/adapter/rest/SubstationRestConsumer.java
@@ -12,13 +12,12 @@
*/
package org.eclipse.openk.adapter.rest;
-import com.liferay.portal.kernel.util.PropsUtil;
-import org.eclipse.openk.model.core.Substation;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
@Service
public class SubstationRestConsumer {
+ // todo: der Consumer ist nicht mehr notwendig
private final RestTemplate restTemplate = new RestTemplate();
@@ -28,8 +27,8 @@ public class SubstationRestConsumer {
* @param id
* @return
*/
- public Substation getSubstation(final Long id) {
- final String uri = PropsUtil.get("esb.url.base") + PropsUtil.get("esb.rest.uri.substation") + id.toString();
- return restTemplate.getForObject(uri, Substation.class);
- }
+// public Substation getSubstation(final Long id) {
+// final String uri = PropsUtil.get("esb.url.base") + PropsUtil.get("esb.rest.uri.substation") + id.toString();
+// return restTemplate.getForObject(uri, Substation.class);
+// }
} \ No newline at end of file
diff --git a/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/adapter/rest/SynchronousMachineRestConsumer.java b/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/adapter/rest/SynchronousMachineRestConsumer.java
index d97a512e..7c66156d 100644
--- a/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/adapter/rest/SynchronousMachineRestConsumer.java
+++ b/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/adapter/rest/SynchronousMachineRestConsumer.java
@@ -30,6 +30,7 @@ public class SynchronousMachineRestConsumer {
*/
public SynchronousMachine getSynchronousMachine(final Long id) {
final String uri = PropsUtil.get("esb.url.base") + PropsUtil.get("esb.rest.uri.synchronousmachine") + id.toString();
+ // todo: hier ist ein Service aufzurufen, der die Validierung und die Persisitierung übernimmt
return restTemplate.getForObject(uri, SynchronousMachine.class);
}
}
diff --git a/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/controller/rest/GeographicalRegionRestController.java b/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/controller/rest/GeographicalRegionRestController.java
index 07d682bd..d5cda85f 100644
--- a/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/controller/rest/GeographicalRegionRestController.java
+++ b/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/controller/rest/GeographicalRegionRestController.java
@@ -34,13 +34,16 @@ public class GeographicalRegionRestController {
@Autowired
private GeographicalRegionRepository geographicalRegionRepository;
+ // todo: Service ist so nicht notwendig, da hiermit nur Testdaten erstellt wurden
@JsonView(IncludeAttribute4Json.Topology.class)
@RequestMapping(value = "/topology/geographicalregion", method = RequestMethod.GET)
public List<GeographicalRegion> findAll() {
LOG.info("calling REST - find all GeographicalRegion");
+ // todo: in Service schieben ! kein direkter Aufruf des Repositories
return Lists.newArrayList(geographicalRegionRepository.findAll());
}
+ // todo: Service ist so nicht notwendig, da hiermit nur Testdaten erstellt wurden
@JsonView(IncludeAttribute4Json.Topology.class)
@RequestMapping(value = "/topology/geographicalregion/{id}", method = RequestMethod.GET)
public GeographicalRegion findOne(@PathVariable final Long id) {
@@ -48,6 +51,14 @@ public class GeographicalRegionRestController {
return geographicalRegionRepository.findOne(id);
}
+ // todo: Service ist so nicht notwendig, da hiermit nur Testdaten erstellt wurden
+ @JsonView(IncludeAttribute4Json.NetworkState.class)
+ @RequestMapping(value = "/networkstate/geographicalregion/{id}", method = RequestMethod.GET)
+ public GeographicalRegion findOne4NetworkState(@PathVariable final Long id) {
+ // todo: in Service schieben, keine direkten Aufrufe eines Repositories
+// LOG.info("calling REST - find l Substation for Network State");
+ return geographicalRegionRepository.findOne(id);
+ }
}
diff --git a/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/controller/rest/SynchronousMachineRestController.java b/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/controller/rest/SynchronousMachineRestController.java
index 35a4d057..608da564 100644
--- a/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/controller/rest/SynchronousMachineRestController.java
+++ b/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/controller/rest/SynchronousMachineRestController.java
@@ -38,6 +38,7 @@ public class SynchronousMachineRestController {
@Autowired
private SynchronousMachineRestConsumer synchronousMachineRestConsumer;
+ // todo: Schnittstelle ist nur fuer die Erstellung der JSON-Date notwendig und wird sonst nicht genutzt
@JsonView(IncludeAttribute4Json.SynchronousMachine.class)
@RequestMapping(value = "/synchronousmachine", method = RequestMethod.GET)
public List<SynchronousMachine> findAll() {
@@ -45,6 +46,7 @@ public class SynchronousMachineRestController {
return Lists.newArrayList(synchronousMachineRepository.findAll());
}
+ // todo: Schnittstelle ist nur fuer die Erstellung der JSON-Date notwendig und wird sonst nicht genutzt
@JsonView(IncludeAttribute4Json.SynchronousMachine.class)
@RequestMapping(value = "/synchronousmachine/{id}", method = RequestMethod.GET)
public SynchronousMachine findOne(@PathVariable final Long id) {
diff --git a/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/core/Equipment.java b/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/core/Equipment.java
index f18b7599..b61dc48a 100644
--- a/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/core/Equipment.java
+++ b/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/core/Equipment.java
@@ -46,11 +46,15 @@ public abstract class Equipment extends PowerSystemResource {
@Column(name = "ID")
private Long id;
- @JsonView(IncludeAttribute4Json.Topology.class)
+ @JsonView({IncludeAttribute4Json.Topology.class,
+ IncludeAttribute4Json.NetworkState.class,
+ IncludeAttribute4Json.SynchronousMachine.class})
@Column(name = "MRID")
private String mRid;
- @JsonView(IncludeAttribute4Json.Topology.class)
+ @JsonView({IncludeAttribute4Json.Topology.class,
+ IncludeAttribute4Json.NetworkState.class,
+ IncludeAttribute4Json.SynchronousMachine.class})
@Column(name = "NAME")
private String name;
diff --git a/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/core/EquipmentContainer.java b/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/core/EquipmentContainer.java
index 68a423d2..00df9b4e 100644
--- a/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/core/EquipmentContainer.java
+++ b/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/core/EquipmentContainer.java
@@ -12,13 +12,10 @@
*/
package org.eclipse.openk.model.core;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonView;
import org.eclipse.openk.controller.rest.config.IncludeAttribute4Json;
import org.eclipse.openk.model.wires.SynchronousMachine;
-import javax.persistence.Access;
-import javax.persistence.AccessType;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.DiscriminatorColumn;
@@ -28,6 +25,7 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.persistence.TableGenerator;
@@ -37,12 +35,12 @@ import java.util.List;
/**
* A modeling construct to provide a root class for containing equipment.
*/
-@JsonIgnoreProperties(ignoreUnknown = true)
+//@JsonIgnoreProperties(ignoreUnknown = true)
@Entity
@Table(name = "EQUIPMENT_CONTAINER")
@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
@DiscriminatorColumn(name = "EQUIPMENT_CONTAINER_TYPE")
-@Access(AccessType.FIELD)
+//@Access(AccessType.FIELD)
public class EquipmentContainer extends ConnectivityNodeContainer {
@JsonView(IncludeAttribute4Json.SubstationLov.class)
@@ -66,10 +64,16 @@ public class EquipmentContainer extends ConnectivityNodeContainer {
@Column(name = "NAME")
private String name;
- @JsonView(IncludeAttribute4Json.Topology.class)
+ @JsonView({IncludeAttribute4Json.Topology.class,
+ IncludeAttribute4Json.NetworkState.class})
@OneToMany(cascade = CascadeType.PERSIST, mappedBy = "equipmentContainer")
private List<Equipment> equipmentList;
+ @JsonView(IncludeAttribute4Json.Topology.class)
+ @OneToMany(targetEntity = ConnectivityNode.class, cascade = CascadeType.PERSIST)
+ @JoinColumn(name = "EQUIPMENT_CONTAINER_ID")
+ private List<ConnectivityNode> connectivityNodeList;
+
public List<SynchronousMachine> getSynchronousMachineList() {
final List<SynchronousMachine> synchronousMachineList = new ArrayList<>();
@@ -83,7 +87,6 @@ public class EquipmentContainer extends ConnectivityNodeContainer {
return synchronousMachineList;
}
-
// todo: ist das notwendig ausser fuer die Tests?
public void setmRid(final String mRid) {
this.mRid = mRid;
@@ -115,4 +118,7 @@ public class EquipmentContainer extends ConnectivityNodeContainer {
return equipmentList;
}
+ public List<ConnectivityNode> getConnectivityNodeList() {
+ return connectivityNodeList;
+ }
}
diff --git a/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/core/GeographicalRegion.java b/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/core/GeographicalRegion.java
index 2e71304e..f2364088 100644
--- a/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/core/GeographicalRegion.java
+++ b/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/core/GeographicalRegion.java
@@ -16,8 +16,6 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonView;
import org.eclipse.openk.controller.rest.config.IncludeAttribute4Json;
-import javax.persistence.Access;
-import javax.persistence.AccessType;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -38,7 +36,7 @@ import java.util.List;
*/
@Entity
@Table(name = "GEOGRAPHICAL_REGION")
-@Access(AccessType.FIELD)
+//@Access(AccessType.FIELD)
public class GeographicalRegion extends IdentifiedObject {
@JsonIgnore
@@ -52,18 +50,21 @@ public class GeographicalRegion extends IdentifiedObject {
@Column(name = "ID")
private Long id;
- @JsonView({IncludeAttribute4Json.Topology.class, IncludeAttribute4Json.NetworkState.class})
+ @JsonView({IncludeAttribute4Json.Topology.class,
+ IncludeAttribute4Json.NetworkState.class})
@Column(name = "MRID")
private String mRid;
- @JsonView({IncludeAttribute4Json.Topology.class, IncludeAttribute4Json.NetworkState.class})
+ @JsonView({IncludeAttribute4Json.Topology.class,
+ IncludeAttribute4Json.NetworkState.class})
@Column(name = "NAME")
private String name;
/**
* All sub-geograhpical regions within this geographical region.
*/
- @JsonView({IncludeAttribute4Json.Topology.class, IncludeAttribute4Json.NetworkState.class})
+ @JsonView({IncludeAttribute4Json.Topology.class,
+ IncludeAttribute4Json.NetworkState.class})
@OneToMany(targetEntity = SubGeographicalRegion.class, cascade = CascadeType.PERSIST)
@JoinColumn(name = "GEOGRAPHICAL_REGION_ID")
private List<SubGeographicalRegion> subGeographicalRegionList;
diff --git a/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/core/SubGeographicalRegion.java b/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/core/SubGeographicalRegion.java
index 02b72a94..d15e8e28 100644
--- a/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/core/SubGeographicalRegion.java
+++ b/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/core/SubGeographicalRegion.java
@@ -15,8 +15,6 @@ package org.eclipse.openk.model.core;
import com.fasterxml.jackson.annotation.JsonView;
import org.eclipse.openk.controller.rest.config.IncludeAttribute4Json;
-import javax.persistence.Access;
-import javax.persistence.AccessType;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -36,7 +34,7 @@ import java.util.List;
*/
@Entity
@Table(name = "SUBGEOGRAPHICAL_REGION")
-@Access(AccessType.FIELD)
+//@Access(AccessType.FIELD)
public class SubGeographicalRegion extends IdentifiedObject {
@JsonView(IncludeAttribute4Json.SubGeographicalRegion.class)
@@ -60,7 +58,8 @@ public class SubGeographicalRegion extends IdentifiedObject {
@Column(name = "NAME")
private String name;
- @JsonView({IncludeAttribute4Json.Topology.class, IncludeAttribute4Json.NetworkState.class})
+ @JsonView({IncludeAttribute4Json.Topology.class,
+ IncludeAttribute4Json.NetworkState.class})
@OneToMany(targetEntity = Substation.class, cascade = CascadeType.PERSIST)
@JoinColumn(name = "SUBGEOGRAPHICAL_REGION_ID")
private List<Substation> substationList;
diff --git a/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/core/Substation.java b/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/core/Substation.java
index 7d4066f5..eccb35e8 100644
--- a/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/core/Substation.java
+++ b/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/core/Substation.java
@@ -34,7 +34,8 @@ public class Substation extends EquipmentContainer {
/**
* The association is used in the naming hierarchy.
*/
- @JsonView(IncludeAttribute4Json.Topology.class)
+ @JsonView({IncludeAttribute4Json.Topology.class,
+ IncludeAttribute4Json.NetworkState.class})
@OneToMany(targetEntity = VoltageLevel.class, cascade = CascadeType.PERSIST)
@JoinColumn(name = "EQUIPMENT_CONTAINER_ID")
private List<VoltageLevel> voltageLevelList;
diff --git a/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/core/Terminal.java b/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/core/Terminal.java
index 50ee6e57..85946b58 100644
--- a/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/core/Terminal.java
+++ b/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/core/Terminal.java
@@ -17,8 +17,6 @@ import com.fasterxml.jackson.annotation.JsonView;
import org.eclipse.openk.controller.rest.config.IncludeAttribute4Json;
import org.eclipse.openk.model.utils.converter.Boolean2StringConverter;
-import javax.persistence.Access;
-import javax.persistence.AccessType;
import javax.persistence.Column;
import javax.persistence.Convert;
import javax.persistence.Entity;
@@ -35,7 +33,7 @@ import javax.validation.constraints.NotNull;
*/
@Entity
@Table(name = "TERMINAL")
-@Access(AccessType.FIELD)
+//@Access(AccessType.FIELD)
public class Terminal extends AcDcTerminal {
@JsonIgnore
diff --git a/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/marketoperations/mktdomain/UnitType.java b/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/marketoperations/mktdomain/UnitType.java
index 98c3e530..6c4fe606 100644
--- a/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/marketoperations/mktdomain/UnitType.java
+++ b/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/marketoperations/mktdomain/UnitType.java
@@ -52,31 +52,11 @@ public enum UnitType {
* Biogas Thermal Generating Unit (Blockheizkraftwerk Biogas)
* CIM extension by Jan Krueger, April 2015
*/
- BIOG("BIOG");
+ BIOG("BIOG"),
/**
- * Combined Cycle
+ * Unknown
*/
-// CCYC,
- /**
- * Gas Turbine
- */
-// GTUR,
- /**
- * Other
- */
-// OTHR,
- /**
- * Reciprocating Engine
- */
-// RECP,
- /**
- * Steam Turbine
- */
-// STUR,
- /**
- * Synchronous Condenser
- */
-// SYNC,
+ UNKNOWN("UNKNOWN");
private final String value;
diff --git a/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/marketoperations/referencedata/RegisteredGenerator.java b/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/marketoperations/referencedata/RegisteredGenerator.java
index 700d6bf7..c32b5650 100644
--- a/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/marketoperations/referencedata/RegisteredGenerator.java
+++ b/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/marketoperations/referencedata/RegisteredGenerator.java
@@ -36,5 +36,11 @@ public class RegisteredGenerator extends RegisteredResource {
@Enumerated(EnumType.STRING)
public UnitType unitType;
+ public UnitType getUnitType() {
+ return unitType;
+ }
+ public void setUnitType(final UnitType unitType) {
+ this.unitType = unitType;
+ }
} \ No newline at end of file
diff --git a/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/meas/Analog.java b/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/meas/Analog.java
index 8946cd13..43da4270 100644
--- a/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/meas/Analog.java
+++ b/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/meas/Analog.java
@@ -57,24 +57,24 @@ public class Analog extends Measurement {
* Normal value range maximum for any of the MeasurementValue.values. Used for
* scaling, e.g. in bar graphs or of telemetered raw values.
*/
- @JsonView(IncludeAttribute4Json.NetworkState.class)
- @Column(name = "MAX_VALUE")
- private Float maxValue;
+// @JsonView(IncludeAttribute4Json.NetworkState.class)
+// @Column(name = "MAX_VALUE")
+// private Float maxValue;
/**
* Normal value range minimum for any of the MeasurementValue.values. Used for
* scaling, e.g. in bar graphs or of telemetered raw values
*/
- @JsonView(IncludeAttribute4Json.NetworkState.class)
- @Column(name = "MIN_VALUE")
- private Float minValue;
+// @JsonView(IncludeAttribute4Json.NetworkState.class)
+// @Column(name = "MIN_VALUE")
+// private Float minValue;
/**
* Normal measurement value, e.g., used for percentage calculations.
*/
- @JsonView(IncludeAttribute4Json.NetworkState.class)
- @Column(name = "NORMAL_VALUE")
- private Float normalValue;
+// @JsonView(IncludeAttribute4Json.NetworkState.class)
+// @Column(name = "NORMAL_VALUE")
+// private Float normalValue;
/**
* The values connected to this measurement.
@@ -88,17 +88,17 @@ public class Analog extends Measurement {
return mRid;
}
- public Float getMaxValue() {
- return maxValue;
- }
-
- public Float getMinValue() {
- return minValue;
- }
-
- public Float getNormalValue() {
- return normalValue;
- }
+// public Float getMaxValue() {
+// return maxValue;
+// }
+//
+// public Float getMinValue() {
+// return minValue;
+// }
+//
+// public Float getNormalValue() {
+// return normalValue;
+// }
public List<AnalogValue> getAnalogValueList() {
return analogValueList;
diff --git a/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/wires/SynchronousMachine.java b/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/wires/SynchronousMachine.java
index 6dfd8311..2a087ffd 100644
--- a/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/wires/SynchronousMachine.java
+++ b/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/model/wires/SynchronousMachine.java
@@ -13,7 +13,6 @@
package org.eclipse.openk.model.wires;
import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonView;
import org.eclipse.openk.controller.rest.config.IncludeAttribute4Json;
import org.eclipse.openk.model.common.Location;
@@ -45,10 +44,11 @@ import javax.persistence.Transient;
import javax.validation.constraints.NotNull;
import java.util.List;
-@JsonIgnoreProperties(ignoreUnknown = true)
+//@JsonIgnoreProperties(ignoreUnknown = true)
@Entity
@Table(name = "SYNCHRONOUS_MACHINE")
//@Access(AccessType.FIELD)
+//@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "@class")
public class SynchronousMachine extends RotatingMachine {
// todo: nach Equipment verschieben und in allen anderen Ableitungen
@@ -80,7 +80,8 @@ public class SynchronousMachine extends RotatingMachine {
* Modes that this synchronous machine can operate in.
*/
@NotNull
- @JsonView({IncludeAttribute4Json.Topology.class, IncludeAttribute4Json.SynchronousMachine.class})
+ @JsonView({IncludeAttribute4Json.Topology.class,
+ IncludeAttribute4Json.SynchronousMachine.class})
@Enumerated(EnumType.STRING)
@Column(name = "SYNCHRONOUS_MACHINE_KIND")
private SynchronousMachineKind synchronousMachineKind;
diff --git a/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/service/GeographicalRegionValidatorService.java b/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/service/GeographicalRegionValidatorService.java
new file mode 100644
index 00000000..35740908
--- /dev/null
+++ b/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/service/GeographicalRegionValidatorService.java
@@ -0,0 +1,25 @@
+/**
+ * ****************************************************************************
+ * Copyright (c) 2015 BTC AG.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * <p/>
+ * Contributors:
+ * Jan Krueger - initial API and implementation
+ * *****************************************************************************
+ */
+package org.eclipse.openk.service;
+
+import org.eclipse.openk.model.core.GeographicalRegion;
+import org.springframework.stereotype.Service;
+
+@Service
+public class GeographicalRegionValidatorService {
+
+ public GeographicalRegion validate(final GeographicalRegion geographicalRegion) {
+ // todo: siehe Backlog Input, hier die Validierungen prüfen
+ return null;
+ }
+}
diff --git a/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/service/SynchronousMachineValidatorService.java b/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/service/SynchronousMachineValidatorService.java
new file mode 100644
index 00000000..ef262127
--- /dev/null
+++ b/openk-platform/openk-cachedb-service/src/main/java/org/eclipse/openk/service/SynchronousMachineValidatorService.java
@@ -0,0 +1,54 @@
+/**
+ * ****************************************************************************
+ * Copyright (c) 2015 BTC AG.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * <p/>
+ * Contributors:
+ * Jan Krueger - initial API and implementation
+ * *****************************************************************************
+ */
+package org.eclipse.openk.service;
+
+import org.eclipse.openk.model.wires.SynchronousMachine;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class SynchronousMachineValidatorService {
+
+ public List<SynchronousMachine> validate(final List<SynchronousMachine> synchronousMachineList) {
+
+ for (final SynchronousMachine synchronousMachine : synchronousMachineList) {
+ validateSynchronousMachine(synchronousMachine);
+ }
+ return synchronousMachineList;
+ }
+
+ /**
+ * Validates the data of a single SynchronousMachine.
+ * Validate the following attributes:
+ * <ul>
+ * <li>Unittype may not be null and must be an element of Enum {@see UnitType}</li>
+ * <li></li>
+ * <li></li>
+ * </ul>
+ *
+ * @param synchronousMachine
+ * @return
+ */
+ private SynchronousMachine validateSynchronousMachine(final SynchronousMachine synchronousMachine) {
+
+// final RegisteredGenerator registeredGenerator = synchronousMachine.getGeneratingUnit().getRegisteredGenerator();
+//
+// //registeredGenerator.setUnitType();
+//
+// UnitType unitType = Enums.getIfPresent(UnitType.class,
+// registeredGenerator.getUnitType().value())
+// .or(UnitType.UNKNOWN);
+ return synchronousMachine;
+ }
+}
diff --git a/openk-platform/openk-cachedb-service/src/main/resources/flyway-migration/V01/_00/OPENK_CACHEDB_V01_00_001__init.sql b/openk-platform/openk-cachedb-service/src/main/resources/flyway-migration/V01/_00/OPENK_CACHEDB_V01_00_001__init.sql
index 7d288289..9bac9a45 100644
--- a/openk-platform/openk-cachedb-service/src/main/resources/flyway-migration/V01/_00/OPENK_CACHEDB_V01_00_001__init.sql
+++ b/openk-platform/openk-cachedb-service/src/main/resources/flyway-migration/V01/_00/OPENK_CACHEDB_V01_00_001__init.sql
@@ -11,21 +11,15 @@ WITH (OIDS =FALSE
ALTER TABLE OPENK_CACHEDB_SEQ_TABLE OWNER TO cachedb;
-- Initialise Sequence Table
INSERT INTO OPENK_CACHEDB_SEQ_TABLE (seq_name, seq_count) VALUES ('EQUIPMENT_SEQ', 1);
---INSERT INTO OPENK_CACHEDB_SEQ_TABLE (seq_name, seq_count) VALUES ('SYNCHRONOUS_MACHINE_SEQ', 1);
---INSERT INTO OPENK_CACHEDB_SEQ_TABLE (seq_name, seq_count) VALUES ('GENERATING_UNIT_SEQ', 1);
INSERT INTO OPENK_CACHEDB_SEQ_TABLE (seq_name, seq_count) VALUES ('PSR_EVENT_SEQ', 1);
INSERT INTO OPENK_CACHEDB_SEQ_TABLE (seq_name, seq_count) VALUES ('LOCATION_SEQ', 1);
INSERT INTO OPENK_CACHEDB_SEQ_TABLE (seq_name, seq_count) VALUES ('EQUIPMENT_CONTAINER_SEQ', 1);
INSERT INTO OPENK_CACHEDB_SEQ_TABLE (seq_name, seq_count) VALUES ('CONNECTIVITY_NODE_SEQ', 1);
INSERT INTO OPENK_CACHEDB_SEQ_TABLE (seq_name, seq_count) VALUES ('TERMINAL_SEQ', 1);
---INSERT INTO OPENK_CACHEDB_SEQ_TABLE (seq_name, seq_count) VALUES ('POWER_TRANSFORMER_SEQ', 1);
---INSERT INTO OPENK_CACHEDB_SEQ_TABLE (seq_name, seq_count) VALUES ('BUSBAR_SECTION_SEQ', 1);
--- INSERT INTO OPENK_CACHEDB_SEQ_TABLE (seq_name, seq_count) VALUES ('SWITCH_SEQ', 1);
INSERT INTO OPENK_CACHEDB_SEQ_TABLE (seq_name, seq_count) VALUES ('MEASUREMENT_ANALOG_SEQ', 1);
INSERT INTO OPENK_CACHEDB_SEQ_TABLE (seq_name, seq_count) VALUES ('MEASUREMENT_ANALOG_VALUE_SEQ', 1);
INSERT INTO OPENK_CACHEDB_SEQ_TABLE (seq_name, seq_count) VALUES ('POSITION_POINT_SEQ', 1);
INSERT INTO OPENK_CACHEDB_SEQ_TABLE (seq_name, seq_count) VALUES ('REDUCTION_SETTING_SEQ', 1);
---INSERT INTO OPENK_CACHEDB_SEQ_TABLE (seq_name, seq_count) VALUES ('AC_LINE_SEGMENT_SEQ', 1);
INSERT INTO OPENK_CACHEDB_SEQ_TABLE (seq_name, seq_count) VALUES ('GEOGRAPHICAL_REGION_SEQ', 1);
INSERT INTO OPENK_CACHEDB_SEQ_TABLE (seq_name, seq_count) VALUES ('SUBGEOGRAPHICAL_REGION_SEQ', 1);
INSERT INTO OPENK_CACHEDB_SEQ_TABLE (seq_name, seq_count) VALUES ('OPERATING_PARTICIPANT_SEQ', 1);
@@ -33,8 +27,8 @@ INSERT INTO OPENK_CACHEDB_SEQ_TABLE (seq_name, seq_count) VALUES ('OPERATING_SHA
CREATE TABLE GEOGRAPHICAL_REGION
(
- ID INTEGER NOT NULL,
- MRID VARCHAR(16),
+ ID INTEGER NOT NULL,
+ MRID VARCHAR(32) NOT NULL UNIQUE,
NAME VARCHAR(128),
CONSTRAINT "PK_GEOGRAPHICAL_REGION" PRIMARY KEY (ID)
)
@@ -45,7 +39,7 @@ ALTER TABLE GEOGRAPHICAL_REGION OWNER TO cachedb;
CREATE TABLE SUBGEOGRAPHICAL_REGION
(
ID INTEGER NOT NULL,
- MRID VARCHAR(16) UNIQUE,
+ MRID VARCHAR(32) UNIQUE,
NAME VARCHAR(128),
GEOGRAPHICAL_REGION_ID INTEGER,
CONSTRAINT "PK_SUBGEOGRAPHICAL_REGION" PRIMARY KEY (ID),
@@ -58,7 +52,7 @@ ALTER TABLE SUBGEOGRAPHICAL_REGION OWNER TO cachedb;
CREATE TABLE EQUIPMENT_CONTAINER
(
ID INTEGER NOT NULL,
- MRID VARCHAR(16) NOT NULL UNIQUE,
+ MRID VARCHAR(32) NOT NULL UNIQUE,
NAME VARCHAR(128),
HIGH_VOLTAGE_LIMIT_VALUE NUMERIC,
HIGH_VOLTAGE_LIMIT_UNIT_MULTIPLIER VARCHAR(12),
@@ -107,7 +101,7 @@ ALTER TABLE POSITION_POINT OWNER TO cachedb;
CREATE TABLE GENERATING_UNIT
(
ID INTEGER NOT NULL,
- MRID VARCHAR(16) NOT NULL UNIQUE,
+ MRID VARCHAR(32) NOT NULL UNIQUE,
NAME VARCHAR(128),
HIGH_CONTROL_LIMIT_VALUE NUMERIC,
HIGH_CONTROL_LIMIT_UNIT_MULTIPLIER VARCHAR(12),
@@ -117,7 +111,7 @@ CREATE TABLE GENERATING_UNIT
MAX_OPERATING_POWER_UNIT_SYMBOL VARCHAR(12),
CONTROL_SOURCE VARCHAR(24),
UNIT_TYPE VARCHAR(12),
- EQUIPMENT_CONTAINER_ID INTEGER,
+ EQUIPMENT_CONTAINER_ID INTEGER,
CONSTRAINT "PK_GENERATING_UNIT_ID" PRIMARY KEY (ID),
CONSTRAINT "FK_GENERATING_UNIT_EQUIPMENT_CONTAINER" FOREIGN KEY (EQUIPMENT_CONTAINER_ID) REFERENCES EQUIPMENT_CONTAINER (ID) ON UPDATE NO ACTION ON DELETE NO ACTION
)
@@ -128,7 +122,7 @@ ALTER TABLE GENERATING_UNIT OWNER TO cachedb;
CREATE TABLE SYNCHRONOUS_MACHINE
(
ID INTEGER NOT NULL,
- MRID VARCHAR(16) NOT NULL UNIQUE,
+ MRID VARCHAR(32) NOT NULL UNIQUE,
NAME VARCHAR(128),
NORMALLY_IN_SERVICE VARCHAR(5) NOT NULL,
MAX_VOLTAGE_LIMIT_VALUE NUMERIC,
@@ -171,13 +165,10 @@ ALTER TABLE REDUCTION_SETTING OWNER TO cachedb;
CREATE TABLE MEASUREMENT_ANALOG
(
ID INTEGER NOT NULL,
- MRID VARCHAR(16) UNIQUE,
+ MRID VARCHAR(32) UNIQUE,
MEASUREMENT_TYPE VARCHAR(16),
MEASUREMENT_UNIT_MULTIPLIER VARCHAR(12),
MEASUREMENT_UNIT_SYMBOL VARCHAR(12),
- MIN_VALUE NUMERIC,
- MAX_VALUE NUMERIC,
- NORMAL_VALUE NUMERIC,
SYNCHRONOUS_MACHINE_ID INTEGER,
CONSTRAINT "PK_MEASUREMENT_ANALOG" PRIMARY KEY (ID),
CONSTRAINT "FK_MEASUREMENT_ANALOG_SYNCHRONOUS_MACHINE" FOREIGN KEY (SYNCHRONOUS_MACHINE_ID) REFERENCES SYNCHRONOUS_MACHINE (ID) ON UPDATE NO ACTION ON DELETE NO ACTION
@@ -203,7 +194,7 @@ ALTER TABLE MEASUREMENT_ANALOG_VALUE OWNER TO cachedb;
CREATE TABLE PSR_EVENT
(
ID INTEGER NOT NULL,
- MRID VARCHAR(16) UNIQUE,
+ MRID VARCHAR(32) UNIQUE,
PSR_EVENT_KIND VARCHAR(16),
TIMESTAMP_CREATED TIMESTAMP,
SYNCHRONOUS_MACHINE_ID INTEGER,
@@ -216,8 +207,8 @@ ALTER TABLE PSR_EVENT OWNER TO cachedb;
CREATE TABLE AC_LINE_SEGMENT
(
- ID INTEGER NOT NULL,
- MRID VARCHAR(16) UNIQUE,
+ ID INTEGER NOT NULL,
+ MRID VARCHAR(16) NOT NULL UNIQUE,
NAME VARCHAR(128),
EQUIPMENT_CONTAINER_ID INTEGER,
CONSTRAINT "PK_ACL_LINE_SEGMENT" PRIMARY KEY (ID),
@@ -229,8 +220,8 @@ ALTER TABLE AC_LINE_SEGMENT OWNER TO cachedb;
CREATE TABLE POWER_TRANSFORMER
(
- ID INTEGER NOT NULL,
- MRID VARCHAR(16) UNIQUE,
+ ID INTEGER NOT NULL,
+ MRID VARCHAR(32) NOT NULL UNIQUE,
NAME VARCHAR(128),
EQUIPMENT_CONTAINER_ID INTEGER,
CONSTRAINT "PK_POWER_TRANSFORMER" PRIMARY KEY (ID),
@@ -242,8 +233,8 @@ ALTER TABLE POWER_TRANSFORMER OWNER TO cachedb;
CREATE TABLE SWITCH
(
- ID INTEGER NOT NULL,
- MRID VARCHAR(16) UNIQUE,
+ ID INTEGER NOT NULL,
+ MRID VARCHAR(16) NOT NULL UNIQUE,
NAME VARCHAR(128),
OPEN VARCHAR(5),
EQUIPMENT_CONTAINER_ID INTEGER,
@@ -256,8 +247,8 @@ ALTER TABLE SWITCH OWNER TO cachedb;
CREATE TABLE BUSBAR_SECTION
(
- ID INTEGER NOT NULL,
- MRID VARCHAR(16) UNIQUE,
+ ID INTEGER NOT NULL,
+ MRID VARCHAR(32) NOT NULL UNIQUE,
NAME VARCHAR(128),
EQUIPMENT_CONTAINER_ID INTEGER,
CONSTRAINT "PK_BUSBAR_SECTION" PRIMARY KEY (ID),
@@ -271,7 +262,7 @@ ALTER TABLE BUSBAR_SECTION OWNER TO cachedb;
CREATE TABLE OPERATING_PARTICIPANT
(
ID INTEGER NOT NULL,
- MRID VARCHAR(16) NOT NULL,
+ MRID VARCHAR(32) NOT NULL UNIQUE,
NAME VARCHAR(128),
SHARE_PER_CENT INTEGER,
POWER_TRANSFORMER_ID INTEGER,
@@ -316,8 +307,8 @@ ALTER TABLE OPERATING_PARTICIPANT OWNER TO cachedb;
CREATE TABLE CONNECTIVITY_NODE
(
- ID INTEGER NOT NULL,
- MRID VARCHAR(16),
+ ID INTEGER NOT NULL,
+ MRID VARCHAR(32) NOT NULL UNIQUE,
NAME VARCHAR(128),
EQUIPMENT_CONTAINER_ID INTEGER,
CONSTRAINT "PK_CONNECTIVITY_NODE" PRIMARY KEY (ID),
@@ -330,7 +321,7 @@ ALTER TABLE CONNECTIVITY_NODE OWNER TO cachedb;
CREATE TABLE TERMINAL
(
ID INTEGER NOT NULL,
- MRID VARCHAR(16) NOT NULL,
+ MRID VARCHAR(32) NOT NULL UNIQUE,
NAME VARCHAR(128) NOT NULL,
CONNECTED VARCHAR(5) NOT NULL,
CONNECTIVITY_NODE_ID INTEGER,
@@ -354,6 +345,7 @@ ALTER TABLE TERMINAL OWNER TO cachedb;
--
-- Tables for Quartz Job Scheduler
--
+/*
CREATE TABLE qrtz_job_details
(
SCHED_NAME VARCHAR(120) NOT NULL,
@@ -521,7 +513,7 @@ CREATE INDEX idx_qrtz_ft_j_g ON qrtz_fired_triggers (SCHED_NAME, JOB_NAME, JOB_G
CREATE INDEX idx_qrtz_ft_jg ON qrtz_fired_triggers (SCHED_NAME, JOB_GROUP);
CREATE INDEX idx_qrtz_ft_t_g ON qrtz_fired_triggers (SCHED_NAME, TRIGGER_NAME, TRIGGER_GROUP);
CREATE INDEX idx_qrtz_ft_tg ON qrtz_fired_triggers (SCHED_NAME, TRIGGER_GROUP);
-
+*/
diff --git a/openk-platform/openk-cachedb-service/src/test/java/org/eclipse/openk/adapter/rest/GeographicalRegionRestConsumerTest.java b/openk-platform/openk-cachedb-service/src/test/java/org/eclipse/openk/adapter/rest/GeographicalRegionRestConsumerTest.java
index b404a34c..ed2ceea4 100644
--- a/openk-platform/openk-cachedb-service/src/test/java/org/eclipse/openk/adapter/rest/GeographicalRegionRestConsumerTest.java
+++ b/openk-platform/openk-cachedb-service/src/test/java/org/eclipse/openk/adapter/rest/GeographicalRegionRestConsumerTest.java
@@ -18,9 +18,6 @@ import org.eclipse.openk.model.core.Substation;
import org.eclipse.openk.repository.AbstractRepositoryJpaTest;
import org.eclipse.openk.repository.GeographicalRegionRepository;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.MediaType;
-import org.springframework.test.web.client.MockRestServiceServer;
import org.springframework.web.client.RestTemplate;
import org.testng.Assert;
import org.testng.annotations.AfterMethod;
@@ -30,10 +27,10 @@ import javax.persistence.Query;
import java.io.IOException;
import java.net.URISyntaxException;
-import static org.springframework.test.web.client.match.MockRestRequestMatchers.method;
-import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo;
-import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess;
-
+/*
+see http://www.objectpartners.com/2013/01/09/rest-client-testing-with-mockrestserviceserver/
+http://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/test/web/client/MockRestServiceServer.html
+ */
public class GeographicalRegionRestConsumerTest extends AbstractRepositoryJpaTest {
@@ -46,18 +43,21 @@ public class GeographicalRegionRestConsumerTest extends AbstractRepositoryJpaTes
}
@Test(enabled = false) // nur enablen, wenn Liferay Portal gestartet ist
- public void getAndSaveGeographicalRegion() {
+ public void getAndSaveGeographicalRegionTopology() {
RestTemplate restTemplate = new RestTemplate();
GeographicalRegion geographicalRegionNew =
restTemplate.getForObject("http://localhost:8080/openk-cachedb-service/rest/topology/geographicalregion/1000", GeographicalRegion.class);
geographicalRegionRepository.save(geographicalRegionNew);
}
- // Test mit Measurement, allerdings sollen in der Topology die Messdaten nicht enthalten sein todo: anpassen
-// @Test()
- public void getAndSaveGeographicalRegionFromJsonFile01() throws IOException, URISyntaxException {
+ // todo: bei den Testdaten haben gleiche Terminals (gleicher Name) unterschiedliche MRIDs
+ // das ist noch zu aendern! Es ist der Terminal zu suchen und dann das Objekt in die Hierarchie
+ // zu haengen. Analog die anderen Elemente Generating Unit....
- final String contentJson = getContentOfJsonFile("json-test-samples/geographicalregion-sample-01.json");
+ @Test()
+ public void getAndSaveGeographicalRegionTopologyFromJsonFile01() throws IOException, URISyntaxException {
+
+ final String contentJson = getContentOfJsonFile("json-test-samples/geographicalregion-topology-sample-01.json");
final String uri = "/openk-cachedb-service/rest/topology/geographicalregion/1000";
GeographicalRegion geographicalRegion =
@@ -67,9 +67,9 @@ public class GeographicalRegionRestConsumerTest extends AbstractRepositoryJpaTes
Assert.assertFalse(geographicalRegion.getmRid().isEmpty());
Assert.assertFalse(geographicalRegion.getSubGeographicalRegionList().isEmpty());
SubGeographicalRegion subGeographicalRegion = geographicalRegion.getSubGeographicalRegionList().get(0);
- Assert.assertEquals(subGeographicalRegion.getName(), "UnitTest - Netzgebiet A");
+// Assert.assertEquals(subGeographicalRegion.getName(), "UnitTest - Netzgebiet A");
Substation substation = subGeographicalRegion.getSubstationList().get(0);
- Assert.assertEquals(substation.getName(), "UnitTest - Substation01 - Ortsnetzstation Stopfenheim");
+// Assert.assertEquals(substation.getName(), "UnitTest - Substation01 - Ortsnetzstation Stopfenheim");
// Assert.assertEquals(substation.getSynchronousMachineList().size(), 2);
// Assert.assertEquals(substation.getConnectivityNodeList().size(), 5);
Assert.assertEquals(substation.getVoltageLevelList().size(), 0);
@@ -81,10 +81,10 @@ public class GeographicalRegionRestConsumerTest extends AbstractRepositoryJpaTes
// Assert.assertEquals(getCountConnectivityNode(), Long.valueOf(19));
}
-// @Test()
- public void getAndSaveGeographicalRegionFromJsonFile05() throws IOException, URISyntaxException {
+ @Test()
+ public void getAndSaveGeographicalRegionTopolgyFromJsonFile02() throws IOException, URISyntaxException {
- final String contentJson = getContentOfJsonFile("json-test-samples/geographicalregion-sample-05.json");
+ final String contentJson = getContentOfJsonFile("json-test-samples/geographicalregion-topology-sample-02.json");
final String uri = "/openk-cachedb-service/rest/topology/geographicalregion/1000899";
GeographicalRegion geographicalRegion =
@@ -108,76 +108,34 @@ public class GeographicalRegionRestConsumerTest extends AbstractRepositoryJpaTes
// Assert.assertEquals(getCountConnectivityNode(), Long.valueOf(19));
}
- // Test mit Measurement, allerdings sollen in der Topology die Messdaten nicht enthalten sein todo: anpassen
-// @Test()
- public void getAndSaveGeographicalRegionFromJsonFileWithMeasurement() throws IOException, URISyntaxException {
-
- final String contentJson = getContentOfJsonFile("json-test-samples/geographicalregion-sample-02.json");
-
- RestTemplate restTemplate = new RestTemplate();
- MockRestServiceServer mockServer = MockRestServiceServer.createServer(restTemplate);
+ @Test()
+ public void getAndSaveGeographicalRegionNetstateFromJsonFile01() throws IOException, URISyntaxException {
- mockServer.expect(requestTo("/openk-cachedb-service/rest/topology/geographicalregion/1000")).andExpect(method(HttpMethod.GET))
- .andRespond(withSuccess(contentJson, MediaType.APPLICATION_JSON));
+ final String contentJson = getContentOfJsonFile("json-test-samples/geographicalregion-netstate-sample-01.json");
+ final String uri = "/openk-cachedb-service/rest/topology/geographicalregion/1000899";
GeographicalRegion geographicalRegion =
- restTemplate.getForObject(
- "/openk-cachedb-service/rest/topology/geographicalregion/1000",
- GeographicalRegion.class);
-
- mockServer.verify();
+ initRestTemplate(contentJson, uri).getForObject(uri, GeographicalRegion.class);
Assert.assertTrue(geographicalRegion.getName().startsWith(PREFIX_TEST_NAME));
Assert.assertFalse(geographicalRegion.getmRid().isEmpty());
- Assert.assertFalse(geographicalRegion.getSubGeographicalRegionList().isEmpty());
- SubGeographicalRegion subGeographicalRegion = geographicalRegion.getSubGeographicalRegionList().get(0);
- Assert.assertEquals(subGeographicalRegion.getName(), "UnitTest - Netzgebiet A");
- Substation substation = subGeographicalRegion.getSubstationList().get(0);
- Assert.assertEquals(substation.getName(), "UnitTest - Substation01 - Ortsnetzstation Stopfenheim");
-// Assert.assertEquals(substation.getSynchronousMachineList().size(), 1);
-// Assert.assertEquals(substation.getConnectivityNodeList().size(), 3);
- Assert.assertEquals(substation.getVoltageLevelList().size(), 0);
-// Assert.assertEquals(substation.getAcLineSegmentList().size(), 1);
geographicalRegionRepository.save(geographicalRegion);
-
- Assert.assertEquals(getCountTerminals(), Long.valueOf(82));
- Assert.assertEquals(getCountConnectivityNode(), Long.valueOf(19));
}
-// @Test()
- public void getAndSaveGeographicalRegionFromJsonFile() throws IOException, URISyntaxException {
+ @Test()
+ public void getAndSaveGeographicalRegionNetstateFromJsonFile02() throws IOException, URISyntaxException {
- final String contentJson = getContentOfJsonFile("json-test-samples/geographicalregion-sample-03.json");
-
- RestTemplate restTemplate = new RestTemplate();
- MockRestServiceServer mockServer = MockRestServiceServer.createServer(restTemplate);
- mockServer.expect(requestTo("/openk-cachedb-service/rest/topology/geographicalregion/1000")).andExpect(method(HttpMethod.GET))
- .andRespond(withSuccess(contentJson, MediaType.APPLICATION_JSON));
+ final String contentJson = getContentOfJsonFile("json-test-samples/geographicalregion-netstate-sample-02.json");
+ final String uri = "/openk-cachedb-service/rest/topology/geographicalregion/1000899";
GeographicalRegion geographicalRegion =
- restTemplate.getForObject(
- "/openk-cachedb-service/rest/topology/geographicalregion/1000",
- GeographicalRegion.class);
-
- mockServer.verify();
+ initRestTemplate(contentJson, uri).getForObject(uri, GeographicalRegion.class);
Assert.assertTrue(geographicalRegion.getName().startsWith(PREFIX_TEST_NAME));
Assert.assertFalse(geographicalRegion.getmRid().isEmpty());
- Assert.assertFalse(geographicalRegion.getSubGeographicalRegionList().isEmpty());
- SubGeographicalRegion subGeographicalRegion = geographicalRegion.getSubGeographicalRegionList().get(0);
- Assert.assertEquals(subGeographicalRegion.getName(), "UnitTest - Netzgebiet A");
- Substation substation = subGeographicalRegion.getSubstationList().get(0);
- Assert.assertEquals(substation.getName(), "UnitTest - Substation01 - Ortsnetzstation Stopfenheim");
-// Assert.assertEquals(substation.getSynchronousMachineList().size(), 2);
-// Assert.assertEquals(substation.getConnectivityNodeList().size(), 3);
- Assert.assertEquals(substation.getVoltageLevelList().size(), 0);
-// Assert.assertEquals(substation.getAcLineSegmentList().size(), 1);
geographicalRegionRepository.save(geographicalRegion);
-
- Assert.assertEquals(getCountTerminals(), Long.valueOf(82));
- Assert.assertEquals(getCountConnectivityNode(), Long.valueOf(19));
}
private Long getCountTerminals() {
diff --git a/openk-platform/openk-cachedb-service/src/test/java/org/eclipse/openk/adapter/rest/SubstationRestConsumerTest.java b/openk-platform/openk-cachedb-service/src/test/java/org/eclipse/openk/adapter/rest/SubstationRestConsumerTest.java
index 83c5f7bb..76c2ebd8 100644
--- a/openk-platform/openk-cachedb-service/src/test/java/org/eclipse/openk/adapter/rest/SubstationRestConsumerTest.java
+++ b/openk-platform/openk-cachedb-service/src/test/java/org/eclipse/openk/adapter/rest/SubstationRestConsumerTest.java
@@ -46,6 +46,8 @@ http://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/test/w
*/
public class SubstationRestConsumerTest extends AbstractRepositoryJpaTest {
+ // todo: die Tests sind eigenltich nicht notwendig da der SubstationRestConsumer auch nicht mehr notwendig ist!
+
@Autowired
private SubstationRepository substationRepository;
diff --git a/openk-platform/openk-cachedb-service/src/test/java/org/eclipse/openk/adapter/rest/SynchronousMachineRestConsumerTest.java b/openk-platform/openk-cachedb-service/src/test/java/org/eclipse/openk/adapter/rest/SynchronousMachineRestConsumerTest.java
index 05073fd7..40e6a305 100644
--- a/openk-platform/openk-cachedb-service/src/test/java/org/eclipse/openk/adapter/rest/SynchronousMachineRestConsumerTest.java
+++ b/openk-platform/openk-cachedb-service/src/test/java/org/eclipse/openk/adapter/rest/SynchronousMachineRestConsumerTest.java
@@ -12,9 +12,6 @@
*/
package org.eclipse.openk.adapter.rest;
-import org.eclipse.openk.model.core.GeographicalRegion;
-import org.eclipse.openk.model.core.SubGeographicalRegion;
-import org.eclipse.openk.model.core.Substation;
import org.eclipse.openk.model.wires.SynchronousMachine;
import org.eclipse.openk.repository.AbstractRepositoryJpaTest;
import org.eclipse.openk.repository.SynchronousMachineRepository;
@@ -46,6 +43,7 @@ public class SynchronousMachineRestConsumerTest extends AbstractRepositoryJpaTes
}
// nur lokal testen wenn Liferay gestartet ist...
+ // funktioniert aktuell nicht da @class fehlt?!
@Test(enabled = false)
public void getSynchronousMachine() {
@@ -59,7 +57,7 @@ public class SynchronousMachineRestConsumerTest extends AbstractRepositoryJpaTes
}
}
-// @Test()
+ @Test()
public void getAndSaveSynchronousMachineListFromJsonFile01() throws IOException, URISyntaxException {
final String contentJson = getContentOfJsonFile("json-test-samples/synchronousmachine-sample-01.json");
@@ -74,23 +72,15 @@ public class SynchronousMachineRestConsumerTest extends AbstractRepositoryJpaTes
synchronousMachineRepository.save(synchronousMachine);
}
}
-// todo: funktioniert aktuell nur wenn die DB leer ist
-// @Test()
+
+ @Test()
public void getAndSaveSynchronousMachineListFromJsonFile02() throws IOException, URISyntaxException {
final String contentJson = getContentOfJsonFile("json-test-samples/synchronousmachine-sample-02.json");
- RestTemplate restTemplate = new RestTemplate();
- MockRestServiceServer mockServer = MockRestServiceServer.createServer(restTemplate);
-
final String uri = "/openk-cachedb-service/rest/synchronousmachine/";
- mockServer.expect(requestTo(uri)).andExpect(method(HttpMethod.GET))
- .andRespond(withSuccess(contentJson, MediaType.APPLICATION_JSON));
-
- SynchronousMachine[] synchronousMachineList = restTemplate.getForObject(uri, SynchronousMachine[].class);
-
- mockServer.verify();
+ SynchronousMachine[] synchronousMachineList = initRestTemplate(contentJson, uri).getForObject(uri, SynchronousMachine[].class);
Assert.assertEquals(synchronousMachineList.length, 3);
diff --git a/openk-platform/openk-cachedb-service/src/test/java/org/eclipse/openk/repository/AbstractRepositoryJpaTest.java b/openk-platform/openk-cachedb-service/src/test/java/org/eclipse/openk/repository/AbstractRepositoryJpaTest.java
index 7f62f379..23b14604 100644
--- a/openk-platform/openk-cachedb-service/src/test/java/org/eclipse/openk/repository/AbstractRepositoryJpaTest.java
+++ b/openk-platform/openk-cachedb-service/src/test/java/org/eclipse/openk/repository/AbstractRepositoryJpaTest.java
@@ -167,22 +167,29 @@ public class AbstractRepositoryJpaTest extends AbstractTestNGSpringContextTests
deletePositionPointStatement.setParameter(1, PREFIX_TEST_NAME + "%");
deletePositionPointStatement.executeUpdate();
- Query selectGeneratingUnit = entityManager.createNativeQuery(
- "select generating_unit_id from synchronous_machine where name like ?1");
- selectGeneratingUnit.setParameter(1, PREFIX_TEST_NAME + "%");
- List<Integer> generatingUnitIdList = (List<Integer>) selectGeneratingUnit.getResultList();
+ // todo: das wieder verwenden wenn GeneratingUnit nicht doppelt gespeichert werden
+// Query selectGeneratingUnit = entityManager.createNativeQuery(
+// "select generating_unit_id from synchronous_machine where name like ?1");
+// selectGeneratingUnit.setParameter(1, PREFIX_TEST_NAME + "%");
+// List<Integer> generatingUnitIdList = (List<Integer>) selectGeneratingUnit.getResultList();
Query deleteSynchronousMachineStatement = entityManager.createNativeQuery(
"delete from synchronous_machine where name like ?1");
deleteSynchronousMachineStatement.setParameter(1, PREFIX_TEST_NAME + "%");
deleteSynchronousMachineStatement.executeUpdate();
- for (Integer id : generatingUnitIdList) {
- Query deleteGeneratingUnitStatement = entityManager.createNativeQuery(
- "delete from generating_unit where id = ?1");
- deleteGeneratingUnitStatement.setParameter(1, id);
- deleteGeneratingUnitStatement.executeUpdate();
- }
+ Query deleteGeneratingUnitStatement = entityManager.createNativeQuery(
+ "delete from generating_unit where name like ?1");
+ deleteGeneratingUnitStatement.setParameter(1, PREFIX_TEST_NAME + "%");
+ deleteGeneratingUnitStatement.executeUpdate();
+
+ // todo: das wieder verwenden wenn GeneratingUnit nicht doppelt gespeichert werden
+// for (Integer id : generatingUnitIdList) {
+// Query deleteGeneratingUnitStatement = entityManager.createNativeQuery(
+// "delete from generating_unit where id = ?1");
+// deleteGeneratingUnitStatement.setParameter(1, id);
+// deleteGeneratingUnitStatement.executeUpdate();
+// }
Query deleteLocationStatement = entityManager.createNativeQuery(
"delete from location where name like ?1");
diff --git a/openk-platform/openk-cachedb-service/src/test/java/org/eclipse/openk/service/GeographicalRegionValidatorServiceTest.java b/openk-platform/openk-cachedb-service/src/test/java/org/eclipse/openk/service/GeographicalRegionValidatorServiceTest.java
new file mode 100644
index 00000000..5be113bb
--- /dev/null
+++ b/openk-platform/openk-cachedb-service/src/test/java/org/eclipse/openk/service/GeographicalRegionValidatorServiceTest.java
@@ -0,0 +1,41 @@
+/**
+ * ****************************************************************************
+ * Copyright (c) 2015 BTC AG.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * <p/>
+ * Contributors:
+ * Jan Krueger - initial API and implementation
+ * *****************************************************************************
+ */
+package org.eclipse.openk.service;
+
+import org.eclipse.openk.model.core.GeographicalRegion;
+import org.eclipse.openk.repository.AbstractRepositoryJpaTest;
+import org.eclipse.openk.service.GeographicalRegionValidatorService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+
+public class GeographicalRegionValidatorServiceTest extends AbstractRepositoryJpaTest {
+ // todo: hier evtl. einen AbstractTest einführen von dem AbstractRepositoryJpaTest ableitet
+
+ @Autowired
+ private GeographicalRegionValidatorService geographicalRegionValidatorService;
+
+ @Test
+ public void validateGeographicalRegionTest() throws IOException, URISyntaxException {
+ final String contentJson = getContentOfJsonFile("json-test-samples/geographicalregion-topology-sample-01.json");
+ final String uri = "/openk-cachedb-service/rest/topology/geographicalregion/1000";
+
+ GeographicalRegion geographicalRegion =
+ initRestTemplate(contentJson, uri).getForObject(uri, GeographicalRegion.class);
+
+ GeographicalRegion geographicalRegionValidated = geographicalRegionValidatorService.validate(geographicalRegion);
+
+ }
+}
diff --git a/openk-platform/openk-cachedb-service/src/test/java/org/eclipse/openk/service/SynchronousMachineValidatorServiceTest.java b/openk-platform/openk-cachedb-service/src/test/java/org/eclipse/openk/service/SynchronousMachineValidatorServiceTest.java
new file mode 100644
index 00000000..185f09c7
--- /dev/null
+++ b/openk-platform/openk-cachedb-service/src/test/java/org/eclipse/openk/service/SynchronousMachineValidatorServiceTest.java
@@ -0,0 +1,39 @@
+/**
+ * ****************************************************************************
+ * Copyright (c) 2015 BTC AG.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * <p/>
+ * Contributors:
+ * Jan Krueger - initial API and implementation
+ * *****************************************************************************
+ */
+package org.eclipse.openk.service;
+
+import com.google.common.collect.Lists;
+import org.eclipse.openk.model.wires.SynchronousMachine;
+import org.eclipse.openk.repository.AbstractRepositoryJpaTest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+
+public class SynchronousMachineValidatorServiceTest extends AbstractRepositoryJpaTest{
+
+ @Autowired
+ private SynchronousMachineValidatorService synchronousMachineValidatorService;
+
+ @Test
+ public void validateSynchronousMachine () throws IOException, URISyntaxException {
+ final String contentJson = getContentOfJsonFile("json-test-samples/synchronousmachine-sample-01.json");
+ final String uri = "/openk-cachedb-service/rest/synchronousmachine/";
+
+ SynchronousMachine[] synchronousMachineList = initRestTemplate(contentJson, uri).getForObject(uri, SynchronousMachine[].class);
+
+ synchronousMachineValidatorService.validate(Lists.newArrayList(synchronousMachineList));
+
+ }
+}
diff --git a/openk-platform/openk-cachedb-service/src/test/resources/json-test-samples/geographicalregion-netstate-sample-01.json b/openk-platform/openk-cachedb-service/src/test/resources/json-test-samples/geographicalregion-netstate-sample-01.json
new file mode 100644
index 00000000..a679e12c
--- /dev/null
+++ b/openk-platform/openk-cachedb-service/src/test/resources/json-test-samples/geographicalregion-netstate-sample-01.json
@@ -0,0 +1,141 @@
+{
+ "name": "UnitTest - Geamtes Netz Netzbetreiber A",
+ "mRid": "1000/1225",
+ "subGeographicalRegionList": [ {
+ "name": "UnitTest - Netzgebiet A",
+ "mRid": "10005455",
+ "substationList": [
+ {
+ "name": "UnitTest - Substation01 - Ortsnetzstation Stopfenheim",
+ "mRid": "77885889/559",
+ "equipmentList": [
+ {
+ "@class": "org.eclipse.openk.model.wires.SynchronousMachine",
+ "name": "UnitTest - SynchronousMachine01",
+ "mRid": "458899/8877",
+ "normallyInService": true,
+ "synchronousMachineKind": "GENERATOR",
+ "statusCurrentReductionSetting": true,
+ "controlEnabled": true,
+ "generatingUnit": {
+ "@class": "org.eclipse.openk.model.production.GeneratingUnit",
+ "name": "UnitTest - Generating Unit 01",
+ "mRid": "54878785566/77"
+ },
+ "analogList": [ {
+ "mRid": "1/88991",
+ "measurementType": "GeneratorVoltage",
+ "unitMultiplier": "k",
+ "unitSymbol": "W",
+ "analogValueList": [
+ {
+ "timeStamp": {"value": "04.10.2015 12:12:35"},
+ "measurementValueQuality": {"failure": false},
+ "value": 11.11
+ },
+ {
+ "timeStamp": {"value": "04.10.2015 12:12:35"},
+ "measurementValueQuality": {"failure": false},
+ "value": 12.12
+ },
+ {
+ "timeStamp": {"value": "04.10.2015 12:12:35"},
+ "measurementValueQuality": {"failure": false},
+ "value": 13.13
+ },
+ {
+ "timeStamp": {"value": "04.10.2015 12:12:35"},
+ "measurementValueQuality": {"failure": false},
+ "value": 14.14
+ }
+ ]
+ }]
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.SynchronousMachine",
+ "name": "UnitTest - SynchronousMachine02",
+ "mRid": "458899/87",
+ "normallyInService": true,
+ "synchronousMachineKind": "GENERATOR",
+ "statusCurrentReductionSetting": true,
+ "controlEnabled": true,
+ "generatingUnit": {
+ "@class": "org.eclipse.openk.model.production.GeneratingUnit",
+ "name": "UnitTest - Generating Unit 02",
+ "mRid": "54885566/77445"
+ },
+ "analogList": [ {
+ "mRid": "22/8899",
+ "measurementType": "GeneratorVoltage",
+ "unitMultiplier": "k",
+ "unitSymbol": "W",
+ "maxValue": 222,
+ "minValue": 22,
+ "normalValue": 2000,
+ "analogValueList": [ {
+ "timeStamp": {"value": "04.10.2015 12:12:35"},
+ "measurementValueQuality": {"failure": false},
+ "value": 11.11
+ }]
+ }]
+ }
+ ],
+ "voltageLevelList": []
+ },
+ {
+ "name": "UnitTest - Substation02 - Ortsnetzstation Störzelbach",
+ "mRid": "23222666/45",
+ "equipmentList": [
+ ],
+ "voltageLevelList": []
+ },
+ {
+ "name": "UnitTest - Substation03 - Ortsnetzstation Alesheim04",
+ "mRid": "23668899456",
+ "equipmentList": [
+ {
+ "@class": "org.eclipse.openk.model.wires.SynchronousMachine",
+ "name": "UnitTest - SynchronousMachine03",
+ "mRid": "458899/8877/3",
+ "normallyInService": true,
+ "synchronousMachineKind": "GENERATOR",
+ "statusCurrentReductionSetting": true,
+ "controlEnabled": true,
+ "generatingUnit": {
+ "@class": "org.eclipse.openk.model.production.GeneratingUnit",
+ "name": "UnitTest - Generating Unit 03",
+ "mRid": "5487566/77/3"
+ },
+ "analogList": [ {
+ "mRid": "2233/3",
+ "measurementType": "GeneratorVoltage",
+ "unitMultiplier": "k",
+ "unitSymbol": "W",
+ "maxValue": 233,
+ "minValue": 33,
+ "normalValue": 3000,
+ "analogValueList": [
+ {
+ "timeStamp": {"value": "04.10.2015 12:12:35"},
+ "measurementValueQuality": {"failure": false},
+ "value": 12.12
+ },
+ {
+ "timeStamp": {"value": "04.10.2015 12:12:35"},
+ "measurementValueQuality": {"failure": false},
+ "value": 13.13
+ },
+ {
+ "timeStamp": {"value": "04.10.2015 12:12:35"},
+ "measurementValueQuality": {"failure": false},
+ "value": 14.14
+ }
+ ]
+ }]
+ }
+ ],
+ "voltageLevelList": []
+ }
+ ]
+ }]
+} \ No newline at end of file
diff --git a/openk-platform/openk-cachedb-service/src/test/resources/json-test-samples/geographicalregion-netstate-sample-02.json b/openk-platform/openk-cachedb-service/src/test/resources/json-test-samples/geographicalregion-netstate-sample-02.json
new file mode 100644
index 00000000..f2c96504
--- /dev/null
+++ b/openk-platform/openk-cachedb-service/src/test/resources/json-test-samples/geographicalregion-netstate-sample-02.json
@@ -0,0 +1,201 @@
+{
+ "name": "UnitTest - Geamtes Netz Netzbetreiber A",
+ "mRid": "1000/1225",
+ "subGeographicalRegionList": [ {
+ "name": "UnitTest - Netzgebiet A",
+ "mRid": "10005455",
+ "substationList": [
+ {
+ "name": "UnitTest - Substation01 - Ortsnetzstation Stopfenheim",
+ "mRid": "77885889/559",
+ "equipmentList": [
+ {
+ "@class": "org.eclipse.openk.model.wires.SynchronousMachine",
+ "name": "UnitTest - SynchronousMachine01",
+ "mRid": "458899/8877",
+ "normallyInService": true,
+ "synchronousMachineKind": "GENERATOR",
+ "statusCurrentReductionSetting": true,
+ "controlEnabled": true,
+ "generatingUnit": {
+ "@class": "org.eclipse.openk.model.production.GeneratingUnit",
+ "name": "UnitTest - Generating Unit 01",
+ "mRid": "54878785566/77"
+ },
+ "analogList": [ {
+ "mRid": "1/88991",
+ "measurementType": "GeneratorVoltage",
+ "unitMultiplier": "k",
+ "unitSymbol": "W",
+ "analogValueList": [
+ {
+ "timeStamp": {"value": "04.10.2015 12:12:35"},
+ "measurementValueQuality": {"failure": false},
+ "value": 11.11
+ },
+ {
+ "timeStamp": {"value": "04.10.2015 12:12:35"},
+ "measurementValueQuality": {"failure": false},
+ "value": 12.12
+ },
+ {
+ "timeStamp": {"value": "04.10.2015 12:12:35"},
+ "measurementValueQuality": {"failure": false},
+ "value": 13.13
+ },
+ {
+ "timeStamp": {"value": "04.10.2015 12:12:35"},
+ "measurementValueQuality": {"failure": false},
+ "value": 14.14
+ }
+ ]
+ }]
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.SynchronousMachine",
+ "name": "UnitTest - SynchronousMachine02",
+ "mRid": "458899/87",
+ "normallyInService": true,
+ "synchronousMachineKind": "GENERATOR",
+ "statusCurrentReductionSetting": true,
+ "controlEnabled": true,
+ "generatingUnit": {
+ "@class": "org.eclipse.openk.model.production.GeneratingUnit",
+ "name": "UnitTest - Generating Unit 02",
+ "mRid": "54885566/77445"
+ },
+ "analogList": [ {
+ "mRid": "22/8899",
+ "measurementType": "GeneratorVoltage",
+ "unitMultiplier": "k",
+ "unitSymbol": "W",
+ "maxValue": 222,
+ "minValue": 22,
+ "normalValue": 2000,
+ "analogValueList": [ {
+ "timeStamp": {"value": "04.10.2015 12:12:35"},
+ "measurementValueQuality": {"failure": false},
+ "value": 11.11
+ }]
+ }]
+ }
+ ],
+ "voltageLevelList": []
+ },
+ {
+ "name": "UnitTest - Substation02 - Ortsnetzstation Störzelbach",
+ "mRid": "23222666/45",
+ "equipmentList": [
+ ],
+ "voltageLevelList": []
+ },
+ {
+ "name": "UnitTest - Substation03 - Ortsnetzstation Alesheim04",
+ "mRid": "23668899456",
+ "equipmentList": [
+ {
+ "@class": "org.eclipse.openk.model.wires.SynchronousMachine",
+ "name": "UnitTest - SynchronousMachine03",
+ "mRid": "458899/8877/3",
+ "normallyInService": true,
+ "synchronousMachineKind": "GENERATOR",
+ "statusCurrentReductionSetting": true,
+ "controlEnabled": true,
+ "generatingUnit": {
+ "@class": "org.eclipse.openk.model.production.GeneratingUnit",
+ "name": "UnitTest - Generating Unit 03",
+ "mRid": "5487566/77/3"
+ },
+ "analogList": [ {
+ "mRid": "2233/3",
+ "measurementType": "GeneratorVoltage",
+ "unitMultiplier": "k",
+ "unitSymbol": "W",
+ "maxValue": 233,
+ "minValue": 33,
+ "normalValue": 3000,
+ "analogValueList": [
+ {
+ "timeStamp": {"value": "04.10.2015 12:12:35"},
+ "measurementValueQuality": {"failure": false},
+ "value": 12.12
+ },
+ {
+ "timeStamp": {"value": "04.10.2015 12:12:35"},
+ "measurementValueQuality": {"failure": false},
+ "value": 13.13
+ },
+ {
+ "timeStamp": {"value": "04.10.2015 12:12:35"},
+ "measurementValueQuality": {"failure": false},
+ "value": 14.14
+ }
+ ]
+ }]
+ }
+ ],
+ "voltageLevelList": []
+ },
+ {
+ "name": "UnitTest - Substation04 - Ortsnetzstation A02",
+ "mRid": "2364534/8866",
+ "equipmentList": [
+ ],
+ "voltageLevelList": []
+ },
+ {
+ "name": "UnitTest - Substation05 - Ortsnetzstation A06",
+ "mRid": "3442366566566",
+ "equipmentList": [
+ ],
+ "voltageLevelList": []
+ },
+ {
+ "name": "UnitTest - Substation06 - Ortsnetzstation Alesheim 01",
+ "mRid": "2367/8899766",
+ "equipmentList": [
+ ],
+ "voltageLevelList": []
+ },
+ {
+ "name": "UnitTest - Substation07 - Ortsnetzstation A03",
+ "mRid": "2368/8899866",
+ "equipmentList": [
+ ],
+ "voltageLevelList": []
+ },
+ {
+ "name": "UnitTest - Substation08 - Ortsnetzstation W02",
+ "mRid": "23656/8833366",
+ "equipmentList": [
+ ],
+ "voltageLevelList": []
+ },
+ {
+ "name": "UnitTest - Substation09 - Umspannwerk WAHF",
+ "mRid": "23634/88883366",
+ "equipmentList": [],
+ "voltageLevelList": [
+ {
+ "name": "UnitTest - VoltageLevel01 - 110kV",
+ "mRid": "23663458933/886",
+ "equipmentList": [
+ ]
+ },
+ {
+ "name": "UnitTest - VoltageLevel02",
+ "mRid": "89744/887755",
+ "equipmentList": [
+ ]
+ }
+ ]
+ },
+ {
+ "name": "UnitTest - Substation10 - Ortsnetzstation Alesheim05A",
+ "mRid": "23633366/887",
+ "equipmentList": [],
+ "voltageLevelList": []
+ }
+ ]
+ }]
+} \ No newline at end of file
diff --git a/openk-platform/openk-cachedb-service/src/test/resources/json-test-samples/geographicalregion-sample-01.json b/openk-platform/openk-cachedb-service/src/test/resources/json-test-samples/geographicalregion-sample-06.json
index 122e0843..122e0843 100644
--- a/openk-platform/openk-cachedb-service/src/test/resources/json-test-samples/geographicalregion-sample-01.json
+++ b/openk-platform/openk-cachedb-service/src/test/resources/json-test-samples/geographicalregion-sample-06.json
diff --git a/openk-platform/openk-cachedb-service/src/test/resources/json-test-samples/geographicalregion-sample-02.json b/openk-platform/openk-cachedb-service/src/test/resources/json-test-samples/geographicalregion-sample-07.json
index bc21e676..bc21e676 100644
--- a/openk-platform/openk-cachedb-service/src/test/resources/json-test-samples/geographicalregion-sample-02.json
+++ b/openk-platform/openk-cachedb-service/src/test/resources/json-test-samples/geographicalregion-sample-07.json
diff --git a/openk-platform/openk-cachedb-service/src/test/resources/json-test-samples/geographicalregion-topology-sample-01.json b/openk-platform/openk-cachedb-service/src/test/resources/json-test-samples/geographicalregion-topology-sample-01.json
new file mode 100644
index 00000000..1295c852
--- /dev/null
+++ b/openk-platform/openk-cachedb-service/src/test/resources/json-test-samples/geographicalregion-topology-sample-01.json
@@ -0,0 +1,1470 @@
+{
+ "name": "UnitTest - Geamtes Netz Netzbetreiber A",
+ "mRid": "10005455",
+ "subGeographicalRegionList": [ {
+ "name": "UnitTest - Netzgebiet A",
+ "mRid": "1054500",
+ "substationList": [
+ {
+ "name": "UnitTest - Substation01 - Ortsnetzstation Stopfenheim",
+ "mRid": "7788544",
+ "connectivityNodeList": [
+ {
+ "name": "UnitTest - CN01",
+ "mRid": "12359/1",
+ "terminalList": [
+ {
+ "name": "UnitTest - T01",
+ "mRid": "1000/211"
+ },
+ {
+ "name": "UnitTest - T02",
+ "mRid": "100564641"
+ }
+ ]
+ },
+ {
+ "name": "UnitTest - CN02",
+ "mRid": "23569546549898",
+ "terminalList": [
+ {
+ "name": "UnitTest - T03",
+ "mRid": "1064602"
+ },
+ {
+ "name": "UnitTest - T04",
+ "mRid": "1064654603"
+ }
+ ]
+ },
+ {
+ "name": "UnitTest - CN03",
+ "mRid": "2348889",
+ "terminalList": [
+ {
+ "name": "UnitTest - T05",
+ "mRid": "6641004"
+ },
+ {
+ "name": "UnitTest - T06",
+ "mRid": "16565005"
+ }
+ ]
+ },
+ {
+ "name": "UnitTest - CN04",
+ "mRid": "2233332333589",
+ "terminalList": [
+ {
+ "name": "UnitTest - T07",
+ "mRid": "16565006"
+ },
+ {
+ "name": "UnitTest - T08",
+ "mRid": "10666607"
+ }
+ ]
+ },
+ {
+ "name": "UnitTest - CN05",
+ "mRid": "25///789989",
+ "terminalList": [
+ {
+ "name": "UnitTest - T09",
+ "mRid": "1065608"
+ },
+ {
+ "name": "UnitTest - T10",
+ "mRid": "165565009"
+ }
+ ]
+ }
+ ],
+ "equipmentList": [
+ {
+ "@class": "org.eclipse.openk.model.wires.SynchronousMachine",
+ "name": "UnitTest - SynchronousMachine01",
+ "mRid": "4588992112",
+ "synchronousMachineKind": "GENERATOR",
+ "generatingUnit": {
+ "@class": "org.eclipse.openk.model.production.GeneratingUnit",
+ "name": "UnitTest - Generating Unit 01",
+ "mRid": "5487872128",
+ "registeredGenerator": {"unitType": "PHOT"}
+ },
+ "terminalList": [ {
+ "name": "UnitTest - T01",
+ "mRid": "10005455"
+ }]
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.SynchronousMachine",
+ "name": "UnitTest - SynchronousMachine02",
+ "mRid": "200054545",
+ "synchronousMachineKind": "GENERATOR",
+ "generatingUnit": {
+ "@class": "org.eclipse.openk.model.production.GeneratingUnit",
+ "name": "UnitTest - Generating Unit 02",
+ "mRid": "5587897545",
+ "registeredGenerator": {"unitType": "PTUR"}
+ },
+ "terminalList": [ {
+ "name": "UnitTest - T03",
+ "mRid": "1004453"
+ }]
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.Switch",
+ "name": "UnitTest - Switch01",
+ "mRid": "101254500",
+ "terminalList": [
+ {
+ "name": "UnitTest - T02",
+ "mRid": "10dsdfs02"
+ },
+ {
+ "name": "UnitTest - T05",
+ "mRid": "10sdfsd05"
+ }
+ ]
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.Switch",
+ "name": "UnitTest - Switch02",
+ "mRid": "20545400",
+ "terminalList": [
+ {
+ "name": "UnitTest - T04",
+ "mRid": "121212004"
+ },
+ {
+ "name": "UnitTest - T07",
+ "mRid": "1054507"
+ }
+ ]
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.Switch",
+ "name": "UnitTest - Switch03",
+ "mRid": "306454400",
+ "terminalList": [
+ {
+ "name": "UnitTest - T10",
+ "mRid": "165464010"
+ },
+ {
+ "name": "UnitTest - T11",
+ "mRid": "106464611"
+ }
+ ]
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.AcLineSegment",
+ "name": "UnitTest - Cable01",
+ "mRid": "456464654889",
+ "terminalList": [
+ {
+ "name": "UnitTest - T06",
+ "mRid": "10646406"
+ },
+ {
+ "name": "UnitTest - T08",
+ "mRid": "1006546468"
+ },
+ {
+ "name": "UnitTest - T09",
+ "mRid": "1064654609"
+ }
+ ]
+ }
+ ],
+ "voltageLevelList": []
+ },
+ {
+ "name": "UnitTest - Substation02 - Ortsnetzstation Störzelbach",
+ "mRid": "23213465222666",
+ "connectivityNodeList": [
+ {
+ "name": "UnitTest - CN06",
+ "mRid": "253454541189",
+ "terminalList": [
+ {
+ "name": "UnitTest - T11",
+ "mRid": "10154540"
+ },
+ {
+ "name": "UnitTest - T12",
+ "mRid": "1065511"
+ },
+ {
+ "name": "UnitTest - T13",
+ "mRid": "1065465412"
+ }
+ ]
+ },
+ {
+ "name": "UnitTest - CN07",
+ "mRid": "255465555489",
+ "terminalList": [
+ {
+ "name": "UnitTest - T14",
+ "mRid": "154545//013"
+ },
+ {
+ "name": "UnitTest - T15",
+ "mRid": "10545666//14"
+ }
+ ]
+ },
+ {
+ "name": "UnitTest - CN08",
+ "mRid": "10455558907",
+ "terminalList": [
+ {
+ "name": "UnitTest - T16",
+ "mRid": "10545415"
+ },
+ {
+ "name": "UnitTest - T17",
+ "mRid": "1012211556"
+ }
+ ]
+ }
+ ],
+ "equipmentList": [
+ {
+ "@class": "org.eclipse.openk.model.wires.PowerTransformer",
+ "name": "UnitTest - PowerTransformer01",
+ "mRid": "100016546600",
+ "terminalList": [ {
+ "name": "UnitTest - T15",
+ "mRid": "64641015"
+ }]
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.Switch",
+ "name": "UnitTest - Switch04",
+ "mRid": "10646403",
+ "terminalList": [
+ {
+ "name": "UnitTest - T13",
+ "mRid": "10164643"
+ },
+ {
+ "name": "UnitTest - T14",
+ "mRid": "16464654014"
+ }
+ ]
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.Switch",
+ "name": "UnitTest - Switch05",
+ "mRid": "1065464604",
+ "terminalList": [
+ {
+ "name": "UnitTest - T12",
+ "mRid": "16546464012"
+ },
+ {
+ "name": "UnitTest - T16",
+ "mRid": "164646016"
+ }
+ ]
+ }
+ ],
+ "voltageLevelList": []
+ },
+ {
+ "name": "UnitTest - Substation03 - Ortsnetzstation Alesheim04",
+ "mRid": "236646546556",
+ "connectivityNodeList": [
+ {
+ "name": "UnitTest - CN09",
+ "mRid": "25775454789",
+ "terminalList": [
+ {
+ "name": "UnitTest - T18",
+ "mRid": "1015457"
+ },
+ {
+ "name": "UnitTest - T19",
+ "mRid": "1015544888"
+ }
+ ]
+ },
+ {
+ "name": "UnitTest - CN10",
+ "mRid": "29000578789",
+ "terminalList": [
+ {
+ "name": "UnitTest - T21",
+ "mRid": "1025544880"
+ },
+ {
+ "name": "UnitTest - T22",
+ "mRid": "10878721"
+ }
+ ]
+ },
+ {
+ "name": "UnitTest - CN11",
+ "mRid": "2583455454349",
+ "terminalList": [
+ {
+ "name": "UnitTest - T24",
+ "mRid": "10/885523"
+ },
+ {
+ "name": "UnitTest - T25",
+ "mRid": "54541024"
+ }
+ ]
+ },
+ {
+ "name": "UnitTest - CN12",
+ "mRid": "2534534845//9",
+ "terminalList": [
+ {
+ "name": "UnitTest - T20",
+ "mRid": "105488919"
+ },
+ {
+ "name": "UnitTest - T23",
+ "mRid": "10545422"
+ },
+ {
+ "name": "UnitTest - T26",
+ "mRid": "1055544525"
+ },
+ {
+ "name": "UnitTest - T27",
+ "mRid": "10545826"
+ },
+ {
+ "name": "UnitTest - T28",
+ "mRid": "105456427"
+ }
+ ]
+ },
+ {
+ "name": "UnitTest - CN13",
+ "mRid": "25334344//53489",
+ "terminalList": [ {
+ "name": "UnitTest - T29",
+ "mRid": "108878798728"
+ }]
+ },
+ {
+ "name": "UnitTest - CN14",
+ "mRid": "253454654534",
+ "terminalList": [
+ {
+ "name": "UnitTest - T30",
+ "mRid": "5555/1029"
+ },
+ {
+ "name": "UnitTest - T31",
+ "mRid": "105589//30"
+ }
+ ]
+ }
+ ],
+ "equipmentList": [
+ {
+ "@class": "org.eclipse.openk.model.wires.SynchronousMachine",
+ "name": "UnitTest - SynchronousMachine03",
+ "mRid": "1065465402",
+ "synchronousMachineKind": "GENERATOR",
+ "generatingUnit": {
+ "@class": "org.eclipse.openk.model.production.GeneratingUnit",
+ "name": "UnitTest - Generating Unit 03",
+ "mRid": "548765465487",
+ "registeredGenerator": {"unitType": "WIND"}
+ },
+ "terminalList": [ {
+ "name": "UnitTest - T25",
+ "mRid": "1654654024"
+ }]
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.PowerTransformer",
+ "name": "UnitTest - PowerTransformer02",
+ "mRid": "1065465401",
+ "terminalList": [ {
+ "name": "UnitTest - T22",
+ "mRid": "1065465422"
+ }]
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.Switch",
+ "name": "UnitTest - Switch06",
+ "mRid": "10054545",
+ "terminalList": [
+ {
+ "name": "UnitTest - T19",
+ "mRid": "1065465419"
+ },
+ {
+ "name": "UnitTest - T27",
+ "mRid": "10655426"
+ }
+ ]
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.Switch",
+ "name": "UnitTest - Switch07",
+ "mRid": "100564656",
+ "terminalList": [
+ {
+ "name": "UnitTest - T28",
+ "mRid": "10sadf27"
+ },
+ {
+ "name": "UnitTest - T30",
+ "mRid": "10adfasdf29"
+ }
+ ]
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.Switch",
+ "name": "UnitTest - Switch08",
+ "mRid": "10sdfsdf07",
+ "terminalList": [
+ {
+ "name": "UnitTest - T26",
+ "mRid": "102adffsdf5"
+ },
+ {
+ "name": "UnitTest - T29",
+ "mRid": "106464654628"
+ }
+ ]
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.Switch",
+ "name": "UnitTest - Switch09",
+ "mRid": "10sdfsdf08",
+ "terminalList": [
+ {
+ "name": "UnitTest - T20",
+ "mRid": "10asdfasd20"
+ },
+ {
+ "name": "UnitTest - T21",
+ "mRid": "10sdfsdaf21"
+ }
+ ]
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.Switch",
+ "name": "UnitTest - Switch10",
+ "mRid": "106546409",
+ "terminalList": [
+ {
+ "name": "UnitTest - T23",
+ "mRid": "1026453"
+ },
+ {
+ "name": "UnitTest - T24",
+ "mRid": "10dsfsad24"
+ }
+ ]
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.AcLineSegment",
+ "name": "UnitTest - Cable02",
+ "mRid": "103453456465401",
+ "terminalList": [
+ {
+ "name": "UnitTest - T17",
+ "mRid": "1dfgdsfg017"
+ },
+ {
+ "name": "UnitTest - T18",
+ "mRid": "10646546518"
+ }
+ ]
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.AcLineSegment",
+ "name": "UnitTest - Cable03",
+ "mRid": "1032asadf34501",
+ "terminalList": [
+ {
+ "name": "UnitTest - T31",
+ "mRid": "1064654630"
+ },
+ {
+ "name": "UnitTest - T32",
+ "mRid": "1065465431"
+ }
+ ]
+ }
+ ],
+ "voltageLevelList": []
+ },
+ {
+ "name": "UnitTest - Substation04 - Ortsnetzstation A02",
+ "mRid": "23645346465466",
+ "connectivityNodeList": [
+ {
+ "name": "UnitTest - CN15",
+ "mRid": "253458745545834",
+ "terminalList": [
+ {
+ "name": "UnitTest - T32",
+ "mRid": "10656531"
+ },
+ {
+ "name": "UnitTest - T33",
+ "mRid": "10558832"
+ }
+ ]
+ },
+ {
+ "name": "UnitTest - CN16",
+ "mRid": "253458899434",
+ "terminalList": [
+ {
+ "name": "UnitTest - T34",
+ "mRid": "165//033"
+ },
+ {
+ "name": "UnitTest - T35",
+ "mRid": "1/8899034"
+ },
+ {
+ "name": "UnitTest - T38",
+ "mRid": "105465437"
+ }
+ ]
+ },
+ {
+ "name": "UnitTest - CN17",
+ "mRid": "25343//43834",
+ "terminalList": [
+ {
+ "name": "UnitTest - T36",
+ "mRid": "105465435"
+ },
+ {
+ "name": "UnitTest - T37",
+ "mRid": "10/899936"
+ }
+ ]
+ },
+ {
+ "name": "UnitTest - CN18",
+ "mRid": "888/984458884",
+ "terminalList": [
+ {
+ "name": "UnitTest - T39",
+ "mRid": "1065448838"
+ },
+ {
+ "name": "UnitTest - T40",
+ "mRid": "10/988839"
+ }
+ ]
+ }
+ ],
+ "equipmentList": [
+ {
+ "@class": "org.eclipse.openk.model.wires.PowerTransformer",
+ "name": "UnitTest - PowerTransformer03",
+ "mRid": "1056465402",
+ "terminalList": [ {
+ "name": "UnitTest - T37",
+ "mRid": "1065465436"
+ }]
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.Switch",
+ "name": "UnitTest - Switch11",
+ "mRid": "105465410",
+ "terminalList": [
+ {
+ "name": "UnitTest - T33",
+ "mRid": "10664632"
+ },
+ {
+ "name": "UnitTest - T34",
+ "mRid": "103656546543"
+ }
+ ]
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.Switch",
+ "name": "UnitTest - Switch12",
+ "mRid": "1065465411",
+ "terminalList": [
+ {
+ "name": "UnitTest - T35",
+ "mRid": "10655646534"
+ },
+ {
+ "name": "UnitTest - T36",
+ "mRid": "1065465435"
+ }
+ ]
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.Switch",
+ "name": "UnitTest - Switch13",
+ "mRid": "1654654012",
+ "terminalList": [
+ {
+ "name": "UnitTest - T38",
+ "mRid": "1036546547"
+ },
+ {
+ "name": "UnitTest - T39",
+ "mRid": "1035465438"
+ }
+ ]
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.AcLineSegment",
+ "name": "UnitTest - Cable04",
+ "mRid": "103/4532132501",
+ "terminalList": [
+ {
+ "name": "UnitTest - T40",
+ "mRid": "105465439"
+ },
+ {
+ "name": "UnitTest - T41",
+ "mRid": "10545440"
+ }
+ ]
+ }
+ ],
+ "voltageLevelList": []
+ },
+ {
+ "name": "UnitTest - Substation05 - Ortsnetzstation A06",
+ "mRid": "344236546566",
+ "connectivityNodeList": [
+ {
+ "name": "UnitTest - CN19",
+ "mRid": "10548818",
+ "terminalList": [
+ {
+ "name": "UnitTest - T41",
+ "mRid": "10458990"
+ },
+ {
+ "name": "UnitTest - T42",
+ "mRid": "105465441"
+ }
+ ]
+ },
+ {
+ "name": "UnitTest - CN20",
+ "mRid": "10546519",
+ "terminalList": [
+ {
+ "name": "UnitTest - T43",
+ "mRid": "10544542"
+ },
+ {
+ "name": "UnitTest - T44",
+ "mRid": "6546541043"
+ },
+ {
+ "name": "UnitTest - T47",
+ "mRid": "14455046"
+ }
+ ]
+ },
+ {
+ "name": "UnitTest - CN21",
+ "mRid": "10/85620",
+ "terminalList": [
+ {
+ "name": "UnitTest - T45",
+ "mRid": "10879944"
+ },
+ {
+ "name": "UnitTest - T46",
+ "mRid": "10546645"
+ }
+ ]
+ },
+ {
+ "name": "UnitTest - CN22",
+ "mRid": "102/88991",
+ "terminalList": [
+ {
+ "name": "UnitTest - T48",
+ "mRid": "10545647"
+ },
+ {
+ "name": "UnitTest - T49",
+ "mRid": "1055448"
+ }
+ ]
+ }
+ ],
+ "equipmentList": [
+ {
+ "@class": "org.eclipse.openk.model.wires.PowerTransformer",
+ "name": "UnitTest - PowerTransformer04",
+ "mRid": "10545403",
+ "terminalList": [ {
+ "name": "UnitTest - T46",
+ "mRid": "106565445"
+ }]
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.Switch",
+ "name": "UnitTest - Switch14",
+ "mRid": "1016546543",
+ "terminalList": [
+ {
+ "name": "UnitTest - T42",
+ "mRid": "154654041"
+ },
+ {
+ "name": "UnitTest - T43",
+ "mRid": "105465442"
+ }
+ ]
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.Switch",
+ "name": "UnitTest - Switch15",
+ "mRid": "1654654014",
+ "terminalList": [
+ {
+ "name": "UnitTest - T44",
+ "mRid": "1065465443"
+ },
+ {
+ "name": "UnitTest - T45",
+ "mRid": "1065465444"
+ }
+ ]
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.Switch",
+ "name": "UnitTest - Switch16",
+ "mRid": "1054654615",
+ "terminalList": [
+ {
+ "name": "UnitTest - T47",
+ "mRid": "1065465446"
+ },
+ {
+ "name": "UnitTest - T48",
+ "mRid": "1065465447"
+ }
+ ]
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.AcLineSegment",
+ "name": "UnitTest - Cable05",
+ "mRid": "10455788434601",
+ "terminalList": [
+ {
+ "name": "UnitTest - T49",
+ "mRid": "106546548"
+ },
+ {
+ "name": "UnitTest - T50",
+ "mRid": "106546546549"
+ }
+ ]
+ }
+ ],
+ "voltageLevelList": []
+ },
+ {
+ "name": "UnitTest - Substation06 - Ortsnetzstation Alesheim 01",
+ "mRid": "2367765465466",
+ "connectivityNodeList": [
+ {
+ "name": "UnitTest - CN23",
+ "mRid": "10287782",
+ "terminalList": [
+ {
+ "name": "UnitTest - T50",
+ "mRid": "10/88849"
+ },
+ {
+ "name": "UnitTest - T51",
+ "mRid": "10554640"
+ }
+ ]
+ },
+ {
+ "name": "UnitTest - CN24",
+ "mRid": "10545423",
+ "terminalList": [
+ {
+ "name": "UnitTest - T52",
+ "mRid": "165656051"
+ },
+ {
+ "name": "UnitTest - T53",
+ "mRid": "106589952"
+ }
+ ]
+ },
+ {
+ "name": "UnitTest - CN25",
+ "mRid": "102/88774",
+ "terminalList": [
+ {
+ "name": "UnitTest - T54",
+ "mRid": "1/85666053"
+ },
+ {
+ "name": "UnitTest - T55",
+ "mRid": "1098987754"
+ }
+ ]
+ },
+ {
+ "name": "UnitTest - CN26",
+ "mRid": "1025488995",
+ "terminalList": [
+ {
+ "name": "UnitTest - T56",
+ "mRid": "105/89995"
+ },
+ {
+ "name": "UnitTest - T57",
+ "mRid": "1089774456"
+ }
+ ]
+ },
+ {
+ "name": "UnitTest - CN27",
+ "mRid": "10/884526",
+ "terminalList": [
+ {
+ "name": "UnitTest - T58",
+ "mRid": "105547777"
+ },
+ {
+ "name": "UnitTest - T59",
+ "mRid": "10545458"
+ }
+ ]
+ }
+ ],
+ "equipmentList": [
+ {
+ "@class": "org.eclipse.openk.model.wires.PowerTransformer",
+ "name": "UnitTest - PowerTransformer05",
+ "mRid": "1054546504",
+ "terminalList": [ {
+ "name": "UnitTest - T55",
+ "mRid": "105454554"
+ }]
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.Switch",
+ "name": "UnitTest - Switch17",
+ "mRid": "1054545416",
+ "terminalList": [
+ {
+ "name": "UnitTest - T51",
+ "mRid": "1065465450"
+ },
+ {
+ "name": "UnitTest - T52",
+ "mRid": "10646546551"
+ }
+ ]
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.Switch",
+ "name": "UnitTest - Switch18",
+ "mRid": "10545417",
+ "terminalList": [
+ {
+ "name": "UnitTest - T53",
+ "mRid": "1054/5452"
+ },
+ {
+ "name": "UnitTest - T54",
+ "mRid": "10546546553"
+ }
+ ]
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.Switch",
+ "name": "UnitTest - Switch19",
+ "mRid": "1054545418",
+ "terminalList": [ {
+ "name": "UnitTest - T56",
+ "mRid": "1065465455"
+ }]
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.AcLineSegment",
+ "name": "UnitTest - Cable06",
+ "mRid": "177805465465301",
+ "terminalList": [
+ {
+ "name": "UnitTest - T57",
+ "mRid": "10654654656"
+ },
+ {
+ "name": "UnitTest - T58",
+ "mRid": "105454557"
+ }
+ ]
+ }
+ ],
+ "voltageLevelList": []
+ },
+ {
+ "name": "UnitTest - Substation07 - Ortsnetzstation A03",
+ "mRid": "23688654654666",
+ "connectivityNodeList": [
+ {
+ "name": "UnitTest - CN28",
+ "mRid": "102899/7",
+ "terminalList": [
+ {
+ "name": "UnitTest - T60",
+ "mRid": "105/8855449"
+ },
+ {
+ "name": "UnitTest - T61",
+ "mRid": "10/8552260"
+ },
+ {
+ "name": "UnitTest - T64",
+ "mRid": "106/899663"
+ }
+ ]
+ },
+ {
+ "name": "UnitTest - CN29",
+ "mRid": "102/855448",
+ "terminalList": [
+ {
+ "name": "UnitTest - T62",
+ "mRid": "108654/61"
+ },
+ {
+ "name": "UnitTest - T63",
+ "mRid": "10/85562"
+ }
+ ]
+ },
+ {
+ "name": "UnitTest - CN30",
+ "mRid": "102/855669",
+ "terminalList": [
+ {
+ "name": "UnitTest - T65",
+ "mRid": "108787445/64"
+ },
+ {
+ "name": "UnitTest - T66",
+ "mRid": "106/855225"
+ }
+ ]
+ },
+ {
+ "name": "UnitTest - CN31",
+ "mRid": "1038577/0",
+ "terminalList": [
+ {
+ "name": "UnitTest - T67",
+ "mRid": "106/85526"
+ },
+ {
+ "name": "UnitTest - T68",
+ "mRid": "10/852367"
+ }
+ ]
+ },
+ {
+ "name": "UnitTest - CN32",
+ "mRid": "103/885521",
+ "terminalList": [
+ {
+ "name": "UnitTest - T69",
+ "mRid": "106/8528"
+ },
+ {
+ "name": "UnitTest - T70",
+ "mRid": "10/85269"
+ },
+ {
+ "name": "UnitTest - T73",
+ "mRid": "107/885522"
+ }
+ ]
+ },
+ {
+ "name": "UnitTest - CN33",
+ "mRid": "103/8522",
+ "terminalList": [
+ {
+ "name": "UnitTest - T71",
+ "mRid": "107/8520"
+ },
+ {
+ "name": "UnitTest - T72",
+ "mRid": "10855471"
+ }
+ ]
+ },
+ {
+ "name": "UnitTest - CN34",
+ "mRid": "103/855223",
+ "terminalList": [
+ {
+ "name": "UnitTest - T74",
+ "mRid": "107/85213"
+ },
+ {
+ "name": "UnitTest - T75",
+ "mRid": "10/852174"
+ }
+ ]
+ },
+ {
+ "name": "UnitTest - CN35",
+ "mRid": "10385//4",
+ "terminalList": [
+ {
+ "name": "UnitTest - T76",
+ "mRid": "107/8555"
+ },
+ {
+ "name": "UnitTest - T77",
+ "mRid": "10785/6"
+ },
+ {
+ "name": "UnitTest - T78",
+ "mRid": "107/8527"
+ }
+ ]
+ }
+ ],
+ "equipmentList": [
+ {
+ "@class": "org.eclipse.openk.model.wires.PowerTransformer",
+ "name": "UnitTest - PowerTransformer06",
+ "mRid": "1005465465",
+ "terminalList": [ {
+ "name": "UnitTest - T63",
+ "mRid": "1065465462"
+ }]
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.Switch",
+ "name": "UnitTest - Switch20",
+ "mRid": "1054654519",
+ "terminalList": [
+ {
+ "name": "UnitTest - T59",
+ "mRid": "105465465458"
+ },
+ {
+ "name": "UnitTest - T60",
+ "mRid": "1065465459"
+ }
+ ]
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.Switch",
+ "name": "UnitTest - Switch21",
+ "mRid": "106546546520",
+ "terminalList": [
+ {
+ "name": "UnitTest - T61",
+ "mRid": "1065465/96646540"
+ },
+ {
+ "name": "UnitTest - T62",
+ "mRid": "106546561"
+ }
+ ]
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.Switch",
+ "name": "UnitTest - Switch22",
+ "mRid": "1065421",
+ "terminalList": [
+ {
+ "name": "UnitTest - T64",
+ "mRid": "105645463"
+ },
+ {
+ "name": "UnitTest - T65",
+ "mRid": "1065465464"
+ }
+ ]
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.AcLineSegment",
+ "name": "UnitTest - Cable07",
+ "mRid": "14/321321301",
+ "terminalList": [
+ {
+ "name": "UnitTest - T66",
+ "mRid": "105646546565"
+ },
+ {
+ "name": "UnitTest - T67",
+ "mRid": "105465466"
+ }
+ ]
+ }
+ ],
+ "voltageLevelList": []
+ },
+ {
+ "name": "UnitTest - Substation08 - Ortsnetzstation W02",
+ "mRid": "236563336546546",
+ "connectivityNodeList": [],
+ "equipmentList": [
+ {
+ "@class": "org.eclipse.openk.model.wires.PowerTransformer",
+ "name": "UnitTest - PowerTransformer07",
+ "mRid": "1006546546",
+ "terminalList": [ {
+ "name": "UnitTest - T72",
+ "mRid": "16546540/71"
+ }]
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.Switch",
+ "name": "UnitTest - Switch23",
+ "mRid": "1065465422",
+ "terminalList": [
+ {
+ "name": "UnitTest - T68",
+ "mRid": "106546546567"
+ },
+ {
+ "name": "UnitTest - T69",
+ "mRid": "1056456468"
+ }
+ ]
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.Switch",
+ "name": "UnitTest - Switch24",
+ "mRid": "106546546523",
+ "terminalList": [
+ {
+ "name": "UnitTest - T70",
+ "mRid": "1065465469"
+ },
+ {
+ "name": "UnitTest - T71",
+ "mRid": "105465446570"
+ }
+ ]
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.Switch",
+ "name": "UnitTest - Switch25",
+ "mRid": "1065465424",
+ "terminalList": [
+ {
+ "name": "UnitTest - T73",
+ "mRid": "1076546542"
+ },
+ {
+ "name": "UnitTest - T74",
+ "mRid": "1065465473"
+ }
+ ]
+ }
+ ],
+ "voltageLevelList": []
+ },
+ {
+ "name": "UnitTest - Substation09 - Umspannwerk WAHF",
+ "mRid": "2363488336565456",
+ "connectivityNodeList": [ {
+ "name": "UnitTest - CN36",
+ "mRid": "103/855665",
+ "terminalList": [
+ {
+ "name": "UnitTest - T79",
+ "mRid": "108554478"
+ },
+ {
+ "name": "UnitTest - T80",
+ "mRid": "10859979"
+ }
+ ]
+ }],
+ "equipmentList": [ {
+ "@class": "org.eclipse.openk.model.wires.PowerTransformer",
+ "name": "UnitTest - PowerTransformer08",
+ "mRid": "106546546507",
+ "terminalList": [
+ {
+ "name": "UnitTest - T89",
+ "mRid": "10564654/88"
+ },
+ {
+ "name": "UnitTest - T90",
+ "mRid": "106546546589"
+ }
+ ]
+ }],
+ "voltageLevelList": [
+ {
+ "name": "UnitTest - VoltageLevel01 - 110kV",
+ "mRid": "23663458936536",
+ "connectivityNodeList": [
+ {
+ "name": "UnitTest - CN41",
+ "mRid": "104/8770",
+ "terminalList": [
+ {
+ "name": "UnitTest - T90",
+ "mRid": "10/85589"
+ },
+ {
+ "name": "UnitTest - T91",
+ "mRid": "109/855660"
+ }
+ ]
+ },
+ {
+ "name": "UnitTest - CN42",
+ "mRid": "1/52215041",
+ "terminalList": [
+ {
+ "name": "UnitTest - T92",
+ "mRid": "109897891"
+ },
+ {
+ "name": "UnitTest - T93",
+ "mRid": "108955692"
+ }
+ ]
+ }
+ ],
+ "equipmentList": [
+ {
+ "@class": "org.eclipse.openk.model.wires.Switch",
+ "name": "UnitTest - Switch30",
+ "mRid": "1065465429",
+ "terminalList": [
+ {
+ "name": "UnitTest - T91",
+ "mRid": "105456490"
+ },
+ {
+ "name": "UnitTest - T92",
+ "mRid": "10546546591"
+ }
+ ]
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.AcLineSegment",
+ "name": "UnitTest - Cable08",
+ "mRid": "14555/065565461",
+ "terminalList": [
+ {
+ "name": "UnitTest - T75",
+ "mRid": "10sfdasd74"
+ },
+ {
+ "name": "UnitTest - T76",
+ "mRid": "10sdfsd75"
+ },
+ {
+ "name": "UnitTest - T93",
+ "mRid": "109sdafsdf2"
+ }
+ ]
+ }
+ ],
+ "highVoltageLimit": {
+ "value": 110,
+ "multiplier": "k",
+ "unit": "V"
+ }
+ },
+ {
+ "name": "UnitTest - VoltageLevel02",
+ "mRid": "897646544455",
+ "connectivityNodeList": [
+ {
+ "name": "UnitTest - CN37",
+ "mRid": "103/87746",
+ "terminalList": [
+ {
+ "name": "UnitTest - T81",
+ "mRid": "10adfsa80"
+ },
+ {
+ "name": "UnitTest - T82",
+ "mRid": "10rfwer81"
+ }
+ ]
+ },
+ {
+ "name": "UnitTest - CN38",
+ "mRid": "1fsadfas037",
+ "terminalList": [
+ {
+ "name": "UnitTest - T83",
+ "mRid": "1ada082"
+ },
+ {
+ "name": "UnitTest - T84",
+ "mRid": "108878783"
+ }
+ ]
+ },
+ {
+ "name": "UnitTest - CN39",
+ "mRid": "154588038",
+ "terminalList": [
+ {
+ "name": "UnitTest - T85",
+ "mRid": "106588/84"
+ },
+ {
+ "name": "UnitTest - T86",
+ "mRid": "10sdfasdf85"
+ }
+ ]
+ },
+ {
+ "name": "UnitTest - CN40",
+ "mRid": "105487739",
+ "terminalList": [
+ {
+ "name": "UnitTest - T87",
+ "mRid": "10/85586"
+ },
+ {
+ "name": "UnitTest - T88",
+ "mRid": "1asdf087"
+ },
+ {
+ "name": "UnitTest - T89",
+ "mRid": "1srf088"
+ }
+ ]
+ }
+ ],
+ "equipmentList": [
+ {
+ "@class": "org.eclipse.openk.model.wires.BusbarSection",
+ "name": "UnitTest - BusbarSection01",
+ "mRid": "54886546855",
+ "terminalList": [
+ {
+ "name": "UnitTest - T82",
+ "mRid": "108sfdgsdfg1"
+ },
+ {
+ "name": "UnitTest - T85",
+ "mRid": "106546584"
+ }
+ ]
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.BusbarSection",
+ "name": "UnitTest - BusbarSection02",
+ "mRid": "5342348885465455",
+ "terminalList": [
+ {
+ "name": "UnitTest - T80",
+ "mRid": "1065465479"
+ },
+ {
+ "name": "UnitTest - T83",
+ "mRid": "1065465482"
+ }
+ ]
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.Switch",
+ "name": "UnitTest - Switch26",
+ "mRid": "106546525",
+ "terminalList": [
+ {
+ "name": "UnitTest - T77",
+ "mRid": "646546541076"
+ },
+ {
+ "name": "UnitTest - T79",
+ "mRid": "105465478"
+ }
+ ]
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.Switch",
+ "name": "UnitTest - Switch27",
+ "mRid": "1025646546",
+ "terminalList": [
+ {
+ "name": "UnitTest - T78",
+ "mRid": "1076546547"
+ },
+ {
+ "name": "UnitTest - T81",
+ "mRid": "1065465480"
+ }
+ ]
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.Switch",
+ "name": "UnitTest - Switch28",
+ "mRid": "106565427",
+ "terminalList": [
+ {
+ "name": "UnitTest - T84",
+ "mRid": "106546546583"
+ },
+ {
+ "name": "UnitTest - T88",
+ "mRid": "1065465487"
+ }
+ ]
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.Switch",
+ "name": "UnitTest - Switch29",
+ "mRid": "1654654028",
+ "terminalList": [
+ {
+ "name": "UnitTest - T86",
+ "mRid": "1086546545"
+ },
+ {
+ "name": "UnitTest - T87",
+ "mRid": "1085646546"
+ }
+ ]
+ }
+ ],
+ "highVoltageLimit": {
+ "value": 20,
+ "multiplier": "k",
+ "unit": "V"
+ }
+ }
+ ]
+ },
+ {
+ "name": "UnitTest - Substation10 - Ortsnetzstation Alesheim05A",
+ "mRid": "23633366546546",
+ "connectivityNodeList": [],
+ "equipmentList": [],
+ "voltageLevelList": []
+ }
+ ]
+ }]
+} \ No newline at end of file
diff --git a/openk-platform/openk-cachedb-service/src/test/resources/json-test-samples/geographicalregion-topology-sample-02.json b/openk-platform/openk-cachedb-service/src/test/resources/json-test-samples/geographicalregion-topology-sample-02.json
new file mode 100644
index 00000000..3626d477
--- /dev/null
+++ b/openk-platform/openk-cachedb-service/src/test/resources/json-test-samples/geographicalregion-topology-sample-02.json
@@ -0,0 +1,76 @@
+{
+ "name": "UnitTest - Geamtes Netz MDN",
+ "mRid": "1000/100",
+ "subGeographicalRegionList": [ {
+ "name": "UnitTest - Netzgebiet MDN",
+ "mRid": "1000/1001",
+ "substationList": [
+ {
+ "name": "UnitTest - Breslauer Straße",
+ "mRid": "5488/669",
+ "equipmentList": [
+ {
+ "@class": "org.eclipse.openk.model.wires.SynchronousMachine",
+ "name": "UnitTest - AS 012 Bayern 98 20 PV NTF KundEEG Öko-Aktiv MW P",
+ "mRid": "110/10488",
+ "synchronousMachineKind": "GENERATOR",
+ "generatingUnit": {
+ "@class": "org.eclipse.openk.model.production.GeneratingUnit",
+ "name": "UnitTest - Generating Unit 01",
+ "mRid": "1/5487872128",
+ "registeredGenerator": {"unitType": "PHOT"}
+ },
+ "terminalList": []
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.SynchronousMachine",
+ "name": "UnitTest - AS 0269 Karl-Steigelmann 20 PV EEG PV1 Eco-Invest MW P",
+ "mRid": "110/10989",
+ "synchronousMachineKind": "GENERATOR",
+ "generatingUnit": {
+ "@class": "org.eclipse.openk.model.production.GeneratingUnit",
+ "name": "UnitTest - Generating Unit 02",
+ "mRid": "2/5587897545",
+ "registeredGenerator": {"unitType": "PTUR"}
+ },
+ "terminalList": []
+ },
+ {
+ "@class": "org.eclipse.openk.model.wires.SynchronousMachine",
+ "name": "UnitTest - AS 0269 Karl-Steigelmann 20 PV EEG PV2 KQV Solarpar MW P",
+ "mRid": "110/10991",
+ "synchronousMachineKind": "GENERATOR",
+ "generatingUnit": {
+ "@class": "org.eclipse.openk.model.production.GeneratingUnit",
+ "name": "UnitTest - Generating Unit 02",
+ "mRid": "3/5587897545",
+ "registeredGenerator": {"unitType": "PTUR"}
+ },
+ "terminalList": []
+ }
+ ],
+ "voltageLevelList": []
+ },
+ {
+ "name": "UnitTest - Horneckerweg",
+ "mRid": "123/5556",
+ "equipmentList": [
+ {
+ "@class": "org.eclipse.openk.model.wires.SynchronousMachine",
+ "name": "UnitTest - AS 1051 Pretzfelder 7A 20 BIO NTF 1 EEG Grunds. Oschmann MW P",
+ "mRid": "110/13013",
+ "synchronousMachineKind": "GENERATOR",
+ "generatingUnit": {
+ "@class": "org.eclipse.openk.model.production.GeneratingUnit",
+ "name": "UnitTest - Generating Unit 01",
+ "mRid": "4/5487872128",
+ "registeredGenerator": {"unitType": "PHOT"}
+ },
+ "terminalList": []
+ }
+ ],
+ "voltageLevelList": []
+ }
+ ]
+ }]
+} \ No newline at end of file
diff --git a/openk-platform/openk-cachedb-service/src/test/resources/json-test-samples/synchronousmachine-sample-01.json b/openk-platform/openk-cachedb-service/src/test/resources/json-test-samples/synchronousmachine-sample-01.json
index 234a5873..cf47c335 100644
--- a/openk-platform/openk-cachedb-service/src/test/resources/json-test-samples/synchronousmachine-sample-01.json
+++ b/openk-platform/openk-cachedb-service/src/test/resources/json-test-samples/synchronousmachine-sample-01.json
@@ -1,13 +1,14 @@
[
{
+ "@class": "org.eclipse.openk.model.wires.SynchronousMachine",
"name": "UnitTest - SynchronousMachine01",
- "mRid": "4588995444",
+ "mRid": "4588997888",
"psrEventList": [ {
"createdDateTime": {"value": "10.12.2015 12:00:00"},
"psrEventKind": "inService"
}],
- "normallyInService": true,
"controlEnabled": true,
+ "normallyInService": true,
"maxU": {
"value": 30,
"multiplier": "k",
@@ -22,6 +23,9 @@
"communicationGroup": 1,
"referencedSynchronousMachineMrid": null,
"generatingUnit": {
+ "@class": "org.eclipse.openk.model.production.GeneratingUnit",
+ "name": "UnitTest - Generating Unit 01",
+ "mRid": "54878785566",
"highControlLimit": {
"value": 30,
"multiplier": "k",
@@ -36,7 +40,7 @@
"registeredGenerator": {"unitType": "PHOT"}
},
"location": {
- "name": "UnitTest - Location01",
+ "name": "Location01",
"electronicAddress": {"email": "mail@einspeiser-01.de"},
"mainAddress": {
"streetDetail": {
@@ -64,17 +68,18 @@
{"setting": {"value": 50}}
],
"operatingParticipantList": [ {
- "name": "MDN-0479",
- "mRid": "1000",
+ "name": "UnitTest - MDN-0479",
+ "mRid": "1000/1",
"percentage": {"value": 100}
}]
},
{
+ "@class": "org.eclipse.openk.model.wires.SynchronousMachine",
"name": "UnitTest - SynchronousMachine02",
- "mRid": "20054540",
+ "mRid": "2000225665",
"psrEventList": [],
- "normallyInService": true,
"controlEnabled": true,
+ "normallyInService": true,
"maxU": {
"value": 30,
"multiplier": "k",
@@ -89,6 +94,9 @@
"communicationGroup": 1,
"referencedSynchronousMachineMrid": "458899",
"generatingUnit": {
+ "@class": "org.eclipse.openk.model.production.GeneratingUnit",
+ "name": "UnitTest - Generating Unit 02",
+ "mRid": "558789754222",
"highControlLimit": {
"value": 22,
"multiplier": "k",
@@ -103,7 +111,7 @@
"registeredGenerator": {"unitType": "PTUR"}
},
"location": {
- "name": "UnitTest - Location02",
+ "name": "Location02",
"electronicAddress": {"email": "mail@einspeiser-02.de"},
"mainAddress": {
"streetDetail": {
@@ -118,19 +126,26 @@
},
"positionPointList": []
},
- "reductionSettingList": [],
+ "reductionSettingList": [
+ {"setting": {"value": 10}},
+ {"setting": {"value": 20}},
+ {"setting": {"value": 30}},
+ {"setting": {"value": 40}},
+ {"setting": {"value": 50}}
+ ],
"operatingParticipantList": [ {
- "name": "MDN-0479",
- "mRid": "1000",
+ "name": "UnitTest - MDN-0479",
+ "mRid": "1000/2",
"percentage": {"value": 100}
}]
},
{
+ "@class": "org.eclipse.openk.model.wires.SynchronousMachine",
"name": "UnitTest - SynchronousMachine03",
- "mRid": "1054502",
+ "mRid": "10022233665",
"psrEventList": [],
- "normallyInService": true,
"controlEnabled": true,
+ "normallyInService": true,
"maxU": {
"value": 30,
"multiplier": "k",
@@ -145,6 +160,9 @@
"communicationGroup": 1,
"referencedSynchronousMachineMrid": "458899",
"generatingUnit": {
+ "@class": "org.eclipse.openk.model.production.GeneratingUnit",
+ "name": "UnitTest - Generating Unit 03",
+ "mRid": "5487875488787",
"highControlLimit": {
"value": 33,
"multiplier": "k",
@@ -159,7 +177,7 @@
"registeredGenerator": {"unitType": "WIND"}
},
"location": {
- "name": "UnitTest - Location03",
+ "name": "Location03",
"electronicAddress": {"email": "mail@einspeiser-03.de"},
"mainAddress": {
"streetDetail": {
@@ -174,10 +192,14 @@
},
"positionPointList": []
},
- "reductionSettingList": [],
+ "reductionSettingList": [
+ {"setting": {"value": 10}},
+ {"setting": {"value": 30}},
+ {"setting": {"value": 50}}
+ ],
"operatingParticipantList": [ {
- "name": "MDN-0479",
- "mRid": "1000",
+ "name": "UnitTest - MDN-0479",
+ "mRid": "1000/33",
"percentage": {"value": 100}
}]
}
diff --git a/openk-platform/openk-cachedb-service/src/test/resources/json-test-samples/synchronousmachine-sample-02.json b/openk-platform/openk-cachedb-service/src/test/resources/json-test-samples/synchronousmachine-sample-02.json
index a9304ee0..12215067 100644
--- a/openk-platform/openk-cachedb-service/src/test/resources/json-test-samples/synchronousmachine-sample-02.json
+++ b/openk-platform/openk-cachedb-service/src/test/resources/json-test-samples/synchronousmachine-sample-02.json
@@ -1,7 +1,8 @@
[
{
+ "@class": "org.eclipse.openk.model.wires.SynchronousMachine",
"name": "UnitTest - SynchronousMachine01",
- "mRid": "458899",
+ "mRid": "45889912556",
"psrEventList": [ {
"createdDateTime": {"value": "08.11.2015 12:01:54"},
"psrEventKind": "inService"
@@ -21,6 +22,9 @@
"parentSynchronousMachine": true,
"referencedSynchronousMachineMrid": null,
"generatingUnit": {
+ "@class": "org.eclipse.openk.model.production.GeneratingUnit",
+ "name": "UnitTest - GeneratingUnit01",
+ "mRid": "54878785566",
"highControlLimit": {
"value": 30,
"multiplier": "k",
@@ -57,8 +61,9 @@
}
},
{
+ "@class": "org.eclipse.openk.model.wires.SynchronousMachine",
"name": "UnitTest - SynchronousMachine02",
- "mRid": "2000",
+ "mRid": "200022655",
"psrEventList": [],
"normallyInService": true,
"synchronousMachineKind": "GENERATOR",
@@ -69,6 +74,9 @@
"parentSynchronousMachine": false,
"referencedSynchronousMachineMrid": "458899",
"generatingUnit": {
+ "@class": "org.eclipse.openk.model.production.GeneratingUnit",
+ "name": "UnitTest - GeneratingUnit02",
+ "mRid": "548787855622116",
"highControlLimit": {
"value": 22,
"multiplier": "k",
@@ -100,8 +108,9 @@
}
},
{
+ "@class": "org.eclipse.openk.model.wires.SynchronousMachine",
"name": "UnitTest - SynchronousMachine03",
- "mRid": "1002",
+ "mRid": "100226558",
"psrEventList": [],
"normallyInService": true,
"synchronousMachineKind": "GENERATOR",
@@ -112,6 +121,9 @@
"parentSynchronousMachine": false,
"referencedSynchronousMachineMrid": "458899",
"generatingUnit": {
+ "@class": "org.eclipse.openk.model.production.GeneratingUnit",
+ "name": "UnitTest - GeneratingUnit03",
+ "mRid": "5487878556116",
"highControlLimit": {
"value": 33,
"multiplier": "k",
diff --git a/openk-platform/openk-cachedb-service/src/test/resources/json-test-samples/synchronousmachine-sample-04.json b/openk-platform/openk-cachedb-service/src/test/resources/json-test-samples/synchronousmachine-sample-04.json
new file mode 100644
index 00000000..234a5873
--- /dev/null
+++ b/openk-platform/openk-cachedb-service/src/test/resources/json-test-samples/synchronousmachine-sample-04.json
@@ -0,0 +1,184 @@
+[
+ {
+ "name": "UnitTest - SynchronousMachine01",
+ "mRid": "4588995444",
+ "psrEventList": [ {
+ "createdDateTime": {"value": "10.12.2015 12:00:00"},
+ "psrEventKind": "inService"
+ }],
+ "normallyInService": true,
+ "controlEnabled": true,
+ "maxU": {
+ "value": 30,
+ "multiplier": "k",
+ "unit": "W"
+ },
+ "synchronousMachineKind": "GENERATOR",
+ "currentReductionSetting": {"value": 60},
+ "statusCurrentReductionSetting": true,
+ "feedInRanking": 14,
+ "feedInPriority": 1,
+ "communicationType": "EFT",
+ "communicationGroup": 1,
+ "referencedSynchronousMachineMrid": null,
+ "generatingUnit": {
+ "highControlLimit": {
+ "value": 30,
+ "multiplier": "k",
+ "unit": "W"
+ },
+ "maxOperatingP": {
+ "value": 50,
+ "multiplier": "k",
+ "unit": "W"
+ },
+ "generatorControlSource": "isControllable",
+ "registeredGenerator": {"unitType": "PHOT"}
+ },
+ "location": {
+ "name": "UnitTest - Location01",
+ "electronicAddress": {"email": "mail@einspeiser-01.de"},
+ "mainAddress": {
+ "streetDetail": {
+ "name": "Strasse A",
+ "number": "21"
+ },
+ "postalCode": "22000",
+ "townDetail": {
+ "country": "Germany",
+ "name": "City A"
+ }
+ },
+ "positionPointList": [ {
+ "sequenceNumber": null,
+ "xPosition": "56.002554",
+ "yPosition": "20.00122",
+ "zPosition": null
+ }]
+ },
+ "reductionSettingList": [
+ {"setting": {"value": 10}},
+ {"setting": {"value": 20}},
+ {"setting": {"value": 30}},
+ {"setting": {"value": 40}},
+ {"setting": {"value": 50}}
+ ],
+ "operatingParticipantList": [ {
+ "name": "MDN-0479",
+ "mRid": "1000",
+ "percentage": {"value": 100}
+ }]
+ },
+ {
+ "name": "UnitTest - SynchronousMachine02",
+ "mRid": "20054540",
+ "psrEventList": [],
+ "normallyInService": true,
+ "controlEnabled": true,
+ "maxU": {
+ "value": 30,
+ "multiplier": "k",
+ "unit": "W"
+ },
+ "synchronousMachineKind": "GENERATOR",
+ "currentReductionSetting": {"value": 90},
+ "statusCurrentReductionSetting": true,
+ "feedInRanking": 15,
+ "feedInPriority": 1,
+ "communicationType": "EFT",
+ "communicationGroup": 1,
+ "referencedSynchronousMachineMrid": "458899",
+ "generatingUnit": {
+ "highControlLimit": {
+ "value": 22,
+ "multiplier": "k",
+ "unit": "W"
+ },
+ "maxOperatingP": {
+ "value": 222,
+ "multiplier": "k",
+ "unit": "W"
+ },
+ "generatorControlSource": "isControllable",
+ "registeredGenerator": {"unitType": "PTUR"}
+ },
+ "location": {
+ "name": "UnitTest - Location02",
+ "electronicAddress": {"email": "mail@einspeiser-02.de"},
+ "mainAddress": {
+ "streetDetail": {
+ "name": "Strasse B",
+ "number": "21"
+ },
+ "postalCode": "22000",
+ "townDetail": {
+ "country": "Germany",
+ "name": "City B"
+ }
+ },
+ "positionPointList": []
+ },
+ "reductionSettingList": [],
+ "operatingParticipantList": [ {
+ "name": "MDN-0479",
+ "mRid": "1000",
+ "percentage": {"value": 100}
+ }]
+ },
+ {
+ "name": "UnitTest - SynchronousMachine03",
+ "mRid": "1054502",
+ "psrEventList": [],
+ "normallyInService": true,
+ "controlEnabled": true,
+ "maxU": {
+ "value": 30,
+ "multiplier": "k",
+ "unit": "W"
+ },
+ "synchronousMachineKind": "GENERATOR",
+ "currentReductionSetting": {"value": 80},
+ "statusCurrentReductionSetting": true,
+ "feedInRanking": 15,
+ "feedInPriority": 1,
+ "communicationType": "EFT",
+ "communicationGroup": 1,
+ "referencedSynchronousMachineMrid": "458899",
+ "generatingUnit": {
+ "highControlLimit": {
+ "value": 33,
+ "multiplier": "k",
+ "unit": "W"
+ },
+ "maxOperatingP": {
+ "value": 222,
+ "multiplier": "k",
+ "unit": "W"
+ },
+ "generatorControlSource": "isControllable",
+ "registeredGenerator": {"unitType": "WIND"}
+ },
+ "location": {
+ "name": "UnitTest - Location03",
+ "electronicAddress": {"email": "mail@einspeiser-03.de"},
+ "mainAddress": {
+ "streetDetail": {
+ "name": "Strasse C",
+ "number": "21"
+ },
+ "postalCode": "22000",
+ "townDetail": {
+ "country": "Germany",
+ "name": "City C"
+ }
+ },
+ "positionPointList": []
+ },
+ "reductionSettingList": [],
+ "operatingParticipantList": [ {
+ "name": "MDN-0479",
+ "mRid": "1000",
+ "percentage": {"value": 100}
+ }]
+ }
+] \ No newline at end of file
diff --git a/openk-platform/openk-cachedb-service/src/test/sql/cachedb-insert-data.sql b/openk-platform/openk-cachedb-service/src/test/sql/cachedb-insert-data.sql
index 9619f158..d0077e6c 100644
--- a/openk-platform/openk-cachedb-service/src/test/sql/cachedb-insert-data.sql
+++ b/openk-platform/openk-cachedb-service/src/test/sql/cachedb-insert-data.sql
@@ -16,23 +16,23 @@ INSERT INTO EQUIPMENT_CONTAINER VALUES (1010, '8974455', 'VoltageLevel02', 20,'K
INSERT INTO EQUIPMENT_CONTAINER VALUES (1011, '23633366', 'Substation10 - Ortsnetzstation Alesheim05A',null,null,null, 'SubstationType', null, 1000);
INSERT INTO generating_unit(
- id, mrid, high_control_limit_value, high_control_limit_unit_multiplier,
+ id, mrid, name, high_control_limit_value, high_control_limit_unit_multiplier,
high_control_limit_unit_symbol, max_operating_power_limit_value,
max_operating_power_unit_multiplier, max_operating_power_unit_symbol, control_source, unit_type,
equipment_container_id)
- VALUES (1000, '5487878', 30, 'KILO', 'W',50,'KILO','W','IS_CONTROLLABLE','PHOT', 1000);
+ VALUES (1000, '5487878', 'Generating Unit 01', 30, 'KILO', 'W',50,'KILO','W','IS_CONTROLLABLE','PHOT', 1000);
INSERT INTO generating_unit(
- id, mrid, high_control_limit_value, high_control_limit_unit_multiplier,
+ id, mrid, name, high_control_limit_value, high_control_limit_unit_multiplier,
high_control_limit_unit_symbol, max_operating_power_limit_value,
max_operating_power_unit_multiplier, max_operating_power_unit_symbol, control_source, unit_type,
equipment_container_id)
- VALUES (1001,'5587897', 22, 'KILO', 'W',222,'KILO','W','IS_CONTROLLABLE','PTUR',1000);
+ VALUES (1001,'5587897', 'Generating Unit 02', 22, 'KILO', 'W',222,'KILO','W','IS_CONTROLLABLE','PTUR',1000);
INSERT INTO generating_unit(
- id, mrid, high_control_limit_value, high_control_limit_unit_multiplier,
+ id, mrid, name, high_control_limit_value, high_control_limit_unit_multiplier,
high_control_limit_unit_symbol, max_operating_power_limit_value,
max_operating_power_unit_multiplier, max_operating_power_unit_symbol, control_source, unit_type,
equipment_container_id)
- VALUES (1002,'548787', 33, 'KILO', 'W',222,'KILO','W','IS_CONTROLLABLE','WIND',1002);
+ VALUES (1002,'548787', 'Generating Unit 03', 33, 'KILO', 'W',222,'KILO','W','IS_CONTROLLABLE','WIND',1002);
--###########################################################################
-- weitere Beispiele fuer Abschaltvorgang
/*
@@ -133,9 +133,9 @@ INSERT INTO synchronous_machine(id, mrid, name, synchronous_machine_kind, commun
*/
--###########################################################################
-INSERT INTO OPERATING_PARTICIPANT VALUES (1000, '1000', 'MDN-0479',100, null, null, null,1000, null);
-INSERT INTO OPERATING_PARTICIPANT VALUES (1001, '1000', 'MDN-0479',100, null, null, null,1001, null);
-INSERT INTO OPERATING_PARTICIPANT VALUES (1002, '1000', 'MDN-0479',100, null, null, null,1002, null);
+INSERT INTO OPERATING_PARTICIPANT VALUES (1000, '1001', 'MDN-04791',100, null, null, null,1000, null);
+INSERT INTO OPERATING_PARTICIPANT VALUES (1001, '1002', 'MDN-04792',100, null, null, null,1001, null);
+INSERT INTO OPERATING_PARTICIPANT VALUES (1002, '1003', 'MDN-04793',100, null, null, null,1002, null);
--INSERT INTO OPERATING_PARTICIPANT VALUES ('1000', 'MDN-0479');
--INSERT INTO OPERATING_SHARE VALUES (1000, 100, '1000', null, null, null, 1000, null);
@@ -147,13 +147,21 @@ INSERT INTO REDUCTION_SETTING VALUES (1001, 20, 1000);
INSERT INTO REDUCTION_SETTING VALUES (1002, 30, 1000);
INSERT INTO REDUCTION_SETTING VALUES (1003, 40, 1000);
INSERT INTO REDUCTION_SETTING VALUES (1004, 50, 1000);
+INSERT INTO REDUCTION_SETTING VALUES (1005, 10, 1001);
+INSERT INTO REDUCTION_SETTING VALUES (1006, 20, 1001);
+INSERT INTO REDUCTION_SETTING VALUES (1007, 30, 1001);
+INSERT INTO REDUCTION_SETTING VALUES (1008, 40, 1001);
+INSERT INTO REDUCTION_SETTING VALUES (1009, 50, 1001);
+INSERT INTO REDUCTION_SETTING VALUES (1010, 10, 1002);
+INSERT INTO REDUCTION_SETTING VALUES (1011, 30, 1002);
+INSERT INTO REDUCTION_SETTING VALUES (1012, 50, 1002);
INSERT INTO psr_event(id,mrid,psr_event_kind,timestamp_created,synchronous_machine_id)
VALUES (1000,'87999','IN_SERVICE','2015-12-10',1000);
-INSERT INTO measurement_analog VALUES (1000, '11', 'GeneratorVoltage','KILO','W',100,300, 1000,1000);
-INSERT INTO measurement_analog VALUES (1001, '22', 'GeneratorVoltage','KILO','W',22,222, 2000,1001);
-INSERT INTO measurement_analog VALUES (1002, '2233', 'GeneratorVoltage','KILO','W',33,233, 3000,1002);
+INSERT INTO measurement_analog VALUES (1000, '11', 'GeneratorVoltage','KILO','W',1000);
+INSERT INTO measurement_analog VALUES (1001, '22', 'GeneratorVoltage','KILO','W',1001);
+INSERT INTO measurement_analog VALUES (1002, '2233', 'GeneratorVoltage','KILO','W',1002);
INSERT INTO measurement_analog_value VALUES (1000, '10.04.2015 12:12:35', 11.11, false, 1000);
INSERT INTO measurement_analog_value VALUES (1001, '10.04.2015 12:12:35', 12.12, false, 1000);
@@ -260,29 +268,29 @@ INSERT INTO CONNECTIVITY_NODE VALUES (1040, '1040', 'CN41', 1009);
INSERT INTO CONNECTIVITY_NODE VALUES (1041, '1041', 'CN42', 1009);
INSERT INTO TERMINAL VALUES (1000, '1000', 'T01', 'TRUE', 1000, null, null, null, 1000, null);
-INSERT INTO TERMINAL VALUES (1001, '1002', 'T02', 'TRUE', 1000, null, null, 1000, null, null);
-INSERT INTO TERMINAL VALUES (1002, '1003', 'T03', 'TRUE', 1001, null, null, null, 1001, null);
-INSERT INTO TERMINAL VALUES (1003, '1004', 'T04', 'TRUE', 1001, null, null, 1001, null, null);
-INSERT INTO TERMINAL VALUES (1004, '1005', 'T05', 'TRUE', 1002, null, null, 1000, null, null);
-INSERT INTO TERMINAL VALUES (1005, '1006', 'T06', 'TRUE', 1002, null, null, null, null, 1000);
-INSERT INTO TERMINAL VALUES (1006, '1007', 'T07', 'TRUE', 1003, null, null, 1001, null, null);
-INSERT INTO TERMINAL VALUES (1007, '1008', 'T08', 'TRUE', 1003, null, null, null, null, 1000);
-INSERT INTO TERMINAL VALUES (1008, '1009', 'T09', 'TRUE', 1004, null, null, null, null, 1000);
-INSERT INTO TERMINAL VALUES (1009, '1010', 'T10', 'TRUE', 1004, null, null, 1002, null, null);
-INSERT INTO TERMINAL VALUES (1010, '1011', 'T11', 'TRUE', 1005, null, null, 1002, null, null);
-INSERT INTO TERMINAL VALUES (1011, '1012', 'T12', 'TRUE', 1005, null, null, 1004, null, null);
-INSERT INTO TERMINAL VALUES (1012, '1013', 'T13', 'TRUE', 1005, null, null, 1003, null, null);
-INSERT INTO TERMINAL VALUES (1013, '1014', 'T14', 'TRUE', 1006, null, null, 1003, null, null);
-INSERT INTO TERMINAL VALUES (1014, '1015', 'T15', 'TRUE', 1006, 1000, null, null, null, null);
-INSERT INTO TERMINAL VALUES (1015, '1016', 'T16', 'TRUE', 1007, null, null, 1004, null, null);
-INSERT INTO TERMINAL VALUES (1016, '1017', 'T17', 'TRUE', 1007, null, null, null, null, 1001);
-INSERT INTO TERMINAL VALUES (1017, '1018', 'T18', 'TRUE', 1008, null, null, null, null, 1001);
-INSERT INTO TERMINAL VALUES (1018, '1019', 'T19', 'TRUE', 1008, null, null, 1005, null, null);
-INSERT INTO TERMINAL VALUES (1019, '1020', 'T20', 'TRUE', 1011, null, null, 1008, null, null);
-INSERT INTO TERMINAL VALUES (1020, '1021', 'T21', 'TRUE', 1009, null, null, 1008, null, null);
-INSERT INTO TERMINAL VALUES (1021, '1022', 'T22', 'TRUE', 1009, 1001, null, null, null, null);
-INSERT INTO TERMINAL VALUES (1022, '1023', 'T23', 'TRUE', 1011, null, null, 1009, null, null);
-INSERT INTO TERMINAL VALUES (1023, '1024', 'T24', 'TRUE', 1010, null, null, 1009, null, null);
+INSERT INTO TERMINAL VALUES (1001, '1001', 'T02', 'TRUE', 1000, null, null, 1000, null, null);
+INSERT INTO TERMINAL VALUES (1002, '1002', 'T03', 'TRUE', 1001, null, null, null, 1001, null);
+INSERT INTO TERMINAL VALUES (1003, '1003', 'T04', 'TRUE', 1001, null, null, 1001, null, null);
+INSERT INTO TERMINAL VALUES (1004, '1004', 'T05', 'TRUE', 1002, null, null, 1000, null, null);
+INSERT INTO TERMINAL VALUES (1005, '1005', 'T06', 'TRUE', 1002, null, null, null, null, 1000);
+INSERT INTO TERMINAL VALUES (1006, '1006', 'T07', 'TRUE', 1003, null, null, 1001, null, null);
+INSERT INTO TERMINAL VALUES (1007, '1007', 'T08', 'TRUE', 1003, null, null, null, null, 1000);
+INSERT INTO TERMINAL VALUES (1008, '1008', 'T09', 'TRUE', 1004, null, null, null, null, 1000);
+INSERT INTO TERMINAL VALUES (1009, '1009', 'T10', 'TRUE', 1004, null, null, 1002, null, null);
+INSERT INTO TERMINAL VALUES (1010, '1010', 'T11', 'TRUE', 1005, null, null, 1002, null, null);
+INSERT INTO TERMINAL VALUES (1011, '1011', 'T12', 'TRUE', 1005, null, null, 1004, null, null);
+INSERT INTO TERMINAL VALUES (1012, '1012', 'T13', 'TRUE', 1005, null, null, 1003, null, null);
+INSERT INTO TERMINAL VALUES (1013, '1013', 'T14', 'TRUE', 1006, null, null, 1003, null, null);
+INSERT INTO TERMINAL VALUES (1014, '1014', 'T15', 'TRUE', 1006, 1000, null, null, null, null);
+INSERT INTO TERMINAL VALUES (1015, '1015', 'T16', 'TRUE', 1007, null, null, 1004, null, null);
+INSERT INTO TERMINAL VALUES (1016, '1016', 'T17', 'TRUE', 1007, null, null, null, null, 1001);
+INSERT INTO TERMINAL VALUES (1017, '1017', 'T18', 'TRUE', 1008, null, null, null, null, 1001);
+INSERT INTO TERMINAL VALUES (1018, '1018', 'T19', 'TRUE', 1008, null, null, 1005, null, null);
+INSERT INTO TERMINAL VALUES (1019, '1019', 'T20', 'TRUE', 1011, null, null, 1008, null, null);
+INSERT INTO TERMINAL VALUES (1020, '1020', 'T21', 'TRUE', 1009, null, null, 1008, null, null);
+INSERT INTO TERMINAL VALUES (1021, '1021', 'T22', 'TRUE', 1009, 1001, null, null, null, null);
+INSERT INTO TERMINAL VALUES (1022, '1022', 'T23', 'TRUE', 1011, null, null, 1009, null, null);
+INSERT INTO TERMINAL VALUES (1023, '1023', 'T24', 'TRUE', 1010, null, null, 1009, null, null);
INSERT INTO TERMINAL VALUES (1024, '1024', 'T25', 'TRUE', 1010, null, null, null, 1002, null);
INSERT INTO TERMINAL VALUES (1025, '1025', 'T26', 'TRUE', 1011, null, null, 1007, null, null);
INSERT INTO TERMINAL VALUES (1026, '1026', 'T27', 'TRUE', 1011, null, null, 1005, null, null);
diff --git a/openk-platform/openk-eisman-portlet/pom.xml b/openk-platform/openk-eisman-portlet/pom.xml
index cecf6a52..ddc17012 100644
--- a/openk-platform/openk-eisman-portlet/pom.xml
+++ b/openk-platform/openk-eisman-portlet/pom.xml
@@ -78,18 +78,6 @@
<groupId>com.liferay.portal</groupId>
<artifactId>portal-service</artifactId>
</dependency>
- <!--<dependency>-->
- <!--<groupId>com.liferay.portal</groupId>-->
- <!--<artifactId>util-bridges</artifactId>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>com.liferay.portal</groupId>-->
- <!--<artifactId>util-taglib</artifactId>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>com.liferay.portal</groupId>-->
- <!--<artifactId>util-java</artifactId>-->
- <!--</dependency>-->
<!-- Javax: Serlet, JSP & Portlet -->
<dependency>
<groupId>javax.servlet</groupId>
diff --git a/openk-platform/openk-eisman-portlet/src/main/java/org/eclipse/openk/eisman/adapter/rest/SubGeographicalRegionRestConsumer.java b/openk-platform/openk-eisman-portlet/src/main/java/org/eclipse/openk/eisman/adapter/rest/SubGeographicalRegionRestConsumer.java
index 593bd849..6caa58b4 100644
--- a/openk-platform/openk-eisman-portlet/src/main/java/org/eclipse/openk/eisman/adapter/rest/SubGeographicalRegionRestConsumer.java
+++ b/openk-platform/openk-eisman-portlet/src/main/java/org/eclipse/openk/eisman/adapter/rest/SubGeographicalRegionRestConsumer.java
@@ -14,7 +14,6 @@ package org.eclipse.openk.eisman.adapter.rest;
import com.liferay.portal.kernel.util.PropsUtil;
import org.eclipse.openk.eisman.model.core.SubGeographicalRegion;
-import org.eclipse.openk.eisman.model.core.Substation;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
@@ -37,9 +36,9 @@ public class SubGeographicalRegionRestConsumer {
return Arrays.asList(restTemplate.getForObject(uri, SubGeographicalRegion[].class));
}
- public List<Substation> getSubstationListOfSubGeographicalRegionList() {
- final String uri = PropsUtil.get("esb.url.base") + PropsUtil.get("esb.rest.uri.subgeographicalregion.substationlist");
- return Arrays.asList(restTemplate.getForObject(uri, Substation[].class));
- }
+// public List<Substation> getSubstationListOfSubGeographicalRegionList() {
+// final String uri = PropsUtil.get("esb.url.base") + PropsUtil.get("esb.rest.uri.subgeographicalregion.substationlist");
+// return Arrays.asList(restTemplate.getForObject(uri, Substation[].class));
+// }
}
diff --git a/openk-platform/openk-eisman-portlet/src/main/java/org/eclipse/openk/eisman/adapter/rest/SubstationRestConsumer.java b/openk-platform/openk-eisman-portlet/src/main/java/org/eclipse/openk/eisman/adapter/rest/SubstationRestConsumer.java
index 1f456402..6810a8e3 100644
--- a/openk-platform/openk-eisman-portlet/src/main/java/org/eclipse/openk/eisman/adapter/rest/SubstationRestConsumer.java
+++ b/openk-platform/openk-eisman-portlet/src/main/java/org/eclipse/openk/eisman/adapter/rest/SubstationRestConsumer.java
@@ -47,7 +47,7 @@ public class SubstationRestConsumer {
final String uri = PropsUtil.get("esb.url.base")
+ PropsUtil.get("esb.rest.uri.substation.mrid")
+ "/" + mRid
- + PropsUtil.get("esb.rest.substationlist");
+ + PropsUtil.get("esb.rest.synchronousmachinelist");
//+ synchronousMachine.getName();
return Arrays.asList(restTemplate.getForObject(uri, SynchronousMachine[].class));
}
diff --git a/openk-platform/openk-interfaces/src/main/java/org/eclipse/openk/model/cim/meas/Analog.java b/openk-platform/openk-interfaces/src/main/java/org/eclipse/openk/model/cim/meas/Analog.java
index f242d8dd..d74e3071 100644
--- a/openk-platform/openk-interfaces/src/main/java/org/eclipse/openk/model/cim/meas/Analog.java
+++ b/openk-platform/openk-interfaces/src/main/java/org/eclipse/openk/model/cim/meas/Analog.java
@@ -21,16 +21,16 @@ public class Analog extends Measurement {
* Normal value range maximum for any of the MeasurementValue.values. Used for
* scaling, e.g. in bar graphs or of telemetered raw values.
*/
- public Float maxValue;
+// public Float maxValue;
/**
* Normal value range minimum for any of the MeasurementValue.values. Used for
* scaling, e.g. in bar graphs or of telemetered raw values
*/
- public Float minValue;
+// public Float minValue;
/**
* Normal measurement value, e.g., used for percentage calculations.
*/
- public Float normalValue;
+// public Float normalValue;
/**
* If true then this measurement is an active power, reactive power or current
* with the convention that a positive value measured at the Terminal means power
diff --git a/openk-platform/openk-interfaces/uml-diagram/cim-modell.uml b/openk-platform/openk-interfaces/uml-diagram/cim-modell.uml
index 367fd190..49a369d5 100644
--- a/openk-platform/openk-interfaces/uml-diagram/cim-modell.uml
+++ b/openk-platform/openk-interfaces/uml-diagram/cim-modell.uml
@@ -3,99 +3,99 @@
<ID>JAVA</ID>
<OriginalElement>org.eclipse.openk.model.cim.core</OriginalElement>
<nodes>
- <node x="323.3000000000002" y="311.0">org.eclipse.openk.model.cim.common.TownDetail</node>
- <node x="1153.4993055555556" y="0.0">org.eclipse.openk.model.cim.core.IdentifiedObject</node>
- <node x="930.9809027777775" y="668.0">org.eclipse.openk.model.cim.marketcommon.RegisteredResource</node>
- <node x="602.3000000000002" y="176.0">org.eclipse.openk.model.cim.meas.MeasurementValue</node>
- <node x="1927.0642361111109" y="894.0">org.eclipse.openk.model.cim.wires.Switch</node>
- <node x="2239.564236111111" y="657.0">org.eclipse.openk.model.cim.core.ConnectivityNodeContainer</node>
- <node x="2186.064236111111" y="894.0">org.eclipse.openk.model.cim.core.VoltageLevel</node>
- <node x="663.3000000000002" y="322.0">org.eclipse.openk.model.cim.meas.AnalogValue</node>
- <node x="2364.064236111111" y="479.0">org.eclipse.openk.model.cim.core.ConnectivityNode</node>
- <node x="2220.064236111111" y="792.0">org.eclipse.openk.model.cim.core.EquipmentContainer</node>
- <node x="1223.755439814815" y="657.0">org.eclipse.openk.model.cim.core.Equipment</node>
- <node x="1814.5833333333335" y="187.0">org.eclipse.openk.model.cim.core.ACDCTerminal</node>
- <node x="922.9809027777775" y="792.0">org.eclipse.openk.model.cim.marketoperations.referencedata.RegisteredGenerator</node>
- <node x="85.86203703703677" y="624.0">org.eclipse.openk.model.cim.common.Location</node>
- <node x="670.5500000000002" y="446.0">org.eclipse.openk.model.cim.meas.Analog</node>
- <node x="997.3000000000002" y="187.0">org.eclipse.openk.model.cim.common.ActivityRecord</node>
- <node x="401.5500000000002" y="446.0">org.eclipse.openk.model.cim.common.PositionPoint</node>
- <node x="795.3000000000002" y="300.0">org.eclipse.openk.model.cim.meas.Measurement</node>
- <node x="1775.0642361111109" y="905.0">org.eclipse.openk.model.cim.wires.PowerTransformer</node>
- <node x="1324.7493055555556" y="322.0">org.eclipse.openk.model.cim.core.OperatingShare</node>
- <node x="1655.5642361111109" y="1007.0">org.eclipse.openk.model.cim.wires.BusbarSection</node>
- <node x="2211.564236111111" y="996.0">org.eclipse.openk.model.cim.core.Substation</node>
- <node x="1321.3142361111109" y="1098.0">org.eclipse.openk.model.cim.wires.SynchronousMachine</node>
- <node x="1398.7493055555556" y="479.0">org.eclipse.openk.model.cim.core.OperatingParticipant</node>
- <node x="184.55000000000018" y="468.0">org.eclipse.openk.model.cim.common.StreetAddress</node>
- <node x="939.3142361111109" y="1219.0">org.eclipse.openk.model.cim.production.GeneratingUnit</node>
- <node x="36.55000000000018" y="479.0">org.eclipse.openk.model.cim.common.ElectronicAddress</node>
- <node x="977.1120370370367" y="457.0">org.eclipse.openk.model.cim.core.PowerSystemResource</node>
- <node x="2075.064236111111" y="905.0">org.eclipse.openk.model.cim.wires.Conductor</node>
- <node x="1043.3000000000002" y="322.0">org.eclipse.openk.model.cim.informative.infoperations.PSREvent</node>
- <node x="1464.0642361111109" y="894.0">org.eclipse.openk.model.cim.wires.RegulatingCondEq</node>
- <node x="164.30000000000018" y="311.0">org.eclipse.openk.model.cim.common.StreetDetail</node>
- <node x="2062.064236111111" y="1007.0">org.eclipse.openk.model.cim.wires.AcLineSegment</node>
- <node x="1852.5833333333335" y="333.0">org.eclipse.openk.model.cim.core.Terminal</node>
- <node x="2345.939236111111" y="1263.0">org.eclipse.openk.model.cim.core.SubGeographicalRegion</node>
- <node x="1492.0642361111109" y="1007.0">org.eclipse.openk.model.cim.wires.RotatingMachine</node>
- <node x="1718.3333333333335" y="792.0">org.eclipse.openk.model.cim.core.ConductingEquipment</node>
- <node x="1665.0642361111109" y="905.0">org.eclipse.openk.model.cim.wires.Connector</node>
- <node x="1013.3804398148148" y="1530.0">org.eclipse.openk.model.cim.core.GeographicalRegion</node>
+ <node x="180.5" y="311.0">org.eclipse.openk.model.cim.common.TownDetail</node>
+ <node x="1273.1773148148145" y="0.0">org.eclipse.openk.model.cim.core.IdentifiedObject</node>
+ <node x="1022.375" y="658.0">org.eclipse.openk.model.cim.marketcommon.RegisteredResource</node>
+ <node x="1502.4273148148145" y="176.0">org.eclipse.openk.model.cim.meas.MeasurementValue</node>
+ <node x="1316.1524305555554" y="884.0">org.eclipse.openk.model.cim.wires.Switch</node>
+ <node x="2139.260648148148" y="647.0">org.eclipse.openk.model.cim.core.ConnectivityNodeContainer</node>
+ <node x="2190.760648148148" y="884.0">org.eclipse.openk.model.cim.core.VoltageLevel</node>
+ <node x="1563.4273148148145" y="322.0">org.eclipse.openk.model.cim.meas.AnalogValue</node>
+ <node x="2119.760648148148" y="782.0">org.eclipse.openk.model.cim.core.EquipmentContainer</node>
+ <node x="2263.760648148148" y="479.0">org.eclipse.openk.model.cim.core.ConnectivityNode</node>
+ <node x="1179.375" y="647.0">org.eclipse.openk.model.cim.core.Equipment</node>
+ <node x="1768.010648148148" y="187.0">org.eclipse.openk.model.cim.core.ACDCTerminal</node>
+ <node x="1014.375" y="782.0">org.eclipse.openk.model.cim.marketoperations.referencedata.RegisteredGenerator</node>
+ <node x="237.02777777777806" y="614.0">org.eclipse.openk.model.cim.common.Location</node>
+ <node x="1455.4273148148145" y="446.0">org.eclipse.openk.model.cim.meas.Analog</node>
+ <node x="1002.0274305555555" y="187.0">org.eclipse.openk.model.cim.common.ActivityRecord</node>
+ <node x="289.1776620370372" y="446.0">org.eclipse.openk.model.cim.common.PositionPoint</node>
+ <node x="1315.4273148148145" y="300.0">org.eclipse.openk.model.cim.meas.Measurement</node>
+ <node x="1706.260648148148" y="895.0">org.eclipse.openk.model.cim.wires.PowerTransformer</node>
+ <node x="869.0274305555555" y="322.0">org.eclipse.openk.model.cim.core.OperatingShare</node>
+ <node x="1982.260648148148" y="997.0">org.eclipse.openk.model.cim.wires.BusbarSection</node>
+ <node x="2111.260648148148" y="986.0">org.eclipse.openk.model.cim.core.Substation</node>
+ <node x="1422.510648148148" y="1088.0">org.eclipse.openk.model.cim.wires.SynchronousMachine</node>
+ <node x="706.1776620370372" y="479.0">org.eclipse.openk.model.cim.core.OperatingParticipant</node>
+ <node x="72.17766203703718" y="468.0">org.eclipse.openk.model.cim.common.StreetAddress</node>
+ <node x="1021.0" y="1143.0">org.eclipse.openk.model.cim.production.GeneratingUnit</node>
+ <node x="558.1776620370372" y="479.0">org.eclipse.openk.model.cim.common.ElectronicAddress</node>
+ <node x="1032.5800925925926" y="457.0">org.eclipse.openk.model.cim.core.PowerSystemResource</node>
+ <node x="1858.260648148148" y="895.0">org.eclipse.openk.model.cim.wires.Conductor</node>
+ <node x="1048.0274305555554" y="322.0">org.eclipse.openk.model.cim.informative.infoperations.PSREvent</node>
+ <node x="1505.260648148148" y="884.0">org.eclipse.openk.model.cim.wires.RegulatingCondEq</node>
+ <node x="21.5" y="311.0">org.eclipse.openk.model.cim.common.StreetDetail</node>
+ <node x="1845.260648148148" y="997.0">org.eclipse.openk.model.cim.wires.AcLineSegment</node>
+ <node x="1806.010648148148" y="333.0">org.eclipse.openk.model.cim.core.Terminal</node>
+ <node x="2272.6524305555554" y="1187.0">org.eclipse.openk.model.cim.core.SubGeographicalRegion</node>
+ <node x="1671.760648148148" y="782.0">org.eclipse.openk.model.cim.core.ConductingEquipment</node>
+ <node x="1533.260648148148" y="997.0">org.eclipse.openk.model.cim.wires.RotatingMachine</node>
+ <node x="1991.760648148148" y="895.0">org.eclipse.openk.model.cim.wires.Connector</node>
+ <node x="1013.5300925925926" y="1388.0">org.eclipse.openk.model.cim.core.GeographicalRegion</node>
</nodes>
<notes />
<edges>
<edge source="org.eclipse.openk.model.cim.common.Location" target="org.eclipse.openk.model.cim.core.PowerSystemResource">
<point x="122.39999999999998" y="-59.0" />
- <point x="361.26203703703675" y="594.0" />
- <point x="1014.1120370370367" y="594.0" />
+ <point x="512.427777777778" y="594.0" />
+ <point x="1069.5800925925926" y="594.0" />
<point x="-111.0" y="48.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.core.ConnectivityNode" target="org.eclipse.openk.model.cim.core.Terminal">
<point x="-50.25" y="-26.0" />
- <point x="2414.314236111111" y="426.0" />
- <point x="1913.3333333333335" y="426.0" />
+ <point x="2314.010648148148" y="421.0" />
+ <point x="1866.760648148148" y="421.0" />
<point x="20.25" y="15.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.core.ConductingEquipment" target="org.eclipse.openk.model.cim.core.Terminal">
<point x="50.25" y="-26.0" />
- <point x="1869.0833333333335" y="772.0" />
- <point x="1872.8333333333335" y="772.0" />
+ <point x="1822.510648148148" y="762.0" />
+ <point x="1826.260648148148" y="762.0" />
<point x="-20.25" y="15.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.core.VoltageLevel" target="org.eclipse.openk.model.cim.core.EquipmentContainer">
<point x="0.0" y="-26.0" />
- <point x="2280.564236111111" y="874.0" />
- <point x="2276.564236111111" y="874.0" />
- <point x="-56.5" y="26.0" />
+ <point x="2285.260648148148" y="864.0" />
+ <point x="2289.260648148148" y="864.0" />
+ <point x="56.5" y="26.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.core.PowerSystemResource" target="org.eclipse.openk.model.cim.meas.Measurement">
- <point x="-111.0" y="-48.0" />
- <point x="1014.1120370370367" y="426.0" />
- <point x="966.3000000000002" y="426.0" />
- <point x="57.0" y="48.0" />
+ <point x="111.0" y="-48.0" />
+ <point x="1291.5800925925926" y="421.0" />
+ <point x="1372.4273148148145" y="421.0" />
+ <point x="-57.0" y="48.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.core.GeographicalRegion" target="org.eclipse.openk.model.cim.core.SubGeographicalRegion">
<point x="90.75" y="-26.0" />
- <point x="1285.630439814815" y="1505.0" />
- <point x="2456.439236111111" y="1505.0" />
+ <point x="1285.7800925925926" y="1363.0" />
+ <point x="2383.1524305555554" y="1363.0" />
<point x="0.0" y="26.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.core.SubGeographicalRegion" target="org.eclipse.openk.model.cim.core.IdentifiedObject">
<point x="55.25" y="-26.0" />
- <point x="2511.689236111111" y="1073.0" />
- <point x="2575.564236111111" y="1073.0" />
- <point x="2575.564236111111" y="126.0" />
- <point x="1332.0993055555557" y="126.0" />
+ <point x="2438.4024305555554" y="1063.0" />
+ <point x="2475.260648148148" y="1063.0" />
+ <point x="2475.260648148148" y="116.0" />
+ <point x="1451.7773148148146" y="116.0" />
<point x="84.60000000000014" y="48.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.core.Substation" target="org.eclipse.openk.model.cim.core.EquipmentContainer">
- <point x="60.75" y="-26.0" />
- <point x="2393.814236111111" y="971.0" />
- <point x="2385.564236111111" y="971.0" />
- <point x="2385.564236111111" y="874.0" />
- <point x="2389.564236111111" y="874.0" />
- <point x="56.5" y="26.0" />
+ <point x="-60.75" y="-26.0" />
+ <point x="2172.010648148148" y="961.0" />
+ <point x="2180.260648148148" y="961.0" />
+ <point x="2180.260648148148" y="864.0" />
+ <point x="2176.260648148148" y="864.0" />
+ <point x="-56.5" y="26.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.wires.BusbarSection" target="org.eclipse.openk.model.cim.wires.Connector">
<point x="0.0" y="-15.0" />
@@ -103,44 +103,42 @@
</edge>
<edge source="org.eclipse.openk.model.cim.meas.MeasurementValue" target="org.eclipse.openk.model.cim.core.IdentifiedObject">
<point x="0.0" y="-37.0" />
- <point x="719.3000000000002" y="136.0" />
- <point x="1200.4993055555556" y="136.0" />
- <point x="-47.0" y="48.0" />
+ <point x="1619.4273148148145" y="146.0" />
+ <point x="1395.3773148148146" y="146.0" />
+ <point x="28.200000000000045" y="48.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.core.OperatingParticipant" target="org.eclipse.openk.model.cim.core.OperatingShare">
- <point x="-68.0" y="-26.0" />
- <point x="1466.7493055555556" y="426.0" />
- <point x="1443.9993055555556" y="426.0" />
- <point x="39.75" y="26.0" />
+ <point x="68.0" y="-26.0" />
+ <point x="910.1776620370372" y="421.0" />
+ <point x="908.7774305555555" y="421.0" />
+ <point x="-39.75" y="26.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.wires.RegulatingCondEq" target="org.eclipse.openk.model.cim.core.ConductingEquipment">
<point x="0.0" y="-26.0" />
- <point x="1554.5642361111109" y="864.0" />
- <point x="1738.4333333333334" y="864.0" />
- <point x="-80.40000000000009" y="26.0" />
+ <point x="1595.760648148148" y="864.0" />
+ <point x="1732.060648148148" y="864.0" />
+ <point x="-40.200000000000045" y="26.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.wires.PowerTransformer" target="org.eclipse.openk.model.cim.core.ConductingEquipment">
<point x="0.0" y="-15.0" />
- <point x="1841.0642361111109" y="874.0" />
- <point x="1818.8333333333335" y="874.0" />
<point x="0.0" y="26.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.core.OperatingParticipant" target="org.eclipse.openk.model.cim.core.IdentifiedObject">
- <point x="68.0" y="-26.0" />
- <point x="1602.7493055555556" y="426.0" />
- <point x="1559.8743055555556" y="426.0" />
- <point x="1559.8743055555556" y="156.0" />
- <point x="1275.6993055555556" y="156.0" />
- <point x="28.200000000000045" y="48.0" />
+ <point x="-68.0" y="-26.0" />
+ <point x="774.1776620370372" y="421.0" />
+ <point x="813.0800925925927" y="421.0" />
+ <point x="813.0800925925927" y="136.0" />
+ <point x="1320.1773148148145" y="136.0" />
+ <point x="-47.0" y="48.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.wires.SynchronousMachine" target="org.eclipse.openk.model.cim.wires.RotatingMachine">
- <point x="0.0" y="-191.0" />
+ <point x="0.0" y="-125.0" />
<point x="31.25" y="15.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.core.EquipmentContainer" target="org.eclipse.openk.model.cim.core.Equipment">
<point x="-56.5" y="-26.0" />
- <point x="2276.564236111111" y="762.0" />
- <point x="1386.255439814815" y="762.0" />
+ <point x="2176.260648148148" y="752.0" />
+ <point x="1341.875" y="752.0" />
<point x="65.0" y="26.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.marketoperations.referencedata.RegisteredGenerator" target="org.eclipse.openk.model.cim.marketcommon.RegisteredResource">
@@ -148,53 +146,55 @@
<point x="0.0" y="15.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.meas.Analog" target="org.eclipse.openk.model.cim.meas.Measurement">
- <point x="48.75" y="-59.0" />
- <point x="816.8000000000002" y="426.0" />
- <point x="852.3000000000002" y="426.0" />
- <point x="-57.0" y="48.0" />
+ <point x="-48.75" y="-59.0" />
+ <point x="1504.1773148148145" y="421.0" />
+ <point x="1486.4273148148145" y="421.0" />
+ <point x="57.0" y="48.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.core.PowerSystemResource" target="org.eclipse.openk.model.cim.core.IdentifiedObject">
<point x="37.0" y="-48.0" />
- <point x="1162.1120370370368" y="416.0" />
- <point x="1253.8000000000002" y="416.0" />
- <point x="1253.8000000000002" y="156.0" />
- <point x="1256.8993055555557" y="156.0" />
- <point x="9.400000000000091" y="48.0" />
+ <point x="1217.5800925925926" y="421.0" />
+ <point x="1258.5274305555554" y="421.0" />
+ <point x="1258.5274305555554" y="156.0" />
+ <point x="1357.7773148148144" y="156.0" />
+ <point x="-9.400000000000091" y="48.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.core.GeographicalRegion" target="org.eclipse.openk.model.cim.core.IdentifiedObject">
<point x="-90.75" y="-26.0" />
- <point x="1104.130439814815" y="1505.0" />
- <point x="0.0" y="1505.0" />
+ <point x="1104.2800925925926" y="1363.0" />
+ <point x="0.0" y="1363.0" />
<point x="0.0" y="116.0" />
- <point x="1162.8993055555557" y="116.0" />
+ <point x="1282.5773148148146" y="116.0" />
<point x="-84.59999999999991" y="48.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.marketcommon.RegisteredResource" target="org.eclipse.openk.model.cim.core.PowerSystemResource">
<point x="0.0" y="-15.0" />
- <point x="999.4809027777775" y="604.0" />
- <point x="1088.1120370370368" y="604.0" />
+ <point x="1090.875" y="594.0" />
+ <point x="1143.5800925925926" y="594.0" />
<point x="-37.0" y="48.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.wires.Connector" target="org.eclipse.openk.model.cim.core.ConductingEquipment">
<point x="0.0" y="-15.0" />
- <point x="1710.0642361111109" y="874.0" />
- <point x="1778.6333333333337" y="874.0" />
- <point x="-40.200000000000045" y="26.0" />
+ <point x="2036.760648148148" y="854.0" />
+ <point x="1852.660648148148" y="854.0" />
+ <point x="80.40000000000009" y="26.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.wires.Conductor" target="org.eclipse.openk.model.cim.core.ConductingEquipment">
<point x="0.0" y="-15.0" />
- <point x="2120.564236111111" y="864.0" />
- <point x="1899.2333333333336" y="864.0" />
- <point x="80.39999999999986" y="26.0" />
+ <point x="1903.760648148148" y="864.0" />
+ <point x="1812.460648148148" y="864.0" />
+ <point x="40.200000000000045" y="26.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.wires.Switch" target="org.eclipse.openk.model.cim.core.ConductingEquipment">
<point x="0.0" y="-26.0" />
- <point x="1991.0642361111109" y="874.0" />
- <point x="1859.0333333333338" y="874.0" />
- <point x="40.200000000000045" y="26.0" />
+ <point x="1380.1524305555554" y="854.0" />
+ <point x="1691.860648148148" y="854.0" />
+ <point x="-80.40000000000009" y="26.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.common.StreetAddress" target="org.eclipse.openk.model.cim.common.StreetDetail">
<point x="-49.25" y="-37.0" />
+ <point x="121.42766203703718" y="421.0" />
+ <point x="91.0" y="421.0" />
<point x="0.0" y="37.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.meas.AnalogValue" target="org.eclipse.openk.model.cim.meas.MeasurementValue">
@@ -202,67 +202,71 @@
<point x="0.0" y="37.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.common.Location" target="org.eclipse.openk.model.cim.common.PositionPoint">
- <point x="61.200000000000045" y="-59.0" />
- <point x="300.0620370370368" y="584.0" />
- <point x="526.0500000000002" y="584.0" />
+ <point x="0.0" y="-59.0" />
+ <point x="390.02777777777806" y="594.0" />
+ <point x="413.6776620370372" y="594.0" />
<point x="0.0" y="59.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.core.PowerSystemResource" target="org.eclipse.openk.model.cim.informative.infoperations.PSREvent">
<point x="-37.0" y="-48.0" />
- <point x="1088.1120370370368" y="426.0" />
- <point x="1120.3000000000002" y="426.0" />
+ <point x="1143.5800925925926" y="421.0" />
+ <point x="1125.0274305555554" y="421.0" />
<point x="0.0" y="26.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.core.PowerSystemResource" target="org.eclipse.openk.model.cim.core.OperatingShare">
- <point x="111.0" y="-48.0" />
- <point x="1236.1120370370368" y="426.0" />
- <point x="1364.4993055555556" y="426.0" />
- <point x="-39.75" y="26.0" />
+ <point x="-111.0" y="-48.0" />
+ <point x="1069.5800925925926" y="421.0" />
+ <point x="988.2774305555555" y="421.0" />
+ <point x="39.75" y="26.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.core.ConnectivityNode" target="org.eclipse.openk.model.cim.core.IdentifiedObject">
<point x="50.25" y="-26.0" />
- <point x="2514.814236111111" y="136.0" />
- <point x="1313.2993055555555" y="136.0" />
- <point x="65.79999999999995" y="48.0" />
+ <point x="2414.510648148148" y="126.0" />
+ <point x="1432.9773148148147" y="126.0" />
+ <point x="65.80000000000018" y="48.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.meas.Analog" target="org.eclipse.openk.model.cim.meas.AnalogValue">
- <point x="-48.75" y="-59.0" />
+ <point x="48.75" y="-59.0" />
+ <point x="1601.6773148148145" y="421.0" />
+ <point x="1619.4273148148145" y="421.0" />
<point x="0.0" y="26.0" />
</edge>
- <edge source="org.eclipse.openk.model.cim.core.Substation" target="org.eclipse.openk.model.cim.core.VoltageLevel">
- <point x="-60.75" y="-26.0" />
- <point x="2272.314236111111" y="971.0" />
- <point x="2280.564236111111" y="971.0" />
+ <edge source="org.eclipse.openk.model.cim.core.ConnectivityNodeContainer" target="org.eclipse.openk.model.cim.core.ConnectivityNode">
+ <point x="75.0" y="-26.0" />
<point x="0.0" y="26.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.wires.AcLineSegment" target="org.eclipse.openk.model.cim.wires.Conductor">
<point x="0.0" y="-15.0" />
<point x="0.0" y="15.0" />
</edge>
- <edge source="org.eclipse.openk.model.cim.core.ConnectivityNodeContainer" target="org.eclipse.openk.model.cim.core.ConnectivityNode">
- <point x="75.0" y="-26.0" />
+ <edge source="org.eclipse.openk.model.cim.core.Substation" target="org.eclipse.openk.model.cim.core.VoltageLevel">
+ <point x="60.75" y="-26.0" />
+ <point x="2293.510648148148" y="961.0" />
+ <point x="2285.260648148148" y="961.0" />
<point x="0.0" y="26.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.production.GeneratingUnit" target="org.eclipse.openk.model.cim.wires.RotatingMachine">
<point x="120.66666666666674" y="-70.0" />
- <point x="1240.9809027777776" y="1073.0" />
- <point x="1523.3142361111109" y="1073.0" />
+ <point x="1322.6666666666667" y="1063.0" />
+ <point x="1564.510648148148" y="1063.0" />
<point x="-31.25" y="15.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.core.Equipment" target="org.eclipse.openk.model.cim.core.PowerSystemResource">
<point x="0.0" y="-26.0" />
- <point x="1321.255439814815" y="604.0" />
- <point x="1162.1120370370368" y="604.0" />
+ <point x="1276.875" y="594.0" />
+ <point x="1217.5800925925926" y="594.0" />
<point x="37.0" y="48.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.core.ACDCTerminal" target="org.eclipse.openk.model.cim.core.IdentifiedObject">
<point x="0.0" y="-26.0" />
- <point x="1893.0833333333335" y="146.0" />
- <point x="1294.4993055555556" y="146.0" />
+ <point x="1846.510648148148" y="136.0" />
+ <point x="1414.1773148148145" y="136.0" />
<point x="47.0" y="48.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.production.GeneratingUnit" target="org.eclipse.openk.model.cim.marketoperations.referencedata.RegisteredGenerator">
<point x="-120.66666666666674" y="-70.0" />
+ <point x="1081.3333333333333" y="1063.0" />
+ <point x="1090.875" y="1063.0" />
<point x="0.0" y="26.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.wires.RotatingMachine" target="org.eclipse.openk.model.cim.wires.RegulatingCondEq">
@@ -271,8 +275,8 @@
</edge>
<edge source="org.eclipse.openk.model.cim.core.SubGeographicalRegion" target="org.eclipse.openk.model.cim.core.Substation">
<point x="-55.25" y="-26.0" />
- <point x="2401.189236111111" y="1073.0" />
- <point x="2333.064236111111" y="1073.0" />
+ <point x="2327.9024305555554" y="1063.0" />
+ <point x="2232.760648148148" y="1063.0" />
<point x="0.0" y="26.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.core.EquipmentContainer" target="org.eclipse.openk.model.cim.core.ConnectivityNodeContainer">
@@ -281,20 +285,20 @@
</edge>
<edge source="org.eclipse.openk.model.cim.meas.Measurement" target="org.eclipse.openk.model.cim.core.IdentifiedObject">
<point x="0.0" y="-48.0" />
- <point x="909.3000000000002" y="146.0" />
- <point x="1219.2993055555555" y="146.0" />
- <point x="-28.200000000000045" y="48.0" />
+ <point x="1429.4273148148145" y="156.0" />
+ <point x="1376.5773148148146" y="156.0" />
+ <point x="9.400000000000091" y="48.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.common.StreetAddress" target="org.eclipse.openk.model.cim.common.TownDetail">
<point x="49.25" y="-37.0" />
- <point x="332.3000000000002" y="426.0" />
- <point x="398.3000000000002" y="426.0" />
+ <point x="219.92766203703718" y="421.0" />
+ <point x="255.5" y="421.0" />
<point x="0.0" y="37.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.common.Location" target="org.eclipse.openk.model.cim.common.ElectronicAddress">
- <point x="-61.19999999999993" y="-59.0" />
- <point x="177.66203703703695" y="594.0" />
- <point x="100.55000000000018" y="594.0" />
+ <point x="61.200000000000045" y="-59.0" />
+ <point x="451.2277777777781" y="584.0" />
+ <point x="622.1776620370372" y="584.0" />
<point x="0.0" y="26.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.informative.infoperations.PSREvent" target="org.eclipse.openk.model.cim.common.ActivityRecord">
@@ -302,23 +306,23 @@
<point x="0.0" y="26.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.common.Location" target="org.eclipse.openk.model.cim.common.StreetAddress">
- <point x="0.0" y="-59.0" />
- <point x="238.86203703703677" y="604.0" />
- <point x="283.0500000000002" y="604.0" />
+ <point x="-61.19999999999993" y="-59.0" />
+ <point x="328.8277777777781" y="584.0" />
+ <point x="170.67766203703718" y="584.0" />
<point x="0.0" y="37.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.common.Location" target="org.eclipse.openk.model.cim.core.IdentifiedObject">
<point x="-122.40000000000009" y="-59.0" />
- <point x="116.46203703703668" y="604.0" />
- <point x="26.050000000000182" y="604.0" />
- <point x="26.050000000000182" y="126.0" />
- <point x="1181.6993055555556" y="126.0" />
+ <point x="267.62777777777796" y="594.0" />
+ <point x="11.0" y="594.0" />
+ <point x="11.0" y="126.0" />
+ <point x="1301.3773148148146" y="126.0" />
<point x="-65.79999999999995" y="48.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.core.ConnectivityNodeContainer" target="org.eclipse.openk.model.cim.core.PowerSystemResource">
<point x="-75.0" y="-26.0" />
- <point x="2314.564236111111" y="594.0" />
- <point x="1236.1120370370368" y="594.0" />
+ <point x="2214.260648148148" y="594.0" />
+ <point x="1291.5800925925926" y="594.0" />
<point x="111.0" y="48.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.core.Terminal" target="org.eclipse.openk.model.cim.core.ACDCTerminal">
@@ -327,26 +331,24 @@
</edge>
<edge source="org.eclipse.openk.model.cim.core.ConductingEquipment" target="org.eclipse.openk.model.cim.core.Equipment">
<point x="-50.25" y="-26.0" />
- <point x="1768.5833333333335" y="772.0" />
- <point x="1321.255439814815" y="772.0" />
+ <point x="1722.010648148148" y="762.0" />
+ <point x="1276.875" y="762.0" />
<point x="0.0" y="26.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.production.GeneratingUnit" target="org.eclipse.openk.model.cim.core.Equipment">
<point x="0.0" y="-70.0" />
- <point x="1120.3142361111109" y="1073.0" />
- <point x="1103.4809027777774" y="1073.0" />
- <point x="1103.4809027777774" y="772.0" />
- <point x="1256.255439814815" y="772.0" />
+ <point x="1202.0" y="762.0" />
+ <point x="1211.875" y="762.0" />
<point x="-65.0" y="26.0" />
</edge>
<edge source="org.eclipse.openk.model.cim.common.ActivityRecord" target="org.eclipse.openk.model.cim.core.IdentifiedObject">
<point x="0.0" y="-26.0" />
- <point x="1120.3000000000002" y="156.0" />
- <point x="1238.0993055555557" y="156.0" />
- <point x="-9.399999999999864" y="48.0" />
+ <point x="1125.0274305555554" y="146.0" />
+ <point x="1338.9773148148145" y="146.0" />
+ <point x="-28.200000000000045" y="48.0" />
</edge>
</edges>
- <settings layout="Hierarchic Group" zoom="0.5500770416024653" x="1288.0" y="791.0" />
+ <settings layout="Hierarchic Group" zoom="0.6390410958904109" x="1247.0" y="720.0" />
<SelectedNodes />
<Categories>
<Category>Fields</Category>

Back to the top