@enervance/insight-cim-model 0.0.161 → 0.0.162

package/dist/converter/integral7/converter.integral7.js

@@ -136,7 +136,7 @@ const ApparentPowerLimit_1 = require("../../model/operationallimits/ApparentPowe
 const executor_1 = require("./dl-convert/executor.js");
 const Diagram_1 = require("../../model/diagram/Diagram.js");
 const DiagramObject_1 = require("../../model/diagram/DiagramObject.js");
-const util_asset_model_1 = require("./util-asset.model.js");
+const util_cim_model_1 = require("./util-cim.model.js");
 const cim_constants_1 = require("../../constants/cim-constants.js");
 const EVWireObject_1 = require("../../model/extensions/enervance/assets/EVWireObject.js");
 class ConverterIntegral7 {
@@ -279,6 +279,7 @@ class ConverterIntegral7 {
         });
     }
     convertFrame(frame, geoRegion, objectMappingConfig, energyTypesConfig, defaultValuesConfig, energySourceTypeMappingConfig) {
+        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const integral7Modell = frame.getI7Model();
             const cimModel = frame.cimModel;
@@ -329,7 +330,7 @@ class ConverterIntegral7 {
                 logExecutionTime(this.logger, startTime, `convertLaengskupplungen()`);
             }
             /** START Integral 7 Knoten  */
-            /** Abzweigpunkte KnotenSo -> ConnectivityNode*/
+            /** Abzweigpunkte KnotenSo -> ConnectivityNode */
             startTime = perf_hooks.performance.now();
             if (standortIDs.length)
                 yield this.convertKnotenSo(frame, integral7Modell, standortIDs, defaultValuesConfig);
@@ -531,7 +532,7 @@ class ConverterIntegral7 {
             logExecutionTime(this.logger, startTime, `assignment of sequence number`);
             /** DC Model */
             /** DL Profile */
-            this.executor = new executor_1.Executor(this.mysqlController);
+            this.executor = new executor_1.Executor(this.mysqlController, this.configUuid);
             yield this.executor.mergeDataFromIntegralID2UUID(this.integralID2UUID);
             yield this.executor.mergeDataFromFrame(frame);
             yield this.executor.loadAllSchemaVariants();
@@ -581,43 +582,23 @@ class ConverterIntegral7 {
             const resultingObjects = yield this.executor.convert(convertOptions);
             for (const resultingObject of resultingObjects) {
                 if (resultingObject instanceof Diagram_1.Diagram) {
+                    // UUIDs von Diagram-Objekten werden aus I7 übernommen
                     frame.cimModel.addDiagram(resultingObject);
                 }
                 else if (resultingObject instanceof DiagramObject_1.DiagramObject) {
+                    // UUIDs gemäß UUID v5 generieren
+                    const diagramObject = resultingObject;
+                    const uuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.DiagramObject, this.configUuid, diagramObject.getIdentifiedObjectUUID());
+                    diagramObject.mrid = uuid;
+                    for (const diagramObjectPoint of diagramObject.diagramObjectPoints) {
+                        const key = uuid + String((_a = diagramObjectPoint.sequenceNumber) !== null && _a !== void 0 ? _a : 1);
+                        const pointUuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.DiagramObjectPoint, this.configUuid, key);
+                        diagramObjectPoint.mrid = pointUuid;
+                    }
                     frame.cimModel.addDiagramObject(resultingObject);
                 }
             }
-            console.log('c7666206-429d-478d-bd9e-9f1440598d99');
-            console.log('752bcf18-68fc-4df0-9913-e843a982b997');
-            // this.dlConverterI7.prepare(this.mysqlController, this.logger);
-            //
-            // const powerTransformers = cimModel.powerTransformer;
-            // const powerTransformerEnds = cimModel.powerTransformerEnds;
-            // const lines = cimModel.lines;
-            // const objects = cimModel.objects;
-            //
-            // await this.dlConverterI7.convert(this.availableTableNames, true, {
-            //     standortIDs,
-            //     schaltanlagenIDs,
-            //     schaltanlagenAbschnittIDs,
-            //     knotenSoIDs,
-            //     schaltfeldIDs,
-            //     laengskupplungIDs: integral7Modell.laengskupplungIDs,
-            //     querkupplungIDs: integral7Modell.querkupplungIDs,
-            //     integralID2UUID: this.integralID2UUID,
-            //     integralSchaltfelder: integral7Modell.integralSchaltfelder,
-            //     integralLaengskupplungen: integral7Modell.integralLaengskupplungen,
-            //     powerTransformers,
-            //     powerTransformerEnds,
-            //     integralLeitungen: integral7Modell.integralLeitungen,
-            //     integralHgueLeitungen: integral7Modell.integralHgueLeitungen,
-            //     lines,
-            //     objects
-            //   }
-            // );
-            //
-            // this.dlConverterI7.addCimObjects2Model(cimModel);
-            // this.dlConverterI7.cleanUp();
+            console.log('over');
         });
     }
     assignTerminalSequenceNumber(cimModel) {
@@ -695,6 +676,7 @@ class ConverterIntegral7 {
                         for (const i7Data of result) {
                             const i7Schluessel = integral_prefix_1.GEOREGION_PRAEFIX + (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
                             const region = new GeographicalRegion_1.GeographicalRegion((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner), '_GR']), (0, utils_2.ueberpruefeZeichenkette)(i7Data.kurzname), i7Schluessel);
+                            //region.i7key = i7Schluessel;
                             this.addIdMapping(i7Data.id, region.mrid, integral_sql_1.Integral7TableNames.REGION);
                             regions.push(region);
                         }
@@ -835,9 +817,9 @@ class ConverterIntegral7 {
                         integral_prefix_1.MITTIGER_PUNKT +
                         (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
                     const vl = new VoltageLevel_1.VoltageLevel((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', i7Data.un.toString(), '_VL']), i7Data.kurzname, i7Schluessel);
-                    const facility = util_asset_model_1.UtilAssetModel.createFacilityInstanceForPsr(cimModel, vl, cim_constants_1.CimAssetAliasNames.VoltageLevel, this.configUuid);
+                    const facility = util_cim_model_1.UtilCimModel.createFacilityInstanceForPsr(cimModel, vl, cim_constants_1.CimAssetAliasNames.VoltageLevel, this.configUuid);
                     if (i7Data.baujahr) {
-                        util_asset_model_1.UtilAssetModel.setLifecycleDate(facility, i7Data.baujahr);
+                        util_cim_model_1.UtilCimModel.setLifecycleDate(facility, i7Data.baujahr);
                     }
                     const un = (0, utils_2.getU)(i7Data.un);
                     const baseVoltage = (0, util_create_1.createBaseVoltageIfNotExists)(cimModel, un, this.configUuid, this.exportFramesBoundary);
@@ -898,6 +880,9 @@ class ConverterIntegral7 {
                         (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
                     const cimrdfid = (0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid);
                     const bay = new AMPRIONBay_1.AMPRIONBay(cimrdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', cimrdfid.substring(0, 8), '_B'], 32, true), i7Data.kurzname, i7Schluessel);
+                    if (i7Data.feldnummer > 0) {
+                        const stop = true;
+                    }
                     bay.number = (0, parser_utils_1.isNumericI7)(i7Data.feldnummer) ? (0, parser_utils_1.convertToNumberI7)(i7Data.feldnummer).toString() : undefined;
                     bay.locationID = i7Data.ips_folder_id;
                     bay.voltageLevel = voltageLevel;
@@ -991,20 +976,23 @@ class ConverterIntegral7 {
         });
     }
     convertSammelschienenAbschnitte(cimModel, integral7, schaltanlagenAbschnittIDs) {
+        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.SAMMELSCHIENE)) {
                 const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.SAMMELSCHIENE, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.SAMMELSCHIENE), schaltanlagenAbschnittIDs));
                 for (const i7Data of result) {
                     const i7Schaltanlagenabschnitt = integral7.integralSchaltanlagenAbschnitte.get(i7Data.saabschnitt);
-                    const busbarSection = new BusbarSection_1.BusbarSection(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Schaltanlagenabschnitt), '_BBS']), i7Schaltanlagenabschnitt.kurzname);
-                    busbarSection.ipMax = i7Data.limit_ip;
-                    // die Sammelschienen sind nicht aggregiert.
-                    busbarSection.aggregate = false;
                     //const rdfid: string = getUUID(i7Data.guid); /** this is the mrid for TopologicalNode*/
                     const rdfid = (0, parser_utils_1.getUUID)(i7Data.guid_cn, this.objectMappingConfig.standardiseUuid);
                     const connectivityNode = new AMPRIONConnectivityNode_1.AMPRIONConnectivityNode(rdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_' + i7Data.pos.toString(), '_' + rdfid.substring(0, 8), '_CN'], 32, true), i7Data.kurzname);
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Schaltanlagenabschnitt.id));
                     connectivityNode.nodeNumber = i7Data.id_psse_cape;
