@enervance/insight-cim-model 0.0.169 → 0.0.171

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

@@ -45,9 +45,9 @@ const AMPRIONConnectivityNode_1 = require("../../model/extensions/amprion/core/A
 const AMPRIONLine_1 = require("../../model/extensions/amprion/core/AMPRIONLine.js");
 const AMPRIONSubstation_1 = require("../../model/extensions/amprion/core/AMPRIONSubstation.js");
 const AMPRIONSeriesCompensator_1 = require("../../model/extensions/amprion/wires/AMPRIONSeriesCompensator.js");
-const EVPowerTransformerEndInfo_1 = require("../../model/extensions/enervance/assetinfo/EVPowerTransformerEndInfo.js");
-const EVPowerTransformerInfo_1 = require("../../model/extensions/enervance/assetinfo/EVPowerTransformerInfo.js");
-const EVTapChangerInfo_1 = require("../../model/extensions/enervance/assetinfo/EVTapChangerInfo.js");
+const INTEGRALPowerTransformerEndInfo_1 = require("../../model/extensions/integral/assetinfo/INTEGRALPowerTransformerEndInfo.js");
+const INTEGRALPowerTransformer3WInfo_1 = require("../../model/extensions/integral/assetinfo/INTEGRALPowerTransformer3WInfo.js");
+const INTEGRALTapChangerInfo_1 = require("../../model/extensions/integral/assetinfo/INTEGRALTapChangerInfo.js");
 const EVWireInfo_1 = require("../../model/extensions/enervance/assetinfo/EVWireInfo.js");
 const GeneratingUnit_1 = require("../../model/generation/GeneratingUnit.js");
 const GeneratorControlSource_1 = require("../../model/generation/GeneratorControlSource.js");
@@ -139,6 +139,7 @@ const DiagramObject_1 = require("../../model/diagram/DiagramObject.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");
+const INTEGRALPowerTransformer2WInfo_1 = require("../../model/extensions/integral/assetinfo/INTEGRALPowerTransformer2WInfo.js");
 class ConverterIntegral7 {
     constructor() {
         /** Exportnetze gemäß Konfiguration  */
@@ -147,6 +148,7 @@ class ConverterIntegral7 {
         this.exportFramesBoundary = new Map();
         /** ContainerModel mit Default-CIM-Instanzen */
         this.cimModelDefault = new INTEGRALModelContainer_1.INTEGRALModelContainer();
+        this.exportFrameDefault = new export_frame_i7_1.I7ExportFrame('default');
         /** Das Array hält die verfügbaren Tabellennamen der Projektdatenbank.
          *  Integral 7 legt keine leeren Tabellen an.
          *  Das heißt: wenn es keine Typinformation für Kabel gepflegt sind, dann existiert keine Tabelle in der Datenbank */
@@ -256,9 +258,13 @@ class ConverterIntegral7 {
                     let endTime = perf_hooks.performance.now();
                     console.log(`\nSerializeModel ${geoRegion.name} ${(endTime - startTime) / 1000} seconds\n`);
                 }
+                console.log('Serialize Default Profile');
+                this.exportFrameDefault.openXMLModel();
+                this.exportFrameDefault.serializeModel(defaultValuesConfig);
+                yield this.exportFrameDefault.closeXMLModel();
                 /** .zip-Datei erstellen */
                 const zip = new JSZip();
-                const gridFrames = [...this.exportFrames.values(), ...this.exportFramesBoundary.values()]
+                const gridFrames = [...this.exportFrames.values(), ...this.exportFramesBoundary.values(), this.exportFrameDefault]
                     .filter((value, index, self) => self.indexOf(value) === index);
                 for (const frame of gridFrames) {
                     for (const xmlSerializer of frame.profileXmlSerializers.values()) {
@@ -430,7 +436,7 @@ class ConverterIntegral7 {
             /** Einspeisungen -> EnergySources or EquivalentInjection or ExternalNetworkInjection */
             if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
                 startTime = performance.now();
-                yield this.convertEinspeisungen(cimModel, integral7Modell.targetVoltages, soSfKnoten, objectMappingConfig);
+                yield this.convertEinspeisungen(cimModel, integral7Modell.targetVoltages, soSfKnoten, objectMappingConfig, energySourceTypeMappingConfig);
                 logExecutionTime(this.logger, startTime, `convertEinspeisungen`);
             }
             /** Generatoren -> SynchronousMachine */
@@ -751,16 +757,18 @@ class ConverterIntegral7 {
         });
     }
     convertStandorte(cimModel, integral7, whereID, defaultValuesConfig) {
+        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.STANDORT)) {
                 const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.STANDORT, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.STANDORT), whereID));
                 for (const i7Data of result) {
                     const i7name = (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', (0, utils_2.ueberpruefeZeichenkette)(i7Data.ukz), '_S'], 32);
-                    const substation = new AMPRIONSubstation_1.AMPRIONSubstation((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), i7name, i7Data.kurzname, i7Data.kommentar, i7Data.stationsnummer, i7Data.ukz);
+                    const substation = new AMPRIONSubstation_1.AMPRIONSubstation((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), i7Data.bezeichner, i7Data.kurzname, i7Data.kommentar, i7Data.stationsnummer, i7Data.ukz);
                     const i7Schluessel = integral_prefix_1.STANDORT_PRAEFIX +
-                        i7Data.ukz +
+                        ((_a = i7Data.ukz) !== null && _a !== void 0 ? _a : '') +
                         integral_prefix_1.MITTIGER_PUNKT +
                         (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
+                    substation.key = i7Schluessel;
                     let subregion = cimModel.getSubGeographicalRegion(this.integralID2UUID.get(i7Data.subgeoregion));
                     if (!subregion) {
                         const region = (0, utils_1.createIfNotExitsGeoregionByName)(cimModel, defaultValuesConfig.GeographicalRegion.name, this.configUuid);
@@ -811,12 +819,13 @@ class ConverterIntegral7 {
                     else if (!(object instanceof Substation_1.Substation)) {
                         continue;
                     }
-                    const i7Schluessel = substation.description +
+                    const i7Schluessel = substation.key +
                         integral_prefix_1.KNOTEN_STANDORT_PRAEFIX +
                         i7Data.un +
                         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 vl = new VoltageLevel_1.VoltageLevel((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), i7Data.bezeichner, i7Data.kurzname, i7Schluessel);
+                    vl.key = i7Schluessel;
                     const facility = util_cim_model_1.UtilCimModel.createFacilityInstanceForPsr(cimModel, vl, cim_constants_1.CimAssetAliasNames.VoltageLevel, this.configUuid);
                     if (i7Data.baujahr) {
                         util_cim_model_1.UtilCimModel.setLifecycleDate(facility, i7Data.baujahr);
@@ -875,11 +884,12 @@ class ConverterIntegral7 {
                         this.logger.warn(`Schaltfeld ${i7Data.id}/${i7Data.guid} ist keinem Schaltanlagenabschnitt zugeornet.`);
                         continue;
                     }
-                    const i7Schluessel = voltageLevel.description +
+                    const i7Schluessel = voltageLevel.key +
                         integral_prefix_1.SCHALTFELD_PRAEFIX +
                         (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);
+                    const bay = new AMPRIONBay_1.AMPRIONBay(cimrdfid, i7Data === null || i7Data === void 0 ? void 0 : i7Data.bezeichner, i7Data.kurzname, i7Schluessel);
+                    bay.key = i7Schluessel;
                     if (i7Data.feldnummer > 0) {
                         const stop = true;
                     }
@@ -929,12 +939,12 @@ class ConverterIntegral7 {
                     if (substation) {
                         vl.substation = substation;
                         substation.addVoltageLevel(vl);
-                        const i7Schluessel = substation.description +
+                        const i7Schluessel = substation.key +
                             integral_prefix_1.KNOTEN_STANDORT_PRAEFIX +
                             i7Data.un +
                             integral_prefix_1.MITTIGER_PUNKT +
                             (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
-                        vl.description = i7Schluessel;
+                        vl.key = i7Schluessel;
                         connectivityNode.description = i7Schluessel;
                     }
                     else {
@@ -1159,9 +1169,6 @@ class ConverterIntegral7 {
                         cimModel.addMultiplierFactor(mf);
                         load.multiplierFactorUUID = mf.getUUID();
                     }
-                    if (load.getUUID() === '7c1d4120-fdaf-4bc1-aba1-9e8e76aa7a3b') {
-                        const stop = true;
-                    }
                     /** SSH */
                     const powerData = (0, utils_2.getActiveReactivePower2)(i7Data, mf);
                     // const powerDatav2 = getActiveReactivePower2(i7Data, mf);
@@ -1815,7 +1822,7 @@ class ConverterIntegral7 {
     convertErsatzQuerZweige2ExternalNetworkInjection(cimModel, targetVoltages, result) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             for (const i7Data of result) {
-                const externalNetworkInjection = new ExternalNetworkInjection_1.ExternalNetworkInjection((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_ENI']), i7Data.kurzname);
+                const externalNetworkInjection = new ExternalNetworkInjection_1.ExternalNetworkInjection((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), i7Data.bezeichner, i7Data.kurzname);
                 // ??
                 const usoll = (0, parser_utils_1.isNumericI7)(i7Data.usoll) ? (0, parser_utils_1.convertToNumberI7)(i7Data.usoll) : undefined;
                 // TODO: Beteiligen sich Ersatzquerzweige an der Wirkleistungsregelung? Hier: NEIN
@@ -2599,7 +2606,7 @@ class ConverterIntegral7 {
                     const prio = i7Data.einspprio;
                     const inBetrieb = (0, parser_utils_1.isBooleanI7)(i7Data.betrieb) ? (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb) : false;
                     const rdfid = (0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid);
-                    const energySource = new EnergySource_1.EnergySource(rdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), rdfid.substring(0, 8), '_ES'], 32, true), i7Data.kurzname);
+                    const energySource = new EnergySource_1.EnergySource(rdfid, i7Data.bezeichner, i7Data.kurzname);
                     energySource.nominalVoltage = (_c = (_b = (_a = energySource.equipmentContainer) === null || _a === void 0 ? void 0 : _a.baseVoltage) === null || _b === void 0 ? void 0 : _b.nominalVoltage) === null || _c === void 0 ? void 0 : _c.value;
                     energySource.normallyInService = inBetrieb;
                     const powerData = (0, utils_2.getActiveReactivePower)(i7Data);
@@ -2608,7 +2615,7 @@ class ConverterIntegral7 {
                     this.setTopologyEnergySourceConsumerObject(cimModel, energySource, i7Data);
                     // PSRType
                     /** 1 Primärergie-Angabe */
-                    let typeName = (_d = energySourceTypeMappingConfig.find(it => it.i7Name === i7Data.nameprimaertyp)) === null || _d === void 0 ? void 0 : _d.ePlanningType;
+                    let typeName = (_d = energySourceTypeMappingConfig === null || energySourceTypeMappingConfig === void 0 ? void 0 : energySourceTypeMappingConfig.find(it => it.i7Name === i7Data.nameprimaertyp)) === null || _d === void 0 ? void 0 : _d.ePlanningType;
                     /** 2 Anhand des Namens vom Objekt */
                     if (!typeName) {
                         typeName = (0, utils_1.getTypeNameFromStringByRegEx)(i7Data.bezeichner, energySourceTypeMappingConfig);
@@ -2765,7 +2772,7 @@ class ConverterIntegral7 {
         });
     }
     setTopologyEnergySourceConsumerObject(cimModel, condEquip, i7Data, targetVoltages, generatingUnit, isStatcom) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
         const inBetrieb = (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb);
         condEquip.normallyInService = inBetrieb;
         const connectivityNode = cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss));
@@ -3099,41 +3106,45 @@ class ConverterIntegral7 {
                 //TODO: Überarbeitung notwendig, da hier der Präfix nicht eindeutig für Einspeisungen ermittelt werden kann.
                 let i7Schluessel = '';
                 if (condEquip instanceof EnergyConsumer_1.EnergyConsumer) {
-                    i7Schluessel = (0, utils_2.getDescription)(equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getSubstation()) +
+                    i7Schluessel = ((_d = (_c = equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getSubstation()) === null || _c === void 0 ? void 0 : _c.key) !== null && _d !== void 0 ? _d : '') +
                         integral_prefix_1.BELASTUNG_PRAEFIX + i7Data.bezeichner;
                 }
                 else if (condEquip instanceof EquivalentInjection_1.EquivalentInjection) {
-                    i7Schluessel = (0, utils_2.getDescription)(equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getSubstation()) +
+                    i7Schluessel = ((_f = (_e = equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getSubstation()) === null || _e === void 0 ? void 0 : _e.key) !== null && _f !== void 0 ? _f : '') +
                         integral_prefix_1.ERSATZQUERZWEIG_PRAEFIX + i7Data.bezeichner;
                 }
                 else if (condEquip instanceof StaticVarCompensator_1.StaticVarCompensator) {
-                    i7Schluessel = (0, utils_2.getDescription)(equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getSubstation()) +
+                    i7Schluessel = ((_h = (_g = equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getSubstation()) === null || _g === void 0 ? void 0 : _g.key) !== null && _h !== void 0 ? _h : '') +
                         integral_prefix_1.STATCOM_PRAEFIX + i7Data.bezeichner;
                 }
                 else if (condEquip instanceof ExternalNetworkInjection_1.ExternalNetworkInjection) {
-                    i7Schluessel = (0, utils_2.getDescription)(equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getSubstation()) +
+                    i7Schluessel = ((_k = (_j = equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getSubstation()) === null || _j === void 0 ? void 0 : _j.key) !== null && _k !== void 0 ? _k : '') +
+                        integral_prefix_1.EINSPEISUNG_PRAEFIX + i7Data.bezeichner;
+                }
+                else if (condEquip instanceof EnergySource_1.EnergySource) {
+                    i7Schluessel = ((_m = (_l = equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getSubstation()) === null || _l === void 0 ? void 0 : _l.key) !== null && _m !== void 0 ? _m : '') +
                         integral_prefix_1.EINSPEISUNG_PRAEFIX + i7Data.bezeichner;
                 }
                 else if (condEquip instanceof VsConverter_1.VsConverter) {
-                    i7Schluessel = (0, utils_2.getDescription)(equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getSubstation()) +
+                    i7Schluessel = ((_p = (_o = equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getSubstation()) === null || _o === void 0 ? void 0 : _o.key) !== null && _p !== void 0 ? _p : '') +
                         integral_prefix_1.HGUEKOPFVSC_PRAEFIX + i7Data.bezeichner;
                 }
                 else if (condEquip instanceof CsConverter_1.CsConverter) {
-                    i7Schluessel = (0, utils_2.getDescription)(equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getSubstation()) +
+                    i7Schluessel = ((_r = (_q = equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getSubstation()) === null || _q === void 0 ? void 0 : _q.key) !== null && _r !== void 0 ? _r : '') +
                         integral_prefix_1.HGUEKOPFKLASSISCH_PRAEFIX + i7Data.bezeichner;
                 }
-                condEquip.description = i7Schluessel;
+                condEquip.key = i7Schluessel;
                 if (hasGeneratingUnit) {
                     const substation = this.determineEquipmentContainer('Substation', cimModel, equipmentContainer);
                     generatingUnit.equipmentContainer = substation;
                 }
             }
             else {
-                this.logger.error(`error --- ${(_c = condEquip === null || condEquip === void 0 ? void 0 : condEquip.constructor) === null || _c === void 0 ? void 0 : _c.name} ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                this.logger.error(`error --- ${(_s = condEquip === null || condEquip === void 0 ? void 0 : condEquip.constructor) === null || _s === void 0 ? void 0 : _s.name} ${i7Data.id} besitzt keinen EquipmentContainer.`);
             }
         }
         else {
-            this.logger.error(`error --- ${(_d = condEquip === null || condEquip === void 0 ? void 0 : condEquip.constructor) === null || _d === void 0 ? void 0 : _d.name}  ${i7Data.id} besitzt keinen ConnectivityNode.`);
+            this.logger.error(`error --- ${(_t = condEquip === null || condEquip === void 0 ? void 0 : condEquip.constructor) === null || _t === void 0 ? void 0 : _t.name}  ${i7Data.id} besitzt keinen ConnectivityNode.`);
         }
         return rControl;
     }
@@ -3746,8 +3757,9 @@ class ConverterIntegral7 {
                         (0, utils_2.ueberpruefeZeichenkette)(i7Data.stkabname);
                     /** Wenn kein Stromkreisobjekt vorhanden ist, dann erstelle ein neues Objekt. */
                     const uuidString = (0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid);
-                    const line = new AMPRIONLine_1.AMPRIONLine(uuidString, (0, util_create_1.createNotation)([name, '_', uuidString.substring(0, 8), '_L'], 32, true), i7Data.stkabname, i7Schluessel);
+                    const line = new AMPRIONLine_1.AMPRIONLine(uuidString, i7Schluessel);
                     line.ukz = i7Data.ukz;
+                    line.key = i7Schluessel;
                     let acLineSegments = [];
                     /** ACLineSegments erstellen */
                     for (const stk of stromkreisabschnitte) {
@@ -3759,14 +3771,15 @@ class ConverterIntegral7 {
                             (0, utils_2.ueberpruefeZeichenkette)(stk.bezeichner);
                         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);
+                        const key = acLineSegment.getUUID();
+                        const uuidWireObject = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.EVWireObject, this.configUuid, key);
+                        acLineSegment.key = i7Schluessel;
+                        const wire = new EVWireObject_1.EVWireObject(uuidWireObject, stk.name);
+                        wire.type = 'Stromkreisabschnitt';
+                        wire.addPowerSystemResource(acLineSegment);
+                        acLineSegment.addAsset(wire);
+                        cimModel.addWireObject(wire);
                         if (stk.baujahr) {
-                            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_cim_model_1.UtilCimModel.setLifecycleDate(wire, stk.baujahr);
                         }
                         let mf = this.cimModelDefault.multiplierFactors.get(this.integralID2UUID.get(stk.multfaktor));
@@ -4113,11 +4126,14 @@ class ConverterIntegral7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TYP_TRAFO2W)) {
                 const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.TYP_TRAFO2W, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TYP_TRAFO2W), []));
                 for (const i7Data of result) {
-                    const typTrafo = new EVPowerTransformerInfo_1.EVPowerTransformerInfo(common_utils_1.CommonUtils.generateUUID(), i7Data.name);
+                    const typTrafo = new INTEGRALPowerTransformer2WInfo_1.INTEGRALPowerTransformer2WInfo(common_utils_1.CommonUtils.generateUUID(), i7Data.name);
+                    typTrafo.sr = i7Data.sr;
+                    typTrafo.ur1 = i7Data.ur1;
+                    typTrafo.ur2 = i7Data.ur2;
                     typTrafo.pLeer = i7Data.p_leer;
                     typTrafo.iLeer = i7Data.i_leer;
-                    typTrafo.ukr12 = i7Data.ukr;
-                    typTrafo.pkr12 = i7Data.pkr;
+                    typTrafo.ukr = i7Data.ukr;
+                    typTrafo.pkr = i7Data.pkr;
                     typTrafo.schaltgruppe = i7Data.schaltgr;
                     typTrafo.spezialRegelung = (0, parser_utils_1.isNumericI7)(i7Data.trafo_spezial) ? (0, parser_utils_1.convertToNumberI7)(i7Data.trafo_spezial) : undefined;
                     typTrafo.x00r1 = i7Data.x00r1;
@@ -4128,12 +4144,12 @@ class ConverterIntegral7 {
                     typTrafo.r0kr2 = i7Data.r0kr2;
                     typTrafo.r00r1 = i7Data.r00r1;
                     typTrafo.r00r2 = i7Data.r00r2;
-                    const typWicklung1 = new EVPowerTransformerEndInfo_1.EVPowerTransformerEndInfo(common_utils_1.CommonUtils.generateUUID());
+                    const typWicklung1 = new INTEGRALPowerTransformerEndInfo_1.INTEGRALPowerTransformerEndInfo(common_utils_1.CommonUtils.generateUUID());
                     typWicklung1.ratedS = new ApparentPower_1.ApparentPower(i7Data.sr, UnitMultiplier_1.UnitMultiplier.m, UnitSymbol_1.UnitSymbol.VA);
                     this.setTransformerEndInfoProperties(typWicklung1, i7Data, 1);
                     typWicklung1.powerTransformerInfo = typTrafo;
                     typTrafo.addTransformerEndInfo(typWicklung1);
-                    const typWicklung2 = new EVPowerTransformerEndInfo_1.EVPowerTransformerEndInfo(common_utils_1.CommonUtils.generateUUID());
+                    const typWicklung2 = new INTEGRALPowerTransformerEndInfo_1.INTEGRALPowerTransformerEndInfo(common_utils_1.CommonUtils.generateUUID());
                     typWicklung2.ratedS = new ApparentPower_1.ApparentPower(i7Data.sr, UnitMultiplier_1.UnitMultiplier.m, UnitSymbol_1.UnitSymbol.VA);
                     // ratedS not needed
                     this.setTransformerEndInfoProperties(typWicklung2, i7Data, 2);
@@ -4142,9 +4158,9 @@ class ConverterIntegral7 {
                     // const aktstufe = `aktstufe_s${endNumber}`;
                     // const regelung = `regelung_s${endNumber}`;
                     // wicklung.connectionKind
-                    this.cimModelDefault.addEvPowerTransformerInfo(typTrafo);
-                    this.cimModelDefault.addEvPowerTransformerEndInfo(typWicklung1);
-                    this.cimModelDefault.addEvPowerTransformerEndInfo(typWicklung2);
+                    this.cimModelDefault.addPowerTransformerInfo(typTrafo);
+                    this.cimModelDefault.addPowerTransformerEndInfo(typWicklung1);
+                    this.cimModelDefault.addPowerTransformerEndInfo(typWicklung2);
                 }
             }
             else {
@@ -4154,9 +4170,17 @@ class ConverterIntegral7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TYP_TRAFO3W)) {
                 const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.TYP_TRAFO3W, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TYP_TRAFO3W), []));
                 for (const i7Data of result) {
-                    const typTrafo = new EVPowerTransformerInfo_1.EVPowerTransformerInfo(common_utils_1.CommonUtils.generateUUID(), i7Data.name);
+                    const typTrafo = new INTEGRALPowerTransformer3WInfo_1.INTEGRALPowerTransformer3WInfo(common_utils_1.CommonUtils.generateUUID(), i7Data.name);
+                    typTrafo.sr1 = i7Data.sr1;
+                    typTrafo.sr2 = i7Data.sr2;
+                    typTrafo.sr3 = i7Data.sr3;
+                    typTrafo.ur1 = i7Data.ur1;
+                    typTrafo.ur2 = i7Data.ur2;
+                    typTrafo.ur3 = i7Data.ur3;
                     typTrafo.pLeer = i7Data.p_leer;
                     typTrafo.iLeer = i7Data.i_leer;
+                    typTrafo.schaltgruppe = i7Data.schaltgr;
+                    typTrafo.spezialRegelung = (0, parser_utils_1.isNumericI7)(i7Data.trafo_spezial) ? (0, parser_utils_1.convertToNumberI7)(i7Data.trafo_spezial) : undefined;
                     typTrafo.ukr12 = i7Data.ukr12;
                     typTrafo.ukr13 = i7Data.ukr13;
                     typTrafo.ukr23 = i7Data.ukr23;
@@ -4171,17 +4195,17 @@ class ConverterIntegral7 {
                     typTrafo.r0kr2 = i7Data.r0kr2;
                     typTrafo.r00r1 = i7Data.r00r1;
                     typTrafo.r00r2 = i7Data.r00r2;
-                    const typWicklung1 = new EVPowerTransformerEndInfo_1.EVPowerTransformerEndInfo(common_utils_1.CommonUtils.generateUUID());
+                    const typWicklung1 = new INTEGRALPowerTransformerEndInfo_1.INTEGRALPowerTransformerEndInfo(common_utils_1.CommonUtils.generateUUID());
                     typWicklung1.ratedS = new ApparentPower_1.ApparentPower(i7Data.sr1, UnitMultiplier_1.UnitMultiplier.m, UnitSymbol_1.UnitSymbol.VA);
                     this.setTransformerEndInfoProperties(typWicklung1, i7Data, 1);
                     typWicklung1.powerTransformerInfo = typTrafo;
                     typTrafo.addTransformerEndInfo(typWicklung1);
-                    const typWicklung2 = new EVPowerTransformerEndInfo_1.EVPowerTransformerEndInfo(common_utils_1.CommonUtils.generateUUID());
+                    const typWicklung2 = new INTEGRALPowerTransformerEndInfo_1.INTEGRALPowerTransformerEndInfo(common_utils_1.CommonUtils.generateUUID());
                     typWicklung2.ratedS = new ApparentPower_1.ApparentPower(i7Data.sr2, UnitMultiplier_1.UnitMultiplier.m, UnitSymbol_1.UnitSymbol.VA);
                     this.setTransformerEndInfoProperties(typWicklung2, i7Data, 2);
                     typWicklung2.powerTransformerInfo = typTrafo;
                     typTrafo.addTransformerEndInfo(typWicklung2);
-                    const typWicklung3 = new EVPowerTransformerEndInfo_1.EVPowerTransformerEndInfo(common_utils_1.CommonUtils.generateUUID());
+                    const typWicklung3 = new INTEGRALPowerTransformerEndInfo_1.INTEGRALPowerTransformerEndInfo(common_utils_1.CommonUtils.generateUUID());
                     typWicklung3.ratedS = new ApparentPower_1.ApparentPower(i7Data.sr3, UnitMultiplier_1.UnitMultiplier.m, UnitSymbol_1.UnitSymbol.VA);
                     this.setTransformerEndInfoProperties(typWicklung3, i7Data, 3);
                     typWicklung3.powerTransformerInfo = typTrafo;
@@ -4189,10 +4213,10 @@ class ConverterIntegral7 {
                     // const aktstufe = `aktstufe_s${endNumber}`;
                     // const regelung = `regelung_s${endNumber}`;
                     // wicklung.connectionKind
-                    this.cimModelDefault.addEvPowerTransformerInfo(typTrafo);
-                    this.cimModelDefault.addEvPowerTransformerEndInfo(typWicklung1);
-                    this.cimModelDefault.addEvPowerTransformerEndInfo(typWicklung2);
-                    this.cimModelDefault.addEvPowerTransformerEndInfo(typWicklung3);
+                    this.cimModelDefault.addPowerTransformerInfo(typTrafo);
+                    this.cimModelDefault.addPowerTransformerEndInfo(typWicklung1);
+                    this.cimModelDefault.addPowerTransformerEndInfo(typWicklung2);
+                    this.cimModelDefault.addPowerTransformerEndInfo(typWicklung3);
                 }
             }
             else {
@@ -4288,6 +4312,10 @@ class ConverterIntegral7 {
                     else {
                         this.logger.debug(`Trafo2W ${i7Data.id} besitzt keine Umspannanlage.`);
                     }
+                    const i7Schluessel = (substation === null || substation === void 0 ? void 0 : substation.key) +
+                        integral_prefix_1.TRAFO2WPRAEFIX_PRAEFIX +
+                        (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
+                    powerTransformer.key = i7Schluessel;
                     if (powerTransformer.getUUID() === '515508dc-5982-4686-ad26-08d39db91421') {
                         let stop = true;
                     } // kein Typ in D4
@@ -4498,6 +4526,10 @@ class ConverterIntegral7 {
                         this.logger.debug(`Trafo3W ${i7Data.id} besitzt keine Umspannanlage.`);
                     }
                     const facility = util_cim_model_1.UtilCimModel.createFacilityInstanceForPsr(cimModel, powerTransformer, cim_constants_1.CimAssetAliasNames.Transformer, this.configUuid);
+                    const i7Schluessel = (substation === null || substation === void 0 ? void 0 : substation.key) +
+                        integral_prefix_1.TRAFO3WPRAEFIX_PRAEFIX +
+                        (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
+                    powerTransformer.key = i7Schluessel;
                     /** AssetInfos */
                     if (i7Data.baujahr) {
                         util_cim_model_1.UtilCimModel.setLifecycleDate(facility, i7Data.baujahr);
@@ -4783,7 +4815,7 @@ class ConverterIntegral7 {
         powerTransformerEndInfo.endNumber = endNumber;
         powerTransformerEndInfo.ratedU = (0, parser_utils_1.isNumericI7)(data[ur]) ? new Voltage_1.Voltage(data[ur], UnitMultiplier_1.UnitMultiplier.k, UnitSymbol_1.UnitSymbol.V) : undefined;
         powerTransformerEndInfo.gestufteSeite = (0, parser_utils_1.isNumericI7)(data[gestufteSeite]) ? (0, parser_utils_1.convertToNumberI7)(data[gestufteSeite]) : undefined;
-        const tapChangerInfo = new EVTapChangerInfo_1.EVTapChangerInfo(common_utils_1.CommonUtils.generateUUID(), `TapChangerInfo_${data['id']}`);
+        const tapChangerInfo = new INTEGRALTapChangerInfo_1.INTEGRALTapChangerInfo(common_utils_1.CommonUtils.generateUUID(), `TapChangerInfo_${data['id']}`);
         tapChangerInfo.highStep = (0, parser_utils_1.isNumericI7)(data[maxstufe]) ? (0, parser_utils_1.convertToNumberI7)(data[maxstufe]) : undefined;
         tapChangerInfo.lowStep = (0, parser_utils_1.isNumericI7)(data[minstufe]) ? (0, parser_utils_1.convertToNumberI7)(data[minstufe]) : undefined;
         tapChangerInfo.neutralStep = (0, parser_utils_1.isNumericI7)(data[neutralstufe]) ? (0, parser_utils_1.convertToNumberI7)(data[neutralstufe]) : undefined;
@@ -5479,6 +5511,9 @@ class ConverterIntegral7 {
                 frame.initProfileXmlSerializers([rdf_xml_1.RDF_XML.PROFILE_DL, rdf_xml_1.RDF_XML.PROFILE_EQ, rdf_xml_1.RDF_XML.PROFILE_SSH, rdf_xml_1.RDF_XML.PROFILE_GL, rdf_xml_1.RDF_XML.PROFILE_AMPI7, rdf_xml_1.RDF_XML.PROFILE_DY, rdf_xml_1.RDF_XML.PROFILE_SV], tempDirPath);
             }
             this.exportFrames = this.associateGeoRegionsToExportFrames(gridFrames);
+            // Default Model
+            this.exportFrameDefault.cimModel = this.cimModelDefault;
+            this.exportFrameDefault.initProfileXmlSerializers([rdf_xml_1.RDF_XML.PROFILE_AMPI7], tempDirPath);
         });
     }
     initExportFrames(exportConfig, geoRegions, subGeoRegions) {