@enervance/insight-cim-model 0.0.139 → 0.0.141

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

@@ -11,10 +11,10 @@ import { IDefaultValuesConfig } from './interface-i7/IDefaultValuesConfig.js';
 import { IObjectMappingConfig } from './interface-i7/IObjectMappingConfig.js';
 import { AsynchronmotorTyp, Einspeisung, Ersatzquerzweig, GeneratorTyp, KDrosselTyp, Standort, Trafo } from './model/interfaces.js';
 import { INTEGRALModelContainer } from '../../model-container/model/INTEGRALModelContainer.js';
-import { DLConverterI7 } from './dl-convert/dl-converter-i7.js';
 import { ModelContainer } from '../../model-container/model/ModelContainer.js';
 import { DCGround } from '../../model/dc/DCGround.js';
 import { IEnergySourceTypeMapping } from './interface-i7/energy-source.type.mapping.js';
+import { Executor } from './dl-convert/executor.js';
 export declare class ConverterIntegral7 {
     logger: ILogger;
     /** Verbindung zur MySQL DB */
@@ -51,7 +51,7 @@ export declare class ConverterIntegral7 {
     ersatzZweigAnschlussKnotenIDs: Set<unknown>;
     /** List of Blocktransformatoren */
     blocktransformatoren: any[];
-    dlConverterI7: DLConverterI7;
+    executor: Executor;
     objectMappingConfig: IObjectMappingConfig;
     defaultValuesConfig: IDefaultValuesConfig;
     constructor();

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

@@ -119,7 +119,6 @@ const INTEGRALConformLoad_1 = require("../../model/extensions/integral/loadmodel
 const AngleDegrees_1 = require("../../model/domain/AngleDegrees.js");
 const AsynchronousMachineKind_1 = require("../../model/wires/AsynchronousMachineKind.js");
 const INTEGRALEquivalentInjection_1 = require("../../model/extensions/integral/equivalents/INTEGRALEquivalentInjection.js");
-const dl_converter_i7_1 = require("./dl-convert/dl-converter-i7.js");
 const util_graph2tree_1 = require("../../util/collection/util-graph2tree.js");
 const parser_utils_1 = require("../../utils2/parser.utils.js");
 const common_utils_1 = require("../../utils2/common.utils.js");
@@ -129,6 +128,9 @@ const INTEGRALEquivalentBranch_1 = require("../../model/extensions/amprion/equiv
 const PhaseTapChangerLinear_1 = require("../../model/wires/PhaseTapChangerLinear.js");
 const DCConverterUnit_1 = require("../../model/extensions/integral/dc/DCConverterUnit.js");
 const DCPolarityKind_1 = require("../../model/dc/DCPolarityKind.js");
+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 cim_constants_1 = require("../../constants/cim-constants.js");
 const EVWireObject_1 = require("../../model/extensions/enervance/assets/EVWireObject.js");
@@ -166,7 +168,6 @@ class ConverterIntegral7 {
         this.ersatzZweigAnschlussKnotenIDs = new Set();
         /** List of Blocktransformatoren */
         this.blocktransformatoren = [];
-        this.dlConverterI7 = new dl_converter_i7_1.DLConverterI7();
     }
     /**
      * Konvertiert das Netz aus der MySQL Datenbank
@@ -424,13 +425,13 @@ class ConverterIntegral7 {
             /** Generatoren -> SynchronousMachine */
             if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
                 startTime = perf_hooks.performance.now();
-                yield this.convertGeneratoren(cimModel, soSfKnoten, energyTypesConfig);
+                // await this.convertGeneratoren(cimModel, soSfKnoten, energyTypesConfig);
                 logExecutionTime(this.logger, startTime, `convertGeneratoren`);
             }
             /** KWBlöcke -> SynchronousMachine */
             if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
                 startTime = perf_hooks.performance.now();
-                yield this.convertKraftwerksbloecke(cimModel, soSfKnoten, energyTypesConfig);
+                // await this.convertKraftwerksbloecke(cimModel, soSfKnoten, energyTypesConfig);
                 logExecutionTime(this.logger, startTime, `convertKraftwerksbloecke`);
             }
             /** Ersatzquerzweige -> ExternalNetworkInjection */
@@ -495,13 +496,13 @@ class ConverterIntegral7 {
             /** HGÜ Kopfklassisch */
             if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
                 startTime = perf_hooks.performance.now();
-                yield this.convertCsConverterDC(cimModel, integral7Modell, soSfKnoten);
+                // await this.convertCsConverterDC(cimModel, integral7Modell, soSfKnoten);
                 logExecutionTime(this.logger, startTime, `convertCsConverterDC`);
             }
             /** netz_hguekopfvsc */
             if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
                 startTime = perf_hooks.performance.now();
-                yield this.convertVsConverterDC(cimModel, integral7Modell, soSfKnoten);
+                // await this.convertVsConverterDC(cimModel, integral7Modell, soSfKnoten);
                 logExecutionTime(this.logger, startTime, `convertVsConverterDC`);
             }
             /** HGÜ-Leitungen -> (DCLine, DCLineSegment)*/
@@ -519,31 +520,79 @@ class ConverterIntegral7 {
             yield this.assignTerminalSequenceNumber(cimModel);
             logExecutionTime(this.logger, startTime, `assignment of sequence number`);
             /** DC Model */
-            this.dlConverterI7.prepare(this.mysqlController, this.logger);
-            const powerTransformers = cimModel.powerTransformer;
-            const powerTransformerEnds = cimModel.powerTransformerEnds;
-            const lines = cimModel.lines;
-            const objects = cimModel.objects;
-            yield 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();
+            /** DL Profile */
+            this.executor = new executor_1.Executor(this.mysqlController);
+            yield this.executor.mergeDataFromIntegralID2UUID(this.integralID2UUID);
+            yield this.executor.mergeDataFromFrame(frame);
+            yield this.executor.loadAllSchemaVariants();
+            // const frame = new I7ExportFrame('Test-Frame');
+            // netzKnotenSoIDs.forEach(knotensoID => frame.integral7Modell.integralKnotenSo.set(knotensoID, undefined));
+            // netzSchaltanlageIDs.forEach(schaltanlageID => frame.integral7Modell.integralSchaltanlagen.set(schaltanlageID, undefined));
+            // netzSchaltanlageIDs.forEach(netzSchaltanlageID => frame.integral7Modell.integralStandorte.set(netzSchaltanlageID, undefined));
+            // netzSaabschnittIDs.forEach(netzSaabschnittID => frame.integral7Modell.integralSchaltanlagenAbschnitte.set(netzSaabschnittID, undefined));
+            // netzSchaltfeldIDs.forEach(netzSchaltfeldID => frame.integral7Modell.integralSchaltfelder.set(netzSchaltfeldID, undefined));
+            const leitungIDs = [...integral7Modell.integralLeitungen.keys()];
+            const convertOptions = {
+                only: {
+                    netz_standortIds: standortIDs.map(standortId => {
+                        return { id: standortId };
+                    }),
+                    netz_knotensoIds: knotenSoIDs.map(knotenSoId => {
+                        return { id: knotenSoId };
+                    }),
+                    netz_schaltanlagenIds: schaltanlagenIDs.map(schaltanlagenId => {
+                        return { id: schaltanlagenId };
+                    }),
+                    netz_saabschnittIds: schaltanlagenAbschnittIDs.map(schaltanlagenAbschnittId => {
+                        return { id: schaltanlagenAbschnittId };
+                    }),
+                    netz_schaltfeldIds: schaltfeldIDs.map(schaltfeldId => {
+                        return { id: schaltfeldId };
+                    }),
+                    netz_leitungIds: leitungIDs.map(leitungId => {
+                        return { id: leitungId };
+                    })
+                }
+            };
+            const resultingObjects = yield this.executor.convert(convertOptions);
+            for (const resultingObject of resultingObjects) {
+                if (resultingObject instanceof Diagram_1.Diagram) {
+                    frame.cimModel.addDiagram(resultingObject);
+                }
+                else if (resultingObject instanceof DiagramObject_1.DiagramObject) {
+                    frame.cimModel.addDiagramObject(resultingObject);
+                }
+            }
+            console.log('over');
+            // 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();
         });
     }
     assignTerminalSequenceNumber(cimModel) {
@@ -2548,7 +2597,7 @@ class ConverterIntegral7 {
                         this.logger.debug(`DCConverterUnit ${i7Data.id} besitzt keinen ConnectivityNode.`);
                     }
                     const vsConverter = new VsConverter_1.VsConverter((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_VSC']), i7Data.kurzname);
-                    if (vsConverter.getUUID() === "1b2b2901-0bb9-4aa3-9117-06d68fbbc7cb") {
+                    if (vsConverter.getUUID() === '1b2b2901-0bb9-4aa3-9117-06d68fbbc7cb') {
                         let stop = true;
                     }
                     /** Wenn Leitungen konvertiert werden, wird das Attribut operationMode gesetzt. */
@@ -3002,34 +3051,34 @@ class ConverterIntegral7 {
                      const equipmentContainer = this.determineEquipmentContainer('VoltageLevel', cimModel, cimModel.getObject(this.integralID2UUID.get(i7Data.seliste)) as EquipmentContainer);
             
                      if (equipmentContainer) {
-                      equipmentContainer.addEquipment(junction);
-                      junction.equipmentContainer = equipmentContainer;
-                    } else {
-                      this.logger.debug(`Starre verbindung ${i7Data.id} besitzt keinen EquipmentContainer.`);
-                    }
+                     equipmentContainer.addEquipment(junction);
+                     junction.equipmentContainer = equipmentContainer;
+                     } else {
+                     this.logger.debug(`Starre verbindung ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                     }
                      const cnStart = cimModel.getConnectivityNode(this.integralID2UUID.get(i7Data.aknoten));
                      const cnZiel = cimModel.getConnectivityNode(this.integralID2UUID.get(i7Data.eknoten));
             
                      if (cnStart) {
-                      const terminal = this.createConnection(cimModel, junction, cnStart, PhaseCode.ABC, true, 1);
-                      if (schaltzustand === false) {
-                        terminal.connected = schaltzustand;
-                      }
-                    } else {
-                      this.logger.debug(`Starre verbindung ${i7Data.id} besitzt keinen Anfangsknoten.`);
-                    }
+                     const terminal = this.createConnection(cimModel, junction, cnStart, PhaseCode.ABC, true, 1);
+                     if (schaltzustand === false) {
+                     terminal.connected = schaltzustand;
+                     }
+                     } else {
+                     this.logger.debug(`Starre verbindung ${i7Data.id} besitzt keinen Anfangsknoten.`);
+                     }
                      if (cnZiel) {
-                      const terminal = this.createConnection(cimModel, junction, cnZiel, PhaseCode.ABC, true, 2);
-                      if (schaltzustand === false) {
-                        terminal.connected = schaltzustand;
-                      }
-                    } else {
-                      this.logger.debug(`Starre verbindung ${i7Data.id} besitzt keinen Zielknoten.`);
-                    }
+                     const terminal = this.createConnection(cimModel, junction, cnZiel, PhaseCode.ABC, true, 2);
+                     if (schaltzustand === false) {
+                     terminal.connected = schaltzustand;
+                     }
+                     } else {
+                     this.logger.debug(`Starre verbindung ${i7Data.id} besitzt keinen Zielknoten.`);
+                     }
                      const baseVoltage = getTerminalUn(cimModel, junction);
                      if (baseVoltage) {
-                      junction.baseVoltage = baseVoltage;
-                    }
+                     junction.baseVoltage = baseVoltage;
+                     }
                      this.addIdMapping(i7Data.id, junction.mrid, Integral7TableNames.KNOTEN_STARR);
                      cimModel.addJunction(junction);
                      **/
@@ -3754,7 +3803,7 @@ class ConverterIntegral7 {
                     //Parameter "guidp" is available for monopolar and bipolar dc systems. Thus create DCLineSegment with positive sign property in any case.
                     const dcLineSegment = new DCLineSegment_1.DCLineSegment((0, parser_utils_1.getUUID)(i7Data.guidp, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCLS']), i7Data.kurzname, i7Schluessel);
                     let dcLineSegmentNeg = undefined;
-                    if (dcLineSegment.getUUID() === "579b6a04-23c5-452f-b7ad-db283dad1cdb") {
+                    if (dcLineSegment.getUUID() === '579b6a04-23c5-452f-b7ad-db283dad1cdb') {
                         const stop = true;
                     }
                     /**EQ: not given directly by the INTEGRAL system model */
@@ -5179,14 +5228,13 @@ class ConverterIntegral7 {
                     const tabName_NetzSo = integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.KNOTEN_SO];
                     const tabName_NetzSSAB = integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.SAMMELSCHIENE];
                     const query = ` SELECT Voltage.id, Voltage.umin, Voltage.umax, Voltage.usoll
-                        FROM (
-                                 SELECT id, umin, umax, usoll
-                                 FROM ${tabName_NetzSo}
-                                 WHERE ${tabName_NetzSo}.id = ${tempKnotenId}
-                                 UNION
-                                 SELECT id, umin, umax, usoll
-                                 FROM ${tabName_NetzSSAB}
-                                 WHERE ${tabName_NetzSSAB}.id = ${tempKnotenId}) as Voltage`;
+                        FROM (SELECT id, umin, umax, usoll
+                              FROM ${tabName_NetzSo}
+                              WHERE ${tabName_NetzSo}.id = ${tempKnotenId}
+                              UNION
+                              SELECT id, umin, umax, usoll
+                              FROM ${tabName_NetzSSAB}
+                              WHERE ${tabName_NetzSSAB}.id = ${tempKnotenId}) as Voltage`;
                     minMaxSollResult = yield this.mysqlController.execQuery(query);
                 }
                 if (minMaxSollResult && minMaxSollResult.length) {
@@ -5218,7 +5266,7 @@ class ConverterIntegral7 {
     getAvailableTableColumnNames(database) {
         var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const query = `SELECT table_name, column_name 
+            const query = `SELECT table_name, column_name
                    FROM information_schema.columns
                    WHERE table_schema = '${database}'
                    ORDER BY table_name, ORDINAL_POSITION;`;