+                    const keyBusbarSection = (_a = integral_sql_1.I7Objects.SAMMELSCHIENE + (voltageLevel === null || voltageLevel === void 0 ? void 0 : voltageLevel.getUUID())) !== null && _a !== void 0 ? _a : '' + (connectivityNode === null || connectivityNode === void 0 ? void 0 : connectivityNode.getUUID());
+                    const uuidBusbarSection = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.BusbarSection, this.configUuid, keyBusbarSection);
+                    const busbarSection = new BusbarSection_1.BusbarSection(uuidBusbarSection, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Schaltanlagenabschnitt), '_BBS']), i7Schaltanlagenabschnitt.kurzname);
+                    busbarSection.ipMax = i7Data.limit_ip;
+                    // die Sammelschienen sind nicht aggregiert.
+                    busbarSection.aggregate = false;
                     if (voltageLevel) {
                         busbarSection.equipmentContainer = voltageLevel;
                         voltageLevel.addEquipment(busbarSection);
@@ -1626,10 +1614,10 @@ class ConverterIntegral7 {
                     }
                     asynchronousMachine.normallyInService = inBetrieb;
                     //EQ core profile content
-                    asynchronousMachine.ratedPowerFactor = cosphir;
                     asynchronousMachine.ratedS = (0, parser_utils_1.isNumericI7)(i7Data.sr) ? i7Data.sr : assetType === null || assetType === void 0 ? void 0 : assetType.sr;
-                    asynchronousMachine.ratedU = (0, parser_utils_1.isNumericI7)(i7Data.ur) ? i7Data.ur : assetType === null || assetType === void 0 ? void 0 : assetType.ur;
                     //EQ short circuit profile content
+                    asynchronousMachine.ratedPowerFactor = cosphir;
+                    asynchronousMachine.ratedU = (0, parser_utils_1.isNumericI7)(i7Data.ur) ? i7Data.ur : assetType === null || assetType === void 0 ? void 0 : assetType.ur;
                     asynchronousMachine.converterFedDrive = false;
                     asynchronousMachine.efficiency = wirkungsgrad * 100;
                     asynchronousMachine.iaIrRatio = (0, parser_utils_1.isNumericI7)(i7Data.ilr_ir) ? i7Data.ilr_ir : ((0, parser_utils_1.isNumericI7)(assetType === null || assetType === void 0 ? void 0 : assetType.ilr_ir) ? assetType.ilr_ir : undefined);
@@ -1733,21 +1721,25 @@ class ConverterIntegral7 {
                     const generatingUnitConfig = energyTypesConfig[i7Data.nameprimaertyp];
                     /** Wenn ein Config für den Primärenergietyp vorhanden*/
                     let generatingUnit;
+                    const generatingUnitKey = synchronousMachine.getUUID();
                     if (generatingUnitConfig) {
                         switch (generatingUnitConfig.class) {
                             case 'ThermalGeneratingUnit': {
-                                generatingUnit = new ThermalGeneratingUnit_1.ThermalGeneratingUnit((0, parser_utils_1.getUUID)(''), 'Generator_' + i7Data.bezeichner, i7Data.kurzname, i7Data.nameprimaertyp);
+                                const uuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.ThermalGeneratingUnit, this.configUuid, generatingUnitKey);
+                                generatingUnit = new ThermalGeneratingUnit_1.ThermalGeneratingUnit(uuid, 'Generator_' + i7Data.bezeichner, i7Data.kurzname, i7Data.nameprimaertyp);
                                 if (generatingUnitConfig.fuelType) {
                                     (0, utils_2.generateFuelType)(i7Data.nameprimaertyp, generatingUnitConfig.fuelType, generatingUnit, cimModel);
                                 }
                                 break;
                             }
                             case 'SolarGeneratingUnit': {
-                                generatingUnit = new SolarGeneratingUnit_1.SolarGeneratingUnit((0, parser_utils_1.getUUID)(''), 'Generator_' + i7Data.bezeichner, i7Data.kurzname, i7Data.nameprimaertyp);
+                                const uuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.SolarGeneratingUnit, this.configUuid, generatingUnitKey);
+                                generatingUnit = new SolarGeneratingUnit_1.SolarGeneratingUnit(uuid, 'Generator_' + i7Data.bezeichner, i7Data.kurzname, i7Data.nameprimaertyp);
                                 break;
                             }
                             case 'WindGeneratingUnit': {
-                                generatingUnit = new WindGeneratingUnit_1.WindGeneratingUnit((0, parser_utils_1.getUUID)(''), 'Generator_' + i7Data.bezeichner, i7Data.kurzname, i7Data.nameprimaertyp);
+                                const uuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.WindGeneratingUnit, this.configUuid, generatingUnitKey);
+                                generatingUnit = new WindGeneratingUnit_1.WindGeneratingUnit(uuid, 'Generator_' + i7Data.bezeichner, i7Data.kurzname, i7Data.nameprimaertyp);
                                 switch (generatingUnitConfig.fuelType) {
                                     case 'onshore': {
                                         generatingUnit.windGenUnitType = WindGenUnitKind_1.WindGenUnitKind.onshore;
@@ -1765,13 +1757,15 @@ class ConverterIntegral7 {
                                 break;
                             }
                             case 'NuclearGeneratingUnit': {
-                                generatingUnit = new NuclearGeneratingUnit_1.NuclearGeneratingUnit((0, parser_utils_1.getUUID)(''), 'Generator_' + i7Data.bezeichner, i7Data.kurzname);
+                                const uuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.NuclearGeneratingUnit, this.configUuid, generatingUnitKey);
+                                generatingUnit = new NuclearGeneratingUnit_1.NuclearGeneratingUnit(uuid, 'Generator_' + i7Data.bezeichner, i7Data.kurzname);
                                 break;
                             }
                         }
                     }
                     if (!generatingUnit) {
-                        generatingUnit = new GeneratingUnit_1.GeneratingUnit((0, parser_utils_1.getUUID)(''), 'KWBlock' + i7Data.bezeichner, i7Data.kurzname);
+                        const uuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.GeneratingUnit, this.configUuid, generatingUnitKey);
+                        generatingUnit = new GeneratingUnit_1.GeneratingUnit(uuid, 'KWBlock' + i7Data.bezeichner, i7Data.kurzname);
                     }
                     generatingUnit.genControlSource = GeneratorControlSource_1.GeneratorControlSource.unavailable;
                     generatingUnit.initialP = (0, parser_utils_1.isNumericI7)(i7Data.p0) ? (0, parser_utils_1.convertToNumberI7)(i7Data.p0) : undefined;
