@enervance/insight-cim-model 0.0.269-beta10 → 0.0.269-beta3

package/dist/converter/integral7/converter.integral7.d.ts

@@ -5,7 +5,7 @@ import { PowerTransformerEnd } from '../../model/wires/PowerTransformerEnd.js';
 import { MySQLConfig, MysqlController } from '../../util/database/mysql-controller.js';
 import { INTEGRALModelContainer } from '../../model-container/model/INTEGRALModelContainer.js';
 import { ModelContainer } from '../../model-container/model/ModelContainer.js';
-import { ConverterStatus, ConvertWithNetzbereichResponse, IExportConfig, Integral7Model, ITargetVoltage } from './interface-i7/data-structures-i7.js';
+import { ConverterStatus, IExportConfig, Integral7Model, ITargetVoltage } from './interface-i7/data-structures-i7.js';
 import { DefaultValuesConfigInterface } from './interface-i7/default-values-config.interface.js';
 import { I7ExportFrame } from './interface-i7/export-frame-i7.js';
 import { ObjectMappingConfigInterface } from './interface-i7/object-mapping-config.interface.js';
@@ -13,7 +13,7 @@ import { AsynchronmotorTyp, Einspeisung, Ersatzquerzweig, GeneratorTyp, KDrossel
 import { ConfigurableDLConvertOptions, Executor } from './dl-convert/executor.js';
 import { IEnergySourceTypeMapping } from './interface-i7/energy-source.type.mapping.js';
 import { IUuidConfig } from './interface-i7/uuid-config.interface.js';
-import { NetEquivalentOptions } from './tp-bd-profile/model/convert-net-equivalent.model.js';
+import { TpBdConverter } from './tp-bd-profile/tp-bd-converter.js';
 export declare class ConverterIntegral7 {
     #private;
     logger: ILogger;
@@ -63,8 +63,8 @@ export declare class ConverterIntegral7 {
     defaultValuesConfig: DefaultValuesConfigInterface;
     set configurableDLConvertOptions(arg: ConfigurableDLConvertOptions);
     get configurableDLConvertOptions(): ConfigurableDLConvertOptions;
+    tpBdConverter: TpBdConverter;
     constructor();
-    convertWithNetzbereich(objectMappingConfig: ObjectMappingConfigInterface, defaultValuesConfig: DefaultValuesConfigInterface, energyTypesConfig: any, exportConfig: IExportConfig[], energySourceTypeMappingConfig: IEnergySourceTypeMapping[], configUuid: Array<IUuidConfig>, tempDirPath: string, netEquivalentOptions: NetEquivalentOptions): Promise<ConvertWithNetzbereichResponse>;
     /**
      * Konvertiert das Netz aus der MySQL Datenbank
      * @param defaultValuesConfig Standardwerte zur Verwendung bei nicht gepflegten Angaben

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

@@ -157,10 +157,6 @@ class ConverterIntegral7 {
         return tslib_1.__classPrivateFieldGet(this, _ConverterIntegral7_configurableDLConvertOptions, "f");
     }
     /* ---------- ---------- ---------- */
-    /* ---------- ---------- ---------- */
-    // TP-BD-Converter related properties
-    // tpBdConverter: TpBdConverter;
-    /* ---------- ---------- ---------- */
     constructor() {
         /** Exportnetze gemäß Konfiguration  */
         this.exportFrames = new Map();
@@ -197,98 +193,6 @@ class ConverterIntegral7 {
         this.blocktransformatoren = [];
         _ConverterIntegral7_configurableDLConvertOptions.set(this, {});
     }
-    convertWithNetzbereich(objectMappingConfig, defaultValuesConfig, energyTypesConfig, exportConfig, energySourceTypeMappingConfig, configUuid, tempDirPath, netEquivalentOptions) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            this.objectMappingConfig = objectMappingConfig;
-            this.defaultValuesConfig = defaultValuesConfig;
-            this.configUuid = configUuid;
-            try {
-                yield this.createColumnIndex();
-                yield this.configExportFrames(exportConfig, defaultValuesConfig, tempDirPath);
-                /** Typinformationen abfragen  */
-                yield this.convertBetriebsmitteltypenKdrossel();
-                yield this.convertBetriebsmitteltypenLeitung();
-                yield this.convertBetriebsmitteltypenTrafo();
-                yield this.convertBetriebsmitteltypenGenerator();
-                yield this.convertBetriebsmitteltypenAsynchronmotor();
-                yield this.convertMultiplikationsfaktoren();
-                yield this.queryLeitungsAnschlussIDs();
-                yield this.queryTrafosAnschlussIDs();
-                yield this.queryHgueAnschlussIDs();
-                yield this.queryLDroselAnschlussIDs();
-                yield this.queryErsatzLaengsAnschlussIDs();
-                yield this.queryLkondensatorAnschlussIDs();
-                const tpBdConverter = new tp_bd_converter_1.TpBdConverter(this.mysqlController, this.logger, configUuid);
-                tpBdConverter.initDatabaseMetaData(this.availableTableNames);
-                tpBdConverter.setupLookupMaps(this.integralID2UUID);
-                tpBdConverter.setExportTempDirPath(tempDirPath);
-                /** BD Profile  */
-                this.logger.debug('Convert BD Profiles');
-                console.log('Convert BD Profiles');
-                let boundaryEqUUId = undefined;
-                for (const entry of this.exportFramesBoundary.entries()) {
-                    const geoRegionUUID = entry[0];
-                    const frame = entry[1];
-                    boundaryEqUUId = frame.getModelUUID(rdf_xml_1.RDF_XML.PROFILE_EQ_BD);
-                    const geoRegion = frame.cimModel.getGeographicalRegion(geoRegionUUID);
-                    if (!geoRegion)
-                        continue;
-                    yield this.convertFrame(frame, geoRegion, objectMappingConfig, energyTypesConfig, defaultValuesConfig, energySourceTypeMappingConfig);
-                }
-                this.logger.debug('Convert MAS Profiles');
-                console.log('Convert MAS Profiles');
-                for (const entry of this.exportFrames.entries()) {
-                    const geoRegionUUID = entry[0];
-                    const frame = entry[1];
-                    const geoRegion = frame.cimModel.getGeographicalRegion(geoRegionUUID);
-                    if (!geoRegion)
-                        continue;
-                    this.logger.debug(`Convert MAS profile: ${frame.mas}`);
-                    console.log(`Convert MAS profile: ${frame.mas}`);
-                    yield this.convertFrame(frame, geoRegion, objectMappingConfig, energyTypesConfig, defaultValuesConfig, energySourceTypeMappingConfig);
-                    if (boundaryEqUUId) {
-                        frame.addDependentModel(rdf_xml_1.RDF_XML.PROFILE_EQ, boundaryEqUUId);
-                    }
-                    frame.validateCIMModel();
-                    yield tpBdConverter.convertNetzbereich(frame.cimModel, netEquivalentOptions.netzbereichID);
-                    frame.purgeData();
-                    const startTime = perf_hooks.performance.now();
-                    frame.openXMLModel();
-                    this.logger.debug(`Serialize MAS profile: ${frame.mas}`);
-                    console.log(`Serialize MAS profile: ${frame.mas}`);
-                    frame.serializeModel(defaultValuesConfig);
-                    yield frame.closeXMLModel();
-                    let endTime = perf_hooks.performance.now();
-                    // frame.cimModel.purgeData();
-                    console.log(`\nSerializeModel ${geoRegion.name} ${(endTime - startTime) / 1000} seconds\n`);
-                }
-                this.logger.debug('Serialize TP-BD Profiles');
-                console.log('Serialize TP-BD Profiles');
-                // await tpBdConverter.serialize(defaultValuesConfig);
-                // this.logger.debug('Serialize Default Profile');
-                // this.exportFrameDefault.openXMLModel();
-                // this.exportFrameDefault.serializeModel(defaultValuesConfig);
-                // await this.exportFrameDefault.closeXMLModel();
-                return {
-                    status: 'successful',
-                    message: 'ok',
-                    data: {
-                        boundarySets: tpBdConverter.exportTopologyBoundaries,
-                        frames: [...this.exportFrames.values()]
-                        // net: frame,
-                    }
-                };
-            }
-            catch (e) {
-                this.logger.error(e);
-                console.error('ERROR:' + e);
-                return { status: 'error', message: e.toString() };
-            }
-            finally {
-                yield this.dropColumnIndex();
-            }
-        });
-    }
     /**
      * Konvertiert das Netz aus der MySQL Datenbank
      * @param defaultValuesConfig Standardwerte zur Verwendung bei nicht gepflegten Angaben
@@ -316,6 +220,10 @@ class ConverterIntegral7 {
                 yield this.queryLDroselAnschlussIDs();
                 yield this.queryErsatzLaengsAnschlussIDs();
                 yield this.queryLkondensatorAnschlussIDs();
+                this.tpBdConverter = new tp_bd_converter_1.TpBdConverter(this.mysqlController, this.logger, configUuid);
+                this.tpBdConverter.initDatabaseMetaData(this.availableTableNames);
+                this.tpBdConverter.setupLookupMaps(this.integralID2UUID);
+                this.tpBdConverter.setExportTempDirPath(tempDirPath);
                 /** BD Profile  */
                 this.logger.debug('Convert BD Profiles');
                 console.log('Convert BD Profiles');
@@ -375,6 +283,9 @@ class ConverterIntegral7 {
                     let endTime = perf_hooks.performance.now();
                     console.log(`\nSerializeModel ${geoRegion.name} ${(endTime - startTime) / 1000} seconds\n`);
                 }
+                this.logger.debug('Serialize TP-BD Profiles');
+                console.log('Serialize TP-BD Profiles');
+                yield this.tpBdConverter.serialize(defaultValuesConfig);
                 this.logger.debug('Serialize Default Profile');
                 this.exportFrameDefault.openXMLModel();
                 this.exportFrameDefault.serializeModel(defaultValuesConfig);
@@ -658,6 +569,10 @@ class ConverterIntegral7 {
             if (schaltfeldIDs.length)
                 yield this.createTopologicalNodes(cimModel);
             logExecutionTime(this.logger, startTime, `createTopologicalNodes()`);
+            /** TP-BD Profile */
+            if (!frame.boundary) {
+                yield this.tpBdConverter.convert(frame.cimModel);
+            }
             /** DL Profile */
             if (!frame.boundary) {
                 this.executor = new executor_1.Executor(this.mysqlController, this.configUuid);