@@ -1871,6 +1865,9 @@ class ConverterIntegral7 {
                 const x0 = (0, parser_utils_1.isNumericI7)(i7Data.x0) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x0) : undefined;
                 const x1 = (0, parser_utils_1.isNumericI7)(i7Data.x1) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x1) : undefined;
                 const equivalentInjection = new INTEGRALEquivalentInjection_1.INTEGRALEquivalentInjection((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_EI']), i7Data.kurzname);
+                /*if(equivalentInjection.getUUID() === '41b1d0bf-2c36-4e34-aa2a-a283b8c32e7f'){
+                  let stop = true;
+                }*/
                 /** Export Extended Ward equivalent with voltage regulation */
                 if (flag_lfl && !flag_ks && usoll && (r_ext !== 0 || x_ext !== 0)) {
                     //is regulating equivalent equipment
@@ -1886,21 +1883,12 @@ class ConverterIntegral7 {
                     equivalentInjection.x0 = 1e9;
                     equivalentInjection.x2 = 1e9;
                 }
-                /** Export Extended Ward equivalent with no voltage regulation */
-                else if ((r_ext !== 0 || x_ext !== 0)) {
-                    equivalentInjection.regulationCapability = false;
+                else if (flag_lfl && usoll && einspeisePrio) {
+                    equivalentInjection.regulationCapability = true;
+                    equivalentInjection.regulationStatus = true;
+                    equivalentInjection.regulationTarget = usoll;
                     equivalentInjection.rExt = r_ext;
-                    equivalentInjection.r = 1e9;
-                    equivalentInjection.r0 = 1e9;
-                    equivalentInjection.r2 = 1e9;
                     equivalentInjection.xExt = x_ext;
-                    equivalentInjection.x = 1e9;
-                    equivalentInjection.x0 = 1e9;
-                    equivalentInjection.x2 = 1e9;
-                }
-                /** Export equivalent with only short circuit computation capability */
-                else if (!flag_lfl && flag_ks) {
-                    equivalentInjection.regulationCapability = false;
                     equivalentInjection.r = r1;
                     equivalentInjection.r0 = r0;
                     equivalentInjection.r2 = r1;
@@ -1908,10 +1896,8 @@ class ConverterIntegral7 {
                     equivalentInjection.x0 = x0;
                     equivalentInjection.x2 = x1;
                 }
-                else if (flag_lfl && usoll && einspeisePrio) {
-                    equivalentInjection.regulationCapability = true;
-                    equivalentInjection.regulationStatus = true;
-                    equivalentInjection.regulationTarget = usoll;
+                else if (flag_lfl || flag_ks) {
+                    equivalentInjection.regulationCapability = false;
                     equivalentInjection.r = r1;
                     equivalentInjection.r0 = r0;
                     equivalentInjection.r2 = r1;
@@ -1919,6 +1905,18 @@ class ConverterIntegral7 {
                     equivalentInjection.x0 = x0;
                     equivalentInjection.x2 = x1;
                 }
+                /** Export Extended Ward equivalent with no voltage regulation */
+                else if (((r_ext !== undefined && r_ext !== 0) || (x_ext !== undefined && x_ext !== 0))) {
+                    equivalentInjection.regulationCapability = false;
+                    equivalentInjection.rExt = r_ext;
+                    equivalentInjection.r = 1e9;
+                    equivalentInjection.r0 = 1e9;
+                    equivalentInjection.r2 = 1e9;
+                    equivalentInjection.xExt = x_ext;
+                    equivalentInjection.x = 1e9;
+                    equivalentInjection.x0 = 1e9;
+                    equivalentInjection.x2 = 1e9;
+                }
                 else {
                     equivalentInjection.regulationCapability = false;
                     equivalentInjection.r = 1e9;
@@ -2093,32 +2091,32 @@ class ConverterIntegral7 {
                      *  KnotenZw -> Netzschlaufe -> KnotenSo -> Anschlusspunkt */
                     this.createBoundaryConnection(frame, equivalentBranch, i7Data.aknoten, PhaseCode_1.PhaseCode.ABC);
                     this.createBoundaryConnection(frame, equivalentBranch, i7Data.eknoten, PhaseCode_1.PhaseCode.ABC);
+                    if (equivalentBranch.getUUID() === '67528dfe-be93-4c44-81db-5708ecd9377e') {
+                        let stop = true;
+                    }
                     /**EQ */
                     if (flag_lfl && !flag_ks) {
-                        equivalentBranch.r = (0, parser_utils_1.isNumericI7)(i7Data.r12_lfl) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r12_lfl) : 0;
-                        equivalentBranch.x = (0, parser_utils_1.isNumericI7)(i7Data.x12_lfl) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x12_lfl) : 0;
-                        /*equivalentBranch.r21 = isNumericI7(i7Data.r21_lfl) ? convertToNumberI7(i7Data.r21_lfl) : equivalentBranch.r;
-                        equivalentBranch.x21 = isNumericI7(i7Data.x21_lfl) ? convertToNumberI7(i7Data.x21_lfl) : equivalentBranch.x;
-              
-                        equivalentBranch.positiveR12 = isNumericI7(i7Data.r12_ks) ? convertToNumberI7(i7Data.r12_ks) : 10e9;
+                        equivalentBranch.r = (0, parser_utils_1.isNumericI7)(i7Data.r12_lfl) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r12_lfl) : 10e9;
+                        equivalentBranch.x = (0, parser_utils_1.isNumericI7)(i7Data.x12_lfl) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x12_lfl) : 10e9;
+                        equivalentBranch.r21 = (0, parser_utils_1.isNumericI7)(i7Data.r21_lfl) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r21_lfl) : equivalentBranch.r;
+                        equivalentBranch.x21 = (0, parser_utils_1.isNumericI7)(i7Data.x21_lfl) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x21_lfl) : equivalentBranch.x;
+                        equivalentBranch.positiveR12 = (0, parser_utils_1.isNumericI7)(i7Data.r12_ks) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r12_ks) : 10e9;
                         equivalentBranch.positiveR21 = equivalentBranch.positiveR12;
-                        equivalentBranch.positiveX12 = isNumericI7(i7Data.x12_ks) ? convertToNumberI7(i7Data.x12_ks) : 10e9;
+                        equivalentBranch.positiveX12 = (0, parser_utils_1.isNumericI7)(i7Data.x12_ks) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x12_ks) : 10e9;
                         equivalentBranch.positiveX21 = equivalentBranch.positiveX12;
-              
                         equivalentBranch.negativeR12 = equivalentBranch.positiveR12;
                         equivalentBranch.negativeR21 = equivalentBranch.positiveR21;
                         equivalentBranch.negativeX12 = equivalentBranch.positiveX12;
                         equivalentBranch.negativeX21 = equivalentBranch.positiveX21;
-              
-                        equivalentBranch.zeroR12 = isNumericI7(i7Data.r0) ? convertToNumberI7(i7Data.r0) : 10e9;
+                        equivalentBranch.zeroR12 = (0, parser_utils_1.isNumericI7)(i7Data.r0) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r0) : 10e9;
                         equivalentBranch.zeroR21 = equivalentBranch.zeroR12;
-                        equivalentBranch.zeroX12 = isNumericI7(i7Data.x0) ? convertToNumberI7(i7Data.x0) : 10e9
-                        equivalentBranch.zeroX21 = equivalentBranch.zeroX12;*/
+                        equivalentBranch.zeroX12 = (0, parser_utils_1.isNumericI7)(i7Data.x0) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x0) : 10e9;
+                        equivalentBranch.zeroX21 = equivalentBranch.zeroX12;
                     }
                     else if (!flag_lfl && flag_ks) {
                         /**EQ-SC */
-                        equivalentBranch.r = (0, parser_utils_1.isNumericI7)(i7Data.r12_lfl) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r12_lfl) : 0;
-                        equivalentBranch.x = (0, parser_utils_1.isNumericI7)(i7Data.x12_lfl) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x12_lfl) : 0;
+                        equivalentBranch.r = (0, parser_utils_1.isNumericI7)(i7Data.r12_lfl) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r12_lfl) : 10e9;
+                        equivalentBranch.x = (0, parser_utils_1.isNumericI7)(i7Data.x12_lfl) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x12_lfl) : 10e9;
                         equivalentBranch.positiveR12 = (0, parser_utils_1.isNumericI7)(i7Data.r12_ks) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r12_ks) : 10e9;
                         equivalentBranch.positiveR21 = equivalentBranch.positiveR12;
                         equivalentBranch.positiveX12 = (0, parser_utils_1.isNumericI7)(i7Data.x12_ks) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x12_ks) : 10e9;
@@ -2133,8 +2131,8 @@ class ConverterIntegral7 {
                         equivalentBranch.zeroX21 = equivalentBranch.zeroX12;
                     }
                     else { //If flag_lfl and flag_ks are specified or neither flag_lfl nor flag_ks are specified, any impedance value that is specified will be exported.
-                        equivalentBranch.r = (0, parser_utils_1.isNumericI7)(i7Data.r12_lfl) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r12_lfl) : 0;
-                        equivalentBranch.x = (0, parser_utils_1.isNumericI7)(i7Data.x12_lfl) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x12_lfl) : 0;
+                        equivalentBranch.r = (0, parser_utils_1.isNumericI7)(i7Data.r12_lfl) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r12_lfl) : 10e9;
+                        equivalentBranch.x = (0, parser_utils_1.isNumericI7)(i7Data.x12_lfl) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x12_lfl) : 10e9;
                         equivalentBranch.r21 = (0, parser_utils_1.isNumericI7)(i7Data.r21_lfl) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r21_lfl) : equivalentBranch.r;
                         equivalentBranch.x21 = (0, parser_utils_1.isNumericI7)(i7Data.x21_lfl) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x21_lfl) : equivalentBranch.x;
                         equivalentBranch.positiveR12 = (0, parser_utils_1.isNumericI7)(i7Data.r12_ks) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r12_ks) : 10e9;
@@ -2622,7 +2620,7 @@ class ConverterIntegral7 {
                             typeName = (0, utils_1.getTypeNameFromStringByRegEx)(mf.name, energySourceTypeMappingConfig);
                     }
                     if (typeName) {
-                        const psrType = (0, utils_1.createIfNotExitsPSRType)(cimModel, typeName);
+                        const psrType = (0, utils_1.createIfNotExitsPSRType)(cimModel, typeName, this.configUuid);
                         energySource.psrTypeUUID = psrType.mrid;
                     }
                     if (typeName === 'Wasserkraft') {
@@ -2911,7 +2909,6 @@ class ConverterIntegral7 {
                 }
                 //Create and define regulating control for voltage control
                 if (cterminal !== undefined) {
-                    const uuid = (0, parser_utils_1.getUUID)(i7DataRQ.guid_rc);
                     rControl = (0, utils_2.createRegulatingControl)((0, parser_utils_1.getUUID)(i7DataRQ.guid_rc), (0, util_create_1.createNotation)([regCondEquip.getUUID().substring(0, 8), suffix]), true, UnitMultiplier_1.UnitMultiplier.k, RegulatingControlModeKind_1.RegulatingControlModeKind.voltage);
                     if (i7DataEinsp) {
                         rControl.discrete = false; //default for ExternalNetworkInjection is false. s. CGMES Doku
@@ -3171,39 +3168,6 @@ class ConverterIntegral7 {
             }
         });
     }
-    convertLaegskupplungen(cimModel, integral7, schaltanlagenIDs) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSKUPPLUNG)) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.LAENGSKUPPLUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.LAENGSKUPPLUNG), schaltanlagenIDs));
-                for (const i7Data of result) {
-                    const uuid = (0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid);
-                    const bay = new AMPRIONBay_1.AMPRIONBay(uuid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', uuid.substring(0, 8), '_B']), i7Data.kurzname, 'Laengskupplung');
-                    const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Data.schaltanlage));
-                    bay.number = (0, parser_utils_1.isNumericI7)(i7Data.feldnummer) ? (0, parser_utils_1.convertToNumberI7)(i7Data.feldnummer).toString() : undefined;
-                    bay.locationID = i7Data.ips_folder_id;
-                    if (voltageLevel) {
-                        bay.voltageLevel = voltageLevel;
-                        voltageLevel.addBay(bay);
-                        const i7Schluessel = voltageLevel.description +
-                            '/LK-' +
-                            (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
-                        bay.description = i7Schluessel;
-                    }
-                    else {
-                        this.logger.debug(`debug --- Laengskupplung ${i7Data.id} besitzt keine Anlage.`);
-                    }
-                    const lKupplungImpl = new Laengskupplung_1.LaengskupplungImpl(i7Data);
-                    integral7.integralLaengskupplungen.set(i7Data.id, lKupplungImpl);
-                    integral7.laengskupplungIDs.push(i7Data.id);
-                    this.addIdMapping(i7Data.id, bay.mrid, integral_sql_1.Integral7TableNames.LAENGSKUPPLUNG);
-                    cimModel.addBay(bay);
-                }
-            }
-            else {
-                this.logger.debug(`debug --- Tabelle ${integral_sql_1.Integral7TableNames.LAENGSKUPPLUNG} ist nicht vorhanden.`);
-            }
-        });
-    }
     convertStarreVerbindungen(cimModel, containerIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KNOTEN_STARR)) {
@@ -3392,7 +3356,7 @@ class ConverterIntegral7 {
                     /** CurrentLimit */
                     const terminal = startTerminal;
                     if (terminal) {
-                        this.setConductingEquipmentOperationalLimit(cimModel, 'Rating ' + seriesCompensator.name, terminal, ir, new CurrentLimit_1.CurrentLimit());
+                        this.setConductingEquipmentOperationalLimit(cimModel, 'Rating ' + seriesCompensator.name, terminal, seriesCompensator.getUUID(), ir, cim_class_names_1.ClassNames.CurrentLimit);
                     }
                     else {
                         this.logger.debug(`Längsdrossel ${i7Data.id} ${seriesCompensator.mrid} besitzt keine Terminalinstanz.`);
@@ -3415,7 +3379,7 @@ class ConverterIntegral7 {
                         this.logger.debug(`Längsdrossel ${i7Data.id} besitzt kein VoltageLevel Ur ${i7Data.ur}.`);
                     }
                     /** PSR Types */
-                    const psrType = (0, utils_1.createIfNotExitsPSRType)(cimModel, 'Längsdrossel');
+                    const psrType = (0, utils_1.createIfNotExitsPSRType)(cimModel, 'Längsdrossel', this.configUuid);
                     seriesCompensator.psrTypeUUID = psrType.mrid;
                     cimModel.addSeriesCompensator(seriesCompensator);
                     this.addIdMapping(i7Data.id, seriesCompensator.mrid, integral_sql_1.Integral7TableNames.LAENGSDROSSEL);
@@ -3478,7 +3442,7 @@ class ConverterIntegral7 {
                     /** CurrentLimit */
                     const terminal = startTerminal;
                     if (terminal) {
-                        this.setConductingEquipmentOperationalLimit(cimModel, 'Rating ' + seriesCompensator.name, terminal, ir, new CurrentLimit_1.CurrentLimit());
+                        this.setConductingEquipmentOperationalLimit(cimModel, 'Rating ' + seriesCompensator.name, terminal, seriesCompensator.getUUID(), ir, cim_class_names_1.ClassNames.CurrentLimit);
                     }
                     else {
                         this.logger.debug(`Längsdrossel ${i7Data.id} ${seriesCompensator.mrid} besitzt keine Terminalinstanz.`);
@@ -3498,7 +3462,7 @@ class ConverterIntegral7 {
                         this.logger.debug(`Längskondensator ${i7Data.id} besitzt kein VoltageLevel Ur ${i7Data.ur}.`);
                     }
                     /** PSR Types */
-                    const psrType = (0, utils_1.createIfNotExitsPSRType)(cimModel, 'Längskondensator');
+                    const psrType = (0, utils_1.createIfNotExitsPSRType)(cimModel, 'Längskondensator', this.configUuid);
                     seriesCompensator.psrType = psrType;
                     cimModel.addSeriesCompensator(seriesCompensator);
                     this.addIdMapping(i7Data.id, seriesCompensator.mrid, integral_sql_1.Integral7TableNames.LAENGSKONDENSATOR);
@@ -3536,9 +3500,13 @@ class ConverterIntegral7 {
                     for (const i7DataSchiene of stpSchiene) {
                         try {
                             stpSchieneIDs.push(i7DataSchiene.id);
-                            const connectivityNode = new ConnectivityNode_1.ConnectivityNode(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7DataSchiene), '_CN']));
-                            const junction = new Junction_1.Junction(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7DataSchiene), '_J']));
                             const equipmentContainer = this.determineEquipmentContainer('VoltageLevel', cimModel, cimModel.getObject(this.integralID2UUID.get(i7DataSchiene.id)));
+                            const keyConnectivityNode = cim_class_names_1.ClassNames.ConnectivityNode + i7DataSchiene.id + (equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getUUID()) || '';
+                            const uuidConnectivityNode = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.ConnectivityNode, this.configUuid, keyConnectivityNode);
+                            const connectivityNode = new ConnectivityNode_1.ConnectivityNode(uuidConnectivityNode, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7DataSchiene), '_CN']));
+                            const keyJunction = cim_class_names_1.ClassNames.Junction + i7DataSchiene.id + (equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getUUID()) || '';
+                            const uuidJunction = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.Junction, this.configUuid, keyJunction);
+                            const junction = new Junction_1.Junction(uuidJunction, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7DataSchiene), '_J']));
                             connectivityNode.setConnectivityNodeContainer(equipmentContainer);
                             if (equipmentContainer) {
                                 equipmentContainer.addEquipment(junction);
@@ -3792,12 +3760,14 @@ class ConverterIntegral7 {
                         const uuid = (0, parser_utils_1.getUUID)(stk.custom_guid_0120 + stk.custom_guid_2137, this.objectMappingConfig.standardiseUuid);
                         const acLineSegment = new INTEGRALACLineSegment_1.INTEGRALACLineSegment(uuid, (0, util_create_1.createNotation)([name, '_' + stk.pos.toString(), '_' + uuid.substring(0, 8), '_ACLS'], 32, true), i7Data.stkabname, i7Schluessel);
                         if (stk.baujahr) {
-                            const wire = new EVWireObject_1.EVWireObject(common_utils_1.CommonUtils.generateUUID(), stk.name);
+                            const key = acLineSegment.getUUID();
+                            const uuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.EVWireObject, this.configUuid, key);
+                            const wire = new EVWireObject_1.EVWireObject(uuid, stk.name);
                             wire.type = 'Stromkreisabschnitt';
                             wire.addPowerSystemResource(acLineSegment);
                             acLineSegment.addAsset(wire);
                             cimModel.addWireObject(wire);
-                            util_asset_model_1.UtilAssetModel.setLifecycleDate(wire, stk.baujahr);
+                            util_cim_model_1.UtilCimModel.setLifecycleDate(wire, stk.baujahr);
                         }
                         let mf = this.cimModelDefault.multiplierFactors.get(this.integralID2UUID.get(stk.multfaktor));
                         if (mf) {
@@ -3847,8 +3817,11 @@ class ConverterIntegral7 {
                     let tmp_terminal = undefined;
                     for (let i = 0; i < anzahl - 1; i++) {
                         const acLineSegment1 = acLineSegments[i];
+                        const acLineSegment2 = acLineSegments[i + 1];
                         /**Connectivity Node to connect end of line and start of neighbouring line.*/
-                        const cn = new ConnectivityNode_1.ConnectivityNode(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)([acLineSegment1.name, '_', acLineSegment1.getUUID().substring(0, 8), '_CN'], 32, true));
+                        const key = acLineSegment1.getUUID() + acLineSegment2.getUUID();
+                        const uuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.ConnectivityNode, this.configUuid, key);
+                        const cn = new ConnectivityNode_1.ConnectivityNode(uuid, (0, util_create_1.createNotation)([acLineSegment1.name, '_', acLineSegment1.getUUID().substring(0, 8), '_CN'], 32, true));
                         /**Connect end of aclinesegment i*/
                         cn.connectivityNodeContainer = acLineSegment1.equipmentContainer;
                         tmp_terminal = this.createConnection(cimModel, acLineSegment1, cn, PhaseCode_1.PhaseCode.ABC, true);
@@ -3859,7 +3832,6 @@ class ConverterIntegral7 {
                         }
                         this.setACLineSegmentProperties(this.cimModelDefault, cimModel, acLineSegments[i], stromkreisabschnitte[i], defaultValuesConfig);
                         /**Connect end of aclinesegment i+1*/
-                        const acLineSegment2 = acLineSegments[i + 1];
                         tmp_terminal = this.createConnection(cimModel, acLineSegment2, cn, PhaseCode_1.PhaseCode.ABC, true);
                         //this.setACLineSegmentCurrentLimt(cimModel, acLineSegment2, acLineSegment2.description, tmp_terminal);
                         cimModel.addACLineSegment(acLineSegment1);
@@ -3986,7 +3958,9 @@ class ConverterIntegral7 {
                     dcLineSegment.equipmentContainer = dcLine;
                     //create second dcLineSegment in case this dcLine is a bipol.
                     if (bipol) {
-                        dcLineNeg = new DCLine_1.DCLine(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_neg', '_DCL']));
+                        const dcLineKey = dcLine.getUUID();
+                        const dcLineUuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.DCLine, this.configUuid, dcLineKey);
+                        dcLineNeg = new DCLine_1.DCLine(dcLineUuid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_neg', '_DCL']));
                         dcLineSegmentNeg = new DCLineSegment_1.DCLineSegment((0, parser_utils_1.getUUID)(i7Data.guidn, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_neg', '_DCLS'], 32, true), (0, util_create_1.createNotation)([i7Data.kurzname, '_neg'], 12, true), i7Schluessel);
                         dcLineSegmentNeg.length = dcLineSegment.length;
                         dcLineSegmentNeg.capacitance = undefined;
@@ -4302,10 +4276,10 @@ class ConverterIntegral7 {
                         const stop = true;
                     }
                     const powerTransformer = new PowerTransformer_1.PowerTransformer(uuid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', uuid.substring(0, 8), '_PT']), i7Data.kurzname, i7Data.kommentar);
-                    const facility = util_asset_model_1.UtilAssetModel.createFacilityInstanceForPsr(cimModel, powerTransformer, cim_constants_1.CimAssetAliasNames.Transformer, this.configUuid);
+                    const facility = util_cim_model_1.UtilCimModel.createFacilityInstanceForPsr(cimModel, powerTransformer, cim_constants_1.CimAssetAliasNames.Transformer, this.configUuid);
                     /** AssetInfos */
                     if (i7Data.baujahr) {
-                        util_asset_model_1.UtilAssetModel.setLifecycleDate(facility, i7Data.baujahr);
+                        util_cim_model_1.UtilCimModel.setLifecycleDate(facility, i7Data.baujahr);
                     }
                     const substation = cimModel.getSubstation(this.integralID2UUID.get(i7Data.standort));
                     if (substation) {
@@ -4374,10 +4348,14 @@ class ConverterIntegral7 {
                     powerTransformerEnd1.ratedU = ur;
                     powerTransformerEnd1.ratedS = sr;
                     //Short-Circuit data export EQ-SC profile //TODO: Read data for enervancetransformertype object.
-                    const x00r1 = (0, parser_utils_1.isNumericI7)(i7Data.x00r1) ? i7Data.x00r1 : 0;
-                    const x0kr1 = (0, parser_utils_1.isNumericI7)(i7Data.x0kr1) ? i7Data.x0kr1 : 0;
-                    const x00r2 = (0, parser_utils_1.isNumericI7)(i7Data.x00r2) ? i7Data.x00r2 : 0;
-                    const r00r1 = (0, parser_utils_1.isNumericI7)(i7Data.r00r1) ? i7Data.r00r1 : 0;
+                    const r0kr1 = (0, utils_2.getX0R0Transformer)(i7Data, powerTransformerInfo, 'r0kr1');
+                    const x0kr1 = (0, utils_2.getX0R0Transformer)(i7Data, powerTransformerInfo, 'x0kr1');
+                    const r00r1 = (0, utils_2.getX0R0Transformer)(i7Data, powerTransformerInfo, 'r00r1');
+                    const x00r1 = (0, utils_2.getX0R0Transformer)(i7Data, powerTransformerInfo, 'x00r1');
+                    const r0kr2 = (0, utils_2.getX0R0Transformer)(i7Data, powerTransformerInfo, 'r0kr2');
+                    const x0kr2 = (0, utils_2.getX0R0Transformer)(i7Data, powerTransformerInfo, 'x0kr2');
+                    const r00r2 = (0, utils_2.getX0R0Transformer)(i7Data, powerTransformerInfo, 'r00r2');
+                    const x00r2 = (0, utils_2.getX0R0Transformer)(i7Data, powerTransformerInfo, 'x00r2');
                     /** Topologie 3 moegliche Anschluesse
                      *  KontenSo -> Anschluesspunkt
                      *  KnotenSf -> Schaltfeldpunkt
@@ -4404,16 +4382,10 @@ class ConverterIntegral7 {
                     const sr2 = (0, utils_2.getSrTrafo)(i7Data, powerTransformerInfo, powerTransformerEnd2.endNumber, false);
                     const ur2 = (0, utils_2.getUrTrafo)(i7Data, powerTransformerInfo, powerTransformerEnd2.endNumber);
                     // Berechnung
-                    // NullSystem Impedanzen (nur Reaktanzen)
-                    const zeroSequImpedanzWx = (0, utils_trafo3w_1.calculateZeroSequImpedanzenTrafo2W)(r00r1, x00r1, x0kr1, x00r2, ur, ur2);
                     powerTransformerEnd2.r = 0;
                     powerTransformerEnd2.x = 0;
                     powerTransformerEnd2.ratedS = sr2;
                     powerTransformerEnd2.ratedU = ur2;
-                    powerTransformerEnd1.x0 = zeroSequImpedanzWx.x01;
-                    powerTransformerEnd1.r0 = zeroSequImpedanzWx.r01;
-                    powerTransformerEnd2.x0 = zeroSequImpedanzWx.x02;
-                    powerTransformerEnd2.r0 = zeroSequImpedanzWx.r02;
                     /*       const ziel = cimModel.getObject(this.integralID2UUID.get(i7Data.eknoten));
                            const zielTerminal = ziel ? this.createConnection(cimModel, powerTransformer, ziel, PhaseCode.ABC, true, 2) : undefined;*/
                     const zielTerminal = this.createBoundaryConnection(frame, powerTransformer, i7Data.eknoten, PhaseCode_1.PhaseCode.ABC);
@@ -4434,6 +4406,14 @@ class ConverterIntegral7 {
                     powerTransformerEnd1.phaseAngleClock = (0, utils_2.getSchaltgruppeAngleClock)(schaltgruppe, powerTransformerEnd1.endNumber);
                     powerTransformerEnd2.connectionKind = (0, utils_2.getSchaltgruppe)(schaltgruppe, powerTransformerEnd2.endNumber, powerTransformerEnd2.grounded);
                     powerTransformerEnd2.phaseAngleClock = (0, utils_2.getSchaltgruppeAngleClock)(schaltgruppe, powerTransformerEnd2.endNumber);
+                    // NullSystem Impedanzen (nur Reaktanzen)
+                    let starconnectionCount = (0, utils_2.getGroundingCountFromWindingConnection)(powerTransformer);
+                    //const zeroSequImpedanzWx = calculateZeroSequImpedanzenTrafo2W([r0kr1, x0kr1, r0kr2, x0kr2], [r00r1, x00r1, r00r2, x00r2], [ur, ur2]);
+                    const zeroSequImpedanzWx = (0, utils_2.calculateComplexZeroSequImpedanzenTrafo)([r0kr1, x0kr1, r0kr2, x0kr2], [r00r1, x00r1, r00r2, x00r2], [ur, ur2], starconnectionCount)[0];
+                    powerTransformerEnd1.x0 = zeroSequImpedanzWx.x01;
+                    powerTransformerEnd1.r0 = zeroSequImpedanzWx.r01;
+                    powerTransformerEnd2.x0 = zeroSequImpedanzWx.x02;
+                    powerTransformerEnd2.r0 = zeroSequImpedanzWx.r02;
                     /** Transormator Anschlusspunkte nach Spannungsebene sortieren */
                     this.sortTransformerEnd(powerTransformer, 'ratedU', 'desc');
                     // TODO
@@ -4517,10 +4497,10 @@ class ConverterIntegral7 {
                     else {
                         this.logger.debug(`Trafo3W ${i7Data.id} besitzt keine Umspannanlage.`);
                     }
-                    const facility = util_asset_model_1.UtilAssetModel.createFacilityInstanceForPsr(cimModel, powerTransformer, cim_constants_1.CimAssetAliasNames.Transformer, this.configUuid);
+                    const facility = util_cim_model_1.UtilCimModel.createFacilityInstanceForPsr(cimModel, powerTransformer, cim_constants_1.CimAssetAliasNames.Transformer, this.configUuid);
                     /** AssetInfos */
                     if (i7Data.baujahr) {
-                        util_asset_model_1.UtilAssetModel.setLifecycleDate(facility, i7Data.baujahr);
+                        util_cim_model_1.UtilCimModel.setLifecycleDate(facility, i7Data.baujahr);
                     }
                     const powerTransformerInfo = this.cimModelDefault.getPowerTransformerInfoByName(i7Data.nametyp);
                     if (powerTransformerInfo) {
@@ -4538,12 +4518,14 @@ class ConverterIntegral7 {
                     if (i7Data.nametyp) {
                         const stop = true;
                     }
-                    const x00r1 = (0, parser_utils_1.isNumericI7)(i7Data.x00r1) ? i7Data.x00r1 : 0;
-                    const x0kr1 = (0, parser_utils_1.isNumericI7)(i7Data.x0kr1) ? i7Data.x0kr1 : 0;
-                    const x00r2 = (0, parser_utils_1.isNumericI7)(i7Data.x00r2) ? i7Data.x00r2 : 0;
-                    const r00r1 = (0, parser_utils_1.isNumericI7)(i7Data.r00r1) ? i7Data.r00r1 : 0;
-                    const r0kr1 = (0, parser_utils_1.isNumericI7)(i7Data.r0kr1) ? i7Data.r0kr1 : 0;
-                    const r00r2 = (0, parser_utils_1.isNumericI7)(i7Data.r00r2) ? i7Data.r00r2 : 0;
+                    const x00r1 = (0, utils_2.getX0R0Transformer)(i7Data, powerTransformerInfo, 'x00r1');
+                    const x0kr1 = (0, utils_2.getX0R0Transformer)(i7Data, powerTransformerInfo, 'x0kr1');
+                    const x00r2 = (0, utils_2.getX0R0Transformer)(i7Data, powerTransformerInfo, 'x00r2');
+                    const x0kr2 = (0, utils_2.getX0R0Transformer)(i7Data, powerTransformerInfo, 'x0kr2');
+                    const r00r1 = (0, utils_2.getX0R0Transformer)(i7Data, powerTransformerInfo, 'r00r1');
+                    const r0kr1 = (0, utils_2.getX0R0Transformer)(i7Data, powerTransformerInfo, 'r0kr1');
+                    const r00r2 = (0, utils_2.getX0R0Transformer)(i7Data, powerTransformerInfo, 'r00r2');
+                    const r0kr2 = (0, utils_2.getX0R0Transformer)(i7Data, powerTransformerInfo, 'r0kr2');
                     const pkr12 = (0, utils_2.getPkrTrafo)(i7Data, powerTransformerInfo, '12');
                     const pkr13 = (0, utils_2.getPkrTrafo)(i7Data, powerTransformerInfo, '13');
                     const pkr23 = (0, utils_2.getPkrTrafo)(i7Data, powerTransformerInfo, '23');
@@ -4567,8 +4549,9 @@ class ConverterIntegral7 {
                     const impedanzW1 = (0, utils_trafo3w_1.calculateImpedanzenTrafo3W)(1, ur1, ur2, ur3, sr1, sr2, sr3, pkr12, pkr13, pkr23, ukr12, ukr13, ukr23, pLeer, iLeer);
                     const impedanzW2 = (0, utils_trafo3w_1.calculateImpedanzenTrafo3W)(2, ur1, ur2, ur3, sr1, sr2, sr3, pkr12, pkr13, pkr23, ukr12, ukr13, ukr23, 0, 0);
                     const impedanzW3 = (0, utils_trafo3w_1.calculateImpedanzenTrafo3W)(3, ur1, ur2, ur3, sr1, sr2, sr3, pkr12, pkr13, pkr23, ukr12, ukr13, ukr23, 0, 0);
-                    // NullSystem Impedanzen (nur Reaktanzen)
-                    const zeroSequImpedanzWx = (0, utils_trafo3w_1.calculateZeroSequImpedanzenTrafo3W)(r00r1, r0kr1, r00r2, x00r1, x0kr1, x00r2, ur1, ur2, ur3);
+                    if (powerTransformer.getUUID() === '120a9c2c93ff4a81b494ff63d356c266') {
+                        let stop = true;
+                    }
                     const powerTransformerEnd1 = new PowerTransformerEnd_1.PowerTransformerEnd((0, parser_utils_1.getUUID)(i7Data.guid_w1, this.objectMappingConfig.standardiseUuid), `W1-${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`);
                     powerTransformerEnd1.endNumber = 1;
                     // Topologie
@@ -4607,8 +4590,6 @@ class ConverterIntegral7 {
                     powerTransformerEnd1.x = impedanzW1.x;
                     powerTransformerEnd1.g = impedanzW1.g;
                     powerTransformerEnd1.b = impedanzW1.b;
-                    powerTransformerEnd1.x0 = zeroSequImpedanzWx.x01;
-                    powerTransformerEnd1.r0 = zeroSequImpedanzWx.r01;
                     powerTransformerEnd1.ratedU = ur1;
                     powerTransformerEnd1.ratedS = sr1;
                     this.setPowerTransformerEndProperties(frame, powerTransformerEnd1, powerTransformer, terminal1, sternpunktKnotenMap, integral7, sdauer1, i7Data, defaultValuesConfig, trafoWicklungen);
@@ -4659,8 +4640,6 @@ class ConverterIntegral7 {
                     powerTransformerEnd2.x = impedanzW2.x;
                     powerTransformerEnd2.g = impedanzW2.g;
                     powerTransformerEnd2.b = impedanzW2.b;
-                    powerTransformerEnd2.x0 = zeroSequImpedanzWx.x02;
-                    powerTransformerEnd2.r0 = zeroSequImpedanzWx.r02;
                     powerTransformerEnd2.ratedS = sr2;
                     powerTransformerEnd2.ratedU = ur2;
                     powerTransformerEnd2.powerTransformer = powerTransformer;
@@ -4709,8 +4688,6 @@ class ConverterIntegral7 {
                     powerTransformerEnd3.x = impedanzW3.x;
                     powerTransformerEnd3.g = impedanzW3.g;
                     powerTransformerEnd3.b = impedanzW3.b;
-                    powerTransformerEnd3.x0 = zeroSequImpedanzWx.x03;
-                    powerTransformerEnd3.r0 = zeroSequImpedanzWx.r03;
                     powerTransformerEnd3.ratedS = sr3;
                     powerTransformerEnd3.ratedU = ur3;
                     powerTransformerEnd3.powerTransformer = powerTransformer;
@@ -4727,6 +4704,19 @@ class ConverterIntegral7 {
                     //set transformer end winding connection
                     powerTransformerEnd3.connectionKind = (0, utils_2.getSchaltgruppe)(schaltgruppe, powerTransformerEnd3.endNumber, powerTransformerEnd3.grounded);
                     powerTransformerEnd3.phaseAngleClock = (0, utils_2.getSchaltgruppeAngleClock)(schaltgruppe, powerTransformerEnd3.endNumber);
+                    // NullSystem Impedanzen (nur Reaktanzen)
+                    let groundingCount = (0, utils_2.getGroundingCountFromWindingConnection)(powerTransformer);
+                    const retVal = (0, utils_2.calculateComplexZeroSequImpedanzenTrafo)([r0kr1, x0kr1, r0kr2, x0kr2], [r00r1, x00r1, r00r2, x00r2], [ur1, ur2, ur3], groundingCount, powerTransformer);
+                    if (retVal[1] == false) { //return value is false, thus there was an error in computation
+                        this.logger.warn(`PowerTransformer3W ${i7Data.id} ${powerTransformer.mrid} hat unterbestimmte Definitionen in den Nullsystemdaten.`);
+                    }
+                    const zeroSequImpedanzWx = retVal[0];
+                    powerTransformerEnd1.x0 = zeroSequImpedanzWx.x01;
+                    powerTransformerEnd1.r0 = zeroSequImpedanzWx.r01;
+                    powerTransformerEnd2.x0 = zeroSequImpedanzWx.x02;
+                    powerTransformerEnd2.r0 = zeroSequImpedanzWx.r02;
+                    powerTransformerEnd3.x0 = zeroSequImpedanzWx.x03;
+                    powerTransformerEnd3.r0 = zeroSequImpedanzWx.r03;
                     // Transormator Anschlusspunkte nach Spannungsebene sortieren
                     this.sortTransformerEnd(powerTransformer, 'ratedU', 'desc');
                     //TODO
@@ -5044,93 +5034,70 @@ class ConverterIntegral7 {
         for (const terminal of acLineSegment.terminals.values()) {
             const ir = (0, parser_utils_1.isNumericI7)(data.ir) ? (0, parser_utils_1.convertToNumberI7)(data.ir) : ((0, parser_utils_1.isNumericI7)(assetType === null || assetType === void 0 ? void 0 : assetType.ratedCurrent) ? (0, parser_utils_1.convertToNumberI7)(assetType.ratedCurrent) : undefined);
             const igrenz = (0, parser_utils_1.isNumericI7)(data.igrenz) ? (0, parser_utils_1.convertToNumberI7)(data.igrenz) : ((0, parser_utils_1.isNumericI7)(assetType === null || assetType === void 0 ? void 0 : assetType.limitingCurrent) ? (0, parser_utils_1.convertToNumberI7)(assetType.limitingCurrent) : undefined);
-            this.setConductingEquipmentOperationalLimit(cimModel, acLineSegment.name, terminal, ir, new CurrentLimit_1.CurrentLimit(common_utils_1.CommonUtils.generateUUID(), acLineSegment.name), igrenz);
+            const equipmentKey = acLineSegment.getUUID();
+            this.setConductingEquipmentOperationalLimit(cimModel, acLineSegment.name, terminal, equipmentKey, ir, cim_class_names_1.ClassNames.CurrentLimit, igrenz);
             //PSRType
-            const psrType = (0, utils_1.createIfNotExitsPSRType)(cimModel, data.typ);
+            const psrType = (0, utils_1.createIfNotExitsPSRType)(cimModel, data.typ, this.configUuid);
             acLineSegment.psrTypeUUID = psrType.mrid;
         }
     }
-    setConductingEquipmentOperationalLimit(cimModel, name, terminal, physLimit, limit, igrenz) {
-        let operationalLimitSet = undefined;
-        let operationalLimitTypePatl = undefined;
-        if (limit instanceof CurrentLimit_1.CurrentLimit) {
-            //mandatory for aclinesegments and powertransformers
-            const ir = physLimit;
-            let currentLimitTatl = undefined;
-            let currentLimitPatl = undefined;
-            let operationalLimitTypeTatl = undefined;
-            if (ir) {
-                currentLimitPatl = limit;
-                currentLimitPatl.value = new CurrentFlow_1.CurrentFlow(ir, UnitMultiplier_1.UnitMultiplier.none, UnitSymbol_1.UnitSymbol.A);
-                cimModel.addCurrentLimit(currentLimitPatl);
-            }
-            //optional
-            if (igrenz) {
-                currentLimitTatl = new CurrentLimit_1.CurrentLimit(common_utils_1.CommonUtils.generateUUID(), `${name}`);
-                currentLimitTatl.value = new CurrentFlow_1.CurrentFlow(igrenz, UnitMultiplier_1.UnitMultiplier.none, UnitSymbol_1.UnitSymbol.A);
-                cimModel.addCurrentLimit(currentLimitTatl);
-            }
-            if (currentLimitPatl && currentLimitTatl) {
-                operationalLimitSet = new OperationalLimitSet_1.OperationalLimitSet(common_utils_1.CommonUtils.generateUUID(), `${name}`);
-                cimModel.addOperationalLimitSet(operationalLimitSet);
-                operationalLimitSet.addOperationalLimit(currentLimitPatl);
-                currentLimitPatl.operationalLimitSet = operationalLimitSet;
-                operationalLimitTypePatl = this.createIfNotExistOperationalLimitType(cimModel, 'patl', LimitTypeKind_1.LimitTypeKind.patl, OperationalLimitDirectionKind_1.OperationalLimitDirectionKind.absoluteValue);
-                operationalLimitTypePatl.addOperationalLimit(currentLimitPatl);
-                currentLimitPatl.operationalLimitType = operationalLimitTypePatl;
-                operationalLimitSet.terminal = terminal;
-                operationalLimitSet.addOperationalLimit(currentLimitTatl);
-                currentLimitTatl.operationalLimitSet = operationalLimitSet;
-                operationalLimitTypeTatl = this.createIfNotExistOperationalLimitType(cimModel, 'tatl', LimitTypeKind_1.LimitTypeKind.tatl, OperationalLimitDirectionKind_1.OperationalLimitDirectionKind.absoluteValue);
-                operationalLimitTypeTatl.addOperationalLimit(currentLimitTatl);
-                currentLimitTatl.operationalLimitType = operationalLimitTypeTatl;
-            }
-            else if (currentLimitPatl) {
-                operationalLimitSet = new OperationalLimitSet_1.OperationalLimitSet(common_utils_1.CommonUtils.generateUUID(), `${name}`);
-                cimModel.addOperationalLimitSet(operationalLimitSet);
-                operationalLimitSet.addOperationalLimit(currentLimitPatl);
-                currentLimitPatl.operationalLimitSet = operationalLimitSet;
-                operationalLimitTypePatl = this.createIfNotExistOperationalLimitType(cimModel, 'patl', LimitTypeKind_1.LimitTypeKind.patl, OperationalLimitDirectionKind_1.OperationalLimitDirectionKind.absoluteValue);
-                operationalLimitTypePatl.addOperationalLimit(currentLimitPatl);
-                currentLimitPatl.operationalLimitType = operationalLimitTypePatl;
-                operationalLimitSet.terminal = terminal;
-            }
-            else if (currentLimitTatl) {
-                operationalLimitSet = new OperationalLimitSet_1.OperationalLimitSet(common_utils_1.CommonUtils.generateUUID(), `${name}`);
-                cimModel.addOperationalLimitSet(operationalLimitSet);
-                operationalLimitSet.addOperationalLimit(currentLimitTatl);
-                currentLimitTatl.operationalLimitSet = operationalLimitSet;
-                operationalLimitTypeTatl = this.createIfNotExistOperationalLimitType(cimModel, 'tatl', LimitTypeKind_1.LimitTypeKind.tatl, OperationalLimitDirectionKind_1.OperationalLimitDirectionKind.absoluteValue);
-                operationalLimitTypeTatl.addOperationalLimit(currentLimitTatl);
-                currentLimitTatl.operationalLimitType = operationalLimitTypeTatl;
-                operationalLimitSet.terminal = terminal;
+    /**
+     * @param equipmentKey Generierung einer persistenter UUID v5. Für PowerTransformer wird UUID des PowerTransformerEnds verwendet. Andernfalls die UUID des ConductingEquipments
+     * */
+    setConductingEquipmentOperationalLimit(cimModel, name, terminal, equipmentKey, limit, limitType, igrenz) {
+        if ((limit !== undefined && limit > 0) && (igrenz !== undefined && igrenz > 0))
+            return;
+        /** OperationalLimitSet erstellen */
+        const operationalLimitSetKey = terminal.getUUID() + equipmentKey;
+        const operationalLimitSetUUID = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.OperationalLimitSet, this.configUuid, operationalLimitSetKey);
+        const operationalLimitSet = new OperationalLimitSet_1.OperationalLimitSet(operationalLimitSetUUID, `${name}`);
+        operationalLimitSet.terminal = terminal;
+        cimModel.addOperationalLimitSet(operationalLimitSet);
+        switch (limitType) {
+            case cim_class_names_1.ClassNames.CurrentLimit: {
+                if (limit !== undefined && limit > 0) {
+                    const operationalLimitTypePatl = this.createIfNotExistOperationalLimitType(cimModel, 'patl', LimitTypeKind_1.LimitTypeKind.patl, OperationalLimitDirectionKind_1.OperationalLimitDirectionKind.absoluteValue);
+                    const currentLimitPatlKey = operationalLimitTypePatl.getUUID() + operationalLimitSet.getUUID();
+                    const currentLimitPatlUuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.CurrentLimit, this.configUuid, currentLimitPatlKey);
+                    const currentLimitPatl = new CurrentLimit_1.CurrentLimit(currentLimitPatlUuid, `${name}`);
+                    currentLimitPatl.value = new CurrentFlow_1.CurrentFlow(limit, UnitMultiplier_1.UnitMultiplier.none, UnitSymbol_1.UnitSymbol.A);
+                    util_cim_model_1.UtilCimModel.associateOperationalLimitWithSetType(currentLimitPatl, operationalLimitSet, operationalLimitTypePatl);
+                    cimModel.addCurrentLimit(currentLimitPatl);
+                }
+                if (igrenz !== undefined && igrenz > 0) {
+                    const operationalLimitTypeTatl = this.createIfNotExistOperationalLimitType(cimModel, 'tatl', LimitTypeKind_1.LimitTypeKind.tatl, OperationalLimitDirectionKind_1.OperationalLimitDirectionKind.absoluteValue);
+                    const currentLimitTatlKey = operationalLimitTypeTatl.getUUID() + operationalLimitSet.getUUID();
+                    const currentLimitTatlUuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.CurrentLimit, this.configUuid, currentLimitTatlKey);
+                    const currentLimitTatl = new CurrentLimit_1.CurrentLimit(currentLimitTatlUuid, `${name}`);
+                    currentLimitTatl.value = new CurrentFlow_1.CurrentFlow(igrenz, UnitMultiplier_1.UnitMultiplier.none, UnitSymbol_1.UnitSymbol.A);
+                    util_cim_model_1.UtilCimModel.associateOperationalLimitWithSetType(currentLimitTatl, operationalLimitSet, operationalLimitTypeTatl);
+                    cimModel.addCurrentLimit(currentLimitTatl);
+                }
+                break;
             }
-        }
-        else if (limit instanceof ApparentPowerLimit_1.ApparentPowerLimit) {
-            let apparentPowerLimit = undefined;
-            if (physLimit != undefined) {
-                apparentPowerLimit = limit;
-                apparentPowerLimit.uuid = common_utils_1.CommonUtils.generateUUID();
-                apparentPowerLimit.name = `${name}`;
-                cimModel.addCurrentLimit(apparentPowerLimit);
-                apparentPowerLimit.value = new ApparentPower_1.ApparentPower(physLimit, UnitMultiplier_1.UnitMultiplier.M, UnitSymbol_1.UnitSymbol.VA);
-                if (apparentPowerLimit) {
-                    operationalLimitSet = new OperationalLimitSet_1.OperationalLimitSet(common_utils_1.CommonUtils.generateUUID(), `${name}`);
-                    cimModel.addOperationalLimitSet(operationalLimitSet);
-                    operationalLimitSet.addOperationalLimit(apparentPowerLimit);
-                    apparentPowerLimit.operationalLimitSet = operationalLimitSet;
-                    operationalLimitTypePatl = this.createIfNotExistOperationalLimitType(cimModel, 'patl', LimitTypeKind_1.LimitTypeKind.patl, OperationalLimitDirectionKind_1.OperationalLimitDirectionKind.absoluteValue);
-                    operationalLimitTypePatl.addOperationalLimit(apparentPowerLimit);
-                    apparentPowerLimit.operationalLimitType = operationalLimitTypePatl;
-                    operationalLimitSet.terminal = terminal;
+            case cim_class_names_1.ClassNames.ApparentPowerLimit: {
+                if (limit !== undefined && limit > 0) {
+                    const operationalLimitTypePatl = this.createIfNotExistOperationalLimitType(cimModel, 'patl', LimitTypeKind_1.LimitTypeKind.patl, OperationalLimitDirectionKind_1.OperationalLimitDirectionKind.absoluteValue);
+                    const apparentLimitPatlKey = operationalLimitTypePatl.getUUID() + operationalLimitSet.getUUID();
+                    const apparentLimitPatlUuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.ApparentPowerLimit, this.configUuid, apparentLimitPatlKey);
+                    const apparentLimitPatl = new ApparentPowerLimit_1.ApparentPowerLimit(apparentLimitPatlUuid, `${name}`);
+                    apparentLimitPatl.value = new ApparentPower_1.ApparentPower(limit, UnitMultiplier_1.UnitMultiplier.M, UnitSymbol_1.UnitSymbol.VA);
+                    util_cim_model_1.UtilCimModel.associateOperationalLimitWithSetType(apparentLimitPatl, operationalLimitSet, operationalLimitTypePatl);
+                    cimModel.addApparentPowerLimit(apparentLimitPatl);
                 }
+                break;
+            }
+            default: {
+                console.log(`setConductingEquipmentOperationalLimit: unknown limit type ${limitType}`);
             }
         }
     }
     createIfNotExistOperationalLimitType(cimModel, name, type, direction) {
         let operationalLimitType = cimModel.getOperationalLimitTypeByName(name);
         if (!operationalLimitType) {
-            operationalLimitType = new OperationalLimitType_1.OperationalLimitType(common_utils_1.CommonUtils.generateUUID(), name);
+            const key = type + direction;
+            const uuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.OperationalLimitType, this.configUuid, key);
+            operationalLimitType = new OperationalLimitType_1.OperationalLimitType(uuid, name);
             operationalLimitType.direction = direction;
             operationalLimitType.limitType = type;
             cimModel.addOperationalLimitType(operationalLimitType);
@@ -5142,7 +5109,9 @@ class ConverterIntegral7 {
         let terminal;
         if (object instanceof ConnectivityNode_1.ConnectivityNode) {
             const cn = object;
-            terminal = new Terminal_1.Terminal(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)([conductingEquipment.getUUID().substring(0, 8), '_T']));
+            const key = cn.getUUID() + (conductingEquipment === null || conductingEquipment === void 0 ? void 0 : conductingEquipment.getUUID());
+            const uuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.Terminal, this.configUuid, key);
+            terminal = new Terminal_1.Terminal(uuid, (0, util_create_1.createNotation)([conductingEquipment.getUUID().substring(0, 8), '_T']));
             isNameSet = true;
             terminal.setConnectivityNode(cn);
             //terminal.setConnectivityNodeUUID(cn.getUUID());
@@ -5194,7 +5163,9 @@ class ConverterIntegral7 {
                 const object = cimModelBD.getObject(anschlussUUID);
                 if (object instanceof ConnectivityNode_1.ConnectivityNode) {
                     cn = object;
-                    terminal = new Terminal_1.Terminal(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)([conductingEquipment.getUUID().substring(0, 8), '_', cn.getUUID().substring(0, 8), '_BD_T']));
+                    const key = cn.getUUID() + (conductingEquipment === null || conductingEquipment === void 0 ? void 0 : conductingEquipment.getUUID());
+                    const uuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.Terminal, this.configUuid, key);
+                    terminal = new Terminal_1.Terminal(uuid, (0, util_create_1.createNotation)([conductingEquipment.getUUID().substring(0, 8), '_', cn.getUUID().substring(0, 8), '_BD_T']));
                     /** wchtig uuid zu setzen, da sonst ein memory leak entsteht */
                     terminal.connectivityNodeUUID = cn.mrid;
                     terminal.phases = phase;
@@ -5248,7 +5219,7 @@ class ConverterIntegral7 {
     createBoundaryEquivalentInjection(frame, cn) {
         let equivalentInjection = undefined;
         //Test if frame is boundary.
-        if (!frame.boundary) {
+        if (false /*!frame.boundary*/) {
             //Test if boundary Injection for this mas already exists
             let equivinj_exists = false;
             frame.cimModel.equivalentInjections.forEach((equivinj, uuid) => {
@@ -5258,14 +5229,18 @@ class ConverterIntegral7 {
                 }
             });
             if (!equivinj_exists) {
+                const keyEquivalentInjection = frame.tsoName + cn.getUUID();
+                const uuidEquivalentInjection = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.EquivalentInjection, this.configUuid, keyEquivalentInjection);
+                equivalentInjection = new EquivalentInjection_1.EquivalentInjection(uuidEquivalentInjection, (0, util_create_1.createNotation)([frame.tsoName, '_BD-EI', '_' + cn.mrid.substring(0, 8)], 32, true));
                 //create terminal
-                let tmp_terminal = new Terminal_1.Terminal(common_utils_1.CommonUtils.generateUUID());
+                const key = cn.getUUID() + equivalentInjection.getUUID();
+                const uuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.Terminal, this.configUuid, key);
+                let tmp_terminal = new Terminal_1.Terminal(uuid);
                 tmp_terminal.setConnectivityNodeUUID(cn.mrid);
                 tmp_terminal.phases = PhaseCode_1.PhaseCode.ABC;
                 tmp_terminal.connected = true;
                 tmp_terminal.sequenceNumber = 1;
                 //create equivalent injection as boundary injection
-                equivalentInjection = new EquivalentInjection_1.EquivalentInjection(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)([frame.tsoName, '_BD-EI', '_' + cn.mrid.substring(0, 8)], 32, true));
                 equivalentInjection.p = 0;
                 equivalentInjection.q = 0;
                 equivalentInjection.regulationStatus = false;
@@ -5676,8 +5651,7 @@ class ConverterIntegral7 {
         if (terminal) {
             // Topologie
             powerTransformerEnd.terminal = terminal;
-            // ApparentPowerLimit
-            this.setConductingEquipmentOperationalLimit(cimModel, `W${powerTransformerEnd.endNumber}` + (powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name), terminal, sdauer, new ApparentPowerLimit_1.ApparentPowerLimit());
+            this.setConductingEquipmentOperationalLimit(cimModel, `W${powerTransformerEnd.endNumber}${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`, terminal, powerTransformer.getUUID(), sdauer, cim_class_names_1.ClassNames.ApparentPowerLimit);
             let isTrafo2w = i7Data.trafowicklung3w3 === undefined ? true : false;
             // Erdung / Sternpunkt
             if (sternpunktKnotenMap.has(i7Data.id) && isTrafo2w) {
@@ -5883,36 +5857,38 @@ class ConverterIntegral7 {
                 if (uMax === uMin) {
                     const stop = true;
                 }
-                const ratioTapChangerTable = new RatioTapChangerTable_1.RatioTapChangerTable(common_utils_1.CommonUtils.generateUUID(), `${i7Data.bezeichner} W_${tapChangerNumber}`);
+                const keyTable = ratioTapChanger === null || ratioTapChanger === void 0 ? void 0 : ratioTapChanger.getUUID();
+                const uuidTable = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.RatioTapChangerTable, this.configUuid, keyTable);
+                const ratioTapChangerTable = new RatioTapChangerTable_1.RatioTapChangerTable(uuidTable, `${i7Data.bezeichner} W_${tapChangerNumber}`);
                 let step_tmp = 0;
                 let start_step_tmp = step_tmp;
                 //voltage decrement
                 if (uMin < 0) {
                     for (let i = 0; i < Math.abs(lowerVoltageStepCount); i++) {
-                        (0, util_create_1.createRatioTapChangerTablePoint)(ratioTapChangerTable, i7TapArray[i], (1 - ((Math.abs(lowerVoltageStepDecrement) * Math.abs(lowerVoltageStepCount - i)) / 100)));
+                        (0, util_create_1.createRatioTapChangerTablePoint)(ratioTapChangerTable, i7TapArray[i], (1 - ((Math.abs(lowerVoltageStepDecrement) * Math.abs(lowerVoltageStepCount - i)) / 100)), this.configUuid);
                         step_tmp = i;
                     }
                 }
                 else {
                     for (let i = 0; i < Math.abs(lowerVoltageStepCount); i++) {
-                        (0, util_create_1.createRatioTapChangerTablePoint)(ratioTapChangerTable, i7TapArray[i], (1 + ((lowerVoltageStepDecrement * Math.abs(lowerVoltageStepCount - i)) / 100)));
+                        (0, util_create_1.createRatioTapChangerTablePoint)(ratioTapChangerTable, i7TapArray[i], (1 + ((lowerVoltageStepDecrement * Math.abs(lowerVoltageStepCount - i)) / 100)), this.configUuid);
                         step_tmp = i;
                     }
                 }
                 //neutral step
                 step_tmp++;
-                (0, util_create_1.createRatioTapChangerTablePoint)(ratioTapChangerTable, i7TapArray[step_tmp], 1);
+                (0, util_create_1.createRatioTapChangerTablePoint)(ratioTapChangerTable, i7TapArray[step_tmp], 1, this.configUuid);
                 step_tmp++;
                 start_step_tmp = step_tmp;
                 //voltage increment
                 if (uMax > 0) {
                     for (let i = start_step_tmp; i < start_step_tmp + Math.abs(upperVoltageStepCount); i++) {
-                        (0, util_create_1.createRatioTapChangerTablePoint)(ratioTapChangerTable, i7TapArray[i], (1 + ((upperVoltageStepIncrement * (i - start_step_tmp + 1)) / 100)));
+                        (0, util_create_1.createRatioTapChangerTablePoint)(ratioTapChangerTable, i7TapArray[i], (1 + ((upperVoltageStepIncrement * (i - start_step_tmp + 1)) / 100)), this.configUuid);
                     }
                 }
                 else {
                     for (let i = start_step_tmp; i < start_step_tmp + Math.abs(upperVoltageStepCount); i++) {
-                        (0, util_create_1.createRatioTapChangerTablePoint)(ratioTapChangerTable, i7TapArray[i], (1 - ((upperVoltageStepIncrement * (i - start_step_tmp + 1)) / 100)));
+                        (0, util_create_1.createRatioTapChangerTablePoint)(ratioTapChangerTable, i7TapArray[i], (1 - ((upperVoltageStepIncrement * (i - start_step_tmp + 1)) / 100)), this.configUuid);
                     }
                 }
                 tapChanger.ratioTapChangerTable = ratioTapChangerTable;
@@ -6129,7 +6105,7 @@ class ConverterIntegral7 {
             // TODO
             powerTransformerEnd.rground = defaultValuesConfig.TransformerEnd.rground;
             if (!junctionUUID) {
-                /** Fall 1 Wenn der Knoten keinen Schaltelement hat, dann direkte Erdung */
+                /** Fall 1 Wenn der Knoten kein Schaltelement hat, dann direkte Erdung */
                 //TODO
                 // rground und xground aus der default-config verwenden?
                 powerTransformerEnd.xground = defaultValuesConfig.TransformerEnd.xground;