@enervance/insight-cim-model 0.0.124 → 0.0.126

package/dist/converter/integral7/dl-convert/db/database.interface.types.d.ts

@@ -1,40 +1,40 @@
-export declare type BaseObject = {
+export type BaseObject = {
     id: number;
     guid: string;
 };
-export declare type Netzvariante = {
+export type Netzvariante = {
     name: string;
     art: number;
 } & BaseObject;
-export declare type NsgObject = {
+export type NsgObject = {
     variantennr: number;
     eingeblendet: number;
     angezeigt: number;
     xrel: number;
     yrel: number;
 } & BaseObject;
-export declare type NsgStandort = {
+export type NsgStandort = {
     standort: number;
 } & NsgObject;
-export declare type NsgKnotenSo = {
+export type NsgKnotenSo = {
     knotenso: number;
     nsgso: number;
 } & NsgObject;
-export declare type NsgSchaltanlage = {
+export type NsgSchaltanlage = {
     ausrichtung: number;
     nsgso: number;
     schaltanlage: number;
     saabschnittIDs?: string[];
     nsgSaabs?: NsgSAAB[];
 } & NsgObject;
-export declare type NsgSAAB = {
+export type NsgSAAB = {
     laenge: number;
     nslots: number;
     saabschnitt: number;
     nsgsa: number;
     nsgSsabs?: NsgSSAB[];
 } & NsgObject;
-export declare type NsgSSAB = {
+export type NsgSSAB = {
     /** nsg_nsgsaabschnitt.variantennr */
     /** nsg_nsgsaabschnitt.id */
     /** nsg_nsgsaabschnitt.angezeigt */
@@ -54,7 +54,7 @@ export declare type NsgSSAB = {
     /** netz_ssab.id */
     idSSAB: number;
 } & NsgObject;
-export declare type NsgSchaltfeld = {
+export type NsgSchaltfeld = {
     deltaausrichtung: number;
     hoehe: number;
     nsgsaa: number;
@@ -64,29 +64,29 @@ export declare type NsgSchaltfeld = {
     lastNodeCimUUID?: string;
     orientation: number;
 } & NsgObject;
-export declare type NsgKpFeld = {
+export type NsgKpFeld = {
     deltaausrichtung: number;
     hoehe: number;
     nsgsaa: number;
     kpfeld: number;
     slotnummer: number;
 } & NsgObject;
-export declare type NsgLKupplung = {
+export type NsgLKupplung = {
     laenge: number;
     nsgsaa: number;
 } & NsgObject;
-export declare type NsgTrafo = {
+export type NsgTrafo = {
     ausrichtung: number;
     nsgso: number;
 } & NsgObject;
-export declare type NsgTrafo2W = {
+export type NsgTrafo2W = {
     anschlussanf: number;
     anschlussend: number;
     anschlussanf_stp: number;
     anschlussend_stp: number;
     trafo2w: number;
 } & NsgTrafo;
-export declare type NsgTrafo3W = {
+export type NsgTrafo3W = {
     orientierung_cw: number;
     anschluss_w1: number;
     anschluss_w2: number;
@@ -96,7 +96,7 @@ export declare type NsgTrafo3W = {
     anschlussanfw3: number;
     trafo3w: number;
 } & NsgTrafo;
-export declare type NsgLeitung = {
+export type NsgLeitung = {
     dxksanf: number;
     dyksanf: number;
     dxksend: number;
@@ -105,7 +105,7 @@ export declare type NsgLeitung = {
     anschlussanf: number;
     anschlussend: number;
 } & NsgObject;
-export declare type NsgLeitungspunkt = {
+export type NsgLeitungspunkt = {
     nsgleitung: number;
     pos: number;
     userelpos: number;
@@ -113,7 +113,7 @@ export declare type NsgLeitungspunkt = {
     abstand_rel_anchor_m: number;
     abstand_rel_anchor_c: number;
 } & NsgObject;
-export declare type NsgQuerzweig = {
+export type NsgQuerzweig = {
     /** 0: Left, 1: Top, 2: Right, 3: Bottom */
     ausrichtung: number;
     /** Bspw. ID von Netz-HgueKopfKlassisch, Netz-Belastung, Netz-Generator */

package/dist/converter/integral7/dl-convert/dl-converter-i7-function.types.d.ts

@@ -1,4 +1,4 @@
-export declare type DiagramObjectWithPointParams = {
+export type DiagramObjectWithPointParams = {
     diagramObjectName: string;
     diagramUUID: string;
     identifiedObjectUUID: string;

package/dist/converter/integral7/dl-convert/dl-converter-i7.d.ts

@@ -1,18 +1,18 @@
-import { MysqlController } from '../../../util/database/mysql-controller';
-import { IdentifiedObject } from '../../../model/core/IdentifiedObject';
-import { ILogger } from '../../../interfaces/ILogger';
-import { NsgObject } from './db/database.interface.types';
-import { DiagramObject } from '../../../model/diagram/DiagramObject';
-import { SchaltfeldImpl } from '../model/integral/Schaltfeld';
-import { LaengskupplungImpl } from '../model/integral/Laengskupplung';
-import { PowerTransformer } from '../../../model/wires/PowerTransformer';
-import { PowerTransformerEnd } from '../../../model/wires/PowerTransformerEnd';
-import { LeitungImpl } from '../model/integral/Leitung';
-import { Hgueleitung } from '../model/integral/Hgueleitung';
-import { ModelContainer } from '../../../model-container/model/ModelContainer';
-import { IUUIDObject } from '../../../interfaces/IUUIDObject';
-import { ILine } from '../../../interfaces/model/wires/ILine';
-declare type SchemaInputParamsType = {
+import { MysqlController } from '../../../util/database/mysql-controller.js';
+import { IdentifiedObject } from '../../../model/core/IdentifiedObject.js';
+import { ILogger } from '../../../interfaces/ILogger.js';
+import { NsgObject } from './db/database.interface.types.js';
+import { DiagramObject } from '../../../model/diagram/DiagramObject.js';
+import { SchaltfeldImpl } from '../model/integral/Schaltfeld.js';
+import { LaengskupplungImpl } from '../model/integral/Laengskupplung.js';
+import { PowerTransformer } from '../../../model/wires/PowerTransformer.js';
+import { PowerTransformerEnd } from '../../../model/wires/PowerTransformerEnd.js';
+import { LeitungImpl } from '../model/integral/Leitung.js';
+import { Hgueleitung } from '../model/integral/Hgueleitung.js';
+import { ModelContainer } from '../../../model-container/model/ModelContainer.js';
+import { IUUIDObject } from '../../../interfaces/IUUIDObject.js';
+import { ILine } from '../../../interfaces/model/wires/ILine.js';
+type SchemaInputParamsType = {
     standortIDs: number[];
     schaltanlagenIDs: number[];
     schaltanlagenAbschnittIDs: number[];
@@ -30,11 +30,11 @@ declare type SchemaInputParamsType = {
     lines: ReadonlyMap<string, ILine>;
     objects: ReadonlyMap<string, IUUIDObject>;
 };
-declare type CimUUIDsEntry = {
+type CimUUIDsEntry = {
     identifiedObjectUUID: string;
     diagramObjectUUID?: string;
 };
-declare type I7SchemaKeyObject = {
+type I7SchemaKeyObject = {
     i7ID: number;
     variantenNr: number;
     additionalIDs?: number[];

package/dist/converter/integral7/dl-convert/dl-converter-i7.js

@@ -2,25 +2,25 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DLConverterI7 = void 0;
 const tslib_1 = require("tslib");
-const integral_sql_1 = require("../sql/integral.sql");
-const Diagram_1 = require("../../../model/diagram/Diagram");
-const OrientationKind_1 = require("../../../model/diagram/OrientationKind");
-const cim_constants_1 = require("../../../constants/cim-constants");
-const DiagramStyle_1 = require("../../../model/diagram/DiagramStyle");
+const integral_sql_1 = require("../sql/integral.sql.js");
+const Diagram_1 = require("../../../model/diagram/Diagram.js");
+const OrientationKind_1 = require("../../../model/diagram/OrientationKind.js");
+const cim_constants_1 = require("../../../constants/cim-constants.js");
+const DiagramStyle_1 = require("../../../model/diagram/DiagramStyle.js");
 const perf_hooks_1 = require("perf_hooks");
-const util_functions_1 = require("../model/dl-utils/util-functions");
-const constants_1 = require("../model/dl-utils/constants");
-const DiagramObject_1 = require("../../../model/diagram/DiagramObject");
-const DiagramObjectPoint_1 = require("../../../model/diagram/DiagramObjectPoint");
-const utils_schema_1 = require("../utils-schema");
-const data_types_1 = require("./db/data.types");
-const ConnectivityNode_1 = require("../../../model/core/ConnectivityNode");
-const ConductingEquipment_1 = require("../../../model/core/ConductingEquipment");
-const BusbarSection_1 = require("../../../model/wires/BusbarSection");
-const ACLineSegment_1 = require("../../../model/wires/ACLineSegment");
-const ModelContainer_1 = require("../../../model-container/model/ModelContainer");
-const common_utils_1 = require("../../../utils2/common.utils");
-const parser_utils_1 = require("../../../utils2/parser.utils");
+const util_functions_1 = require("../model/dl-utils/util-functions.js");
+const constants_1 = require("../model/dl-utils/constants.js");
+const DiagramObject_1 = require("../../../model/diagram/DiagramObject.js");
+const DiagramObjectPoint_1 = require("../../../model/diagram/DiagramObjectPoint.js");
+const utils_schema_1 = require("../utils-schema.js");
+const data_types_1 = require("./db/data.types.js");
+const ConnectivityNode_1 = require("../../../model/core/ConnectivityNode.js");
+const ConductingEquipment_1 = require("../../../model/core/ConductingEquipment.js");
+const BusbarSection_1 = require("../../../model/wires/BusbarSection.js");
+const ACLineSegment_1 = require("../../../model/wires/ACLineSegment.js");
+const ModelContainer_1 = require("../../../model-container/model/ModelContainer.js");
+const common_utils_1 = require("../../../utils2/common.utils.js");
+const parser_utils_1 = require("../../../utils2/parser.utils.js");
 class DLConverterI7 {
     constructor() {
     }
@@ -148,9 +148,9 @@ class DLConverterI7 {
     convertNsgVarianten() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NETZVARIANTEN)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NETZVARIANTEN, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NETZVARIANTEN), [2]));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.NETZVARIANTEN, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NETZVARIANTEN), [2]));
                 for (const i7Data of result) {
-                    const diagram = new Diagram_1.Diagram(parser_utils_1.getUUID(i7Data.guid), i7Data.name, String(i7Data.id));
+                    const diagram = new Diagram_1.Diagram((0, parser_utils_1.getUUID)(i7Data.guid), i7Data.name, String(i7Data.id));
                     diagram.orientation = OrientationKind_1.OrientationKind.negative;
                     diagram.diagramStyle = new DiagramStyle_1.DiagramStyle(common_utils_1.CommonUtils.generateUUID(), cim_constants_1.DiagramLayoutTypes.NODE_BREAKER);
                     DLConverterI7.addCimObjects(diagram);
@@ -176,9 +176,9 @@ class DLConverterI7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             let ret_val = false;
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_STANDORT) && standortIDs.length > 0) {
-                const resultAll = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_STANDORT, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_STANDORT), []));
+                const resultAll = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.NSG_STANDORT, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_STANDORT), []));
                 const filteredResultsAll = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(resultAll, variantenNr, onlyEingeblendet);
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_STANDORT_FILTERED, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_STANDORT), standortIDs));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.NSG_STANDORT_FILTERED, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_STANDORT), standortIDs));
                 const filteredResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(result, variantenNr, onlyEingeblendet);
                 const statSitesInCurrentDiagram = filteredResults.length / filteredResultsAll.length; //p.u.
                 const statNSGSitesStandortIDs = filteredResults.length / standortIDs.length; //p.u.
@@ -194,7 +194,7 @@ class DLConverterI7 {
     convertSchemaKnotenSo(variantenNr, onlyEingeblendet, knotenSoIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO) && knotenSoIDs.length > 0) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_KNOTEN_SO, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO), knotenSoIDs));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.NSG_KNOTEN_SO, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO), knotenSoIDs));
                 const filteredResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(result, variantenNr, onlyEingeblendet);
                 for (const i7Data of filteredResults) {
                     const schemaObjKey = DLConverterI7.registerNsgObjectAndGetSchemaKay(i7Data, integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO);
@@ -230,7 +230,7 @@ class DLConverterI7 {
     convertSchemaSchaltanlage(variantenNr, onlyEingeblendet, schaltanlagenIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_SCHALTANLAGE) && schaltanlagenIDs.length > 0) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_SCHALTANLAGE, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_SCHALTANLAGE), schaltanlagenIDs));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.NSG_SCHALTANLAGE, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_SCHALTANLAGE), schaltanlagenIDs));
                 const filteredResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(result, variantenNr, onlyEingeblendet);
                 for (const i7Data of filteredResults) {
                     DLConverterI7.registerNsgObjectAndGetSchemaKay(i7Data, integral_sql_1.Integral7TableNames.NSG_SCHALTANLAGE);
@@ -244,7 +244,7 @@ class DLConverterI7 {
     convertSchemaSchaltanlagenAbschnitte(variantenNr, onlyEingeblendet, schaltanlagenabschnittIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_SCHALTANLAGENABSCHNITT) && schaltanlagenabschnittIDs.length > 0) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_SCHALTANLAGENABSCHNITT, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_SCHALTANLAGENABSCHNITT), schaltanlagenabschnittIDs));
+                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.NSG_SCHALTANLAGENABSCHNITT, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_SCHALTANLAGENABSCHNITT), schaltanlagenabschnittIDs));
                 const filteredResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(result, variantenNr, onlyEingeblendet);
                 for (const i7Data of filteredResults) {
                     const schemaObjKey = DLConverterI7.registerNsgObjectAndGetSchemaKay(i7Data, integral_sql_1.Integral7TableNames.NSG_SCHALTANLAGENABSCHNITT);
@@ -280,7 +280,7 @@ class DLConverterI7 {
             /* BEGIN: Select-Statement zum ermitteln der maximalen Slotnummer bezogen auf spezifische Schaltanlagen und Schaltfelder */
             let sqlSelectGroupedMaxSlotSf = `SELECT nsgsaa AS nsgsaa, max(slotnummer) + 1 AS laenge
                                      FROM nsg_nsgschaltfeld
-                                     WHERE ((${integral_sql_1.getWhereIDs('nsgsaa', schaltanlagenabschnittIDs).join(' OR ')}))`;
+                                     WHERE ((${(0, integral_sql_1.getWhereIDs)('nsgsaa', schaltanlagenabschnittIDs).join(' OR ')}))`;
             if (onlyEingeblendet) {
                 sqlSelectGroupedMaxSlotSf += ` AND (eingeblendet = ${isEingeblendet} OR (eingeblendet IS NULL AND angezeigt = ${isEingeblendet}))`;
             }
@@ -291,7 +291,7 @@ class DLConverterI7 {
             /* BEGIN: Select-Statement zum ermitteln der maximalen Slotnummer bezogen auf spezifische Schaltanlagen und Kuppelfelder */
             let sqlSelectGroupedMaxSlotKpF = `SELECT nsgsaa AS nsgsaa, max(slotnummer) + 1 AS laenge
                                       FROM nsg_nsgkpfeld
-                                      WHERE ((${integral_sql_1.getWhereIDs('nsgsaa', schaltanlagenabschnittIDs).join(' OR ')}))`;
+                                      WHERE ((${(0, integral_sql_1.getWhereIDs)('nsgsaa', schaltanlagenabschnittIDs).join(' OR ')}))`;
             if (onlyEingeblendet) {
                 sqlSelectGroupedMaxSlotKpF += ` AND (eingeblendet = ${isEingeblendet} OR (eingeblendet IS NULL AND angezeigt = ${isEingeblendet}))`;
             }
@@ -312,7 +312,7 @@ class DLConverterI7 {
               netz_ssab.id       AS idSSAB
        FROM netz_ssab
                 LEFT JOIN nsg_nsgsaabschnitt AS nsg_nsgsaab ON nsg_nsgsaab.saabschnitt = netz_ssab.saabschnitt
-       WHERE (${integral_sql_1.getWhereIDs('nsg_nsgsaab.saabschnitt', schaltanlagenabschnittIDs).join(' OR ')});`;
+       WHERE (${(0, integral_sql_1.getWhereIDs)('nsg_nsgsaab.saabschnitt', schaltanlagenabschnittIDs).join(' OR ')});`;
             const queryResults = yield this.mysqlController.execQuery(sqlStatement);
             queryResults.forEach(value => {
                 value.laenge = Math.max((mappedResultsMaxSlotsSf.get(value.id) || 0), (mappedResultsMaxSlotsKpF.get(value.id) || 0), value.laenge);
@@ -357,7 +357,7 @@ class DLConverterI7 {
                 diagramObject.diagramUUID = this.activeDiagram.getUUID();
                 diagramObject.identifiedObjectUUID = cimObjectUUID;
                 diagramObject.rotation = util_functions_1.DLUtilFunctions.getRotationBasedOnNsgSa(nsgSa.ausrichtung);
-                utils_schema_1.copyDiagramObjectPoints(diagramObject, points);
+                (0, utils_schema_1.copyDiagramObjectPoints)(diagramObject, points);
                 DLConverterI7.addIDsRelationMapping(schemaObjKey, {
                     identifiedObjectUUID: cimObjectUUID,
                     diagramObjectUUID: diagramObject.getUUID()
@@ -383,8 +383,8 @@ class DLConverterI7 {
                     integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.KNOTEN_STARR]
                 ];
                 const i7checkedTables = this.filterTablesByAvailability(i7relevantTables);
-                const i7knotenBeziehungen = yield this.mysqlController.execQuery(integral_sql_1.getI7KnotenBeziehungenQuery(i7checkedTables, schaltfeldIDs));
-                const queryStr = integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_SCHALTFELD, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_SCHALTFELD), schaltfeldIDs);
+                const i7knotenBeziehungen = yield this.mysqlController.execQuery((0, integral_sql_1.getI7KnotenBeziehungenQuery)(i7checkedTables, schaltfeldIDs));
+                const queryStr = (0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.NSG_SCHALTFELD, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_SCHALTFELD), schaltfeldIDs);
                 const resultsNsgSchaltfeld = yield this.mysqlController.execQuery(queryStr);
                 const filteredResultsNsgSchaltfeld = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(resultsNsgSchaltfeld, variantenNr, onlyEingeblendet);
                 for (const i7Data of filteredResultsNsgSchaltfeld) {
@@ -545,8 +545,8 @@ class DLConverterI7 {
                     integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.KNOTEN_STARR]
                 ];
                 const i7checkedTables = this.filterTablesByAvailability(i7relevantTables);
-                const i7knotenBeziehungen = yield this.mysqlController.execQuery(integral_sql_1.getI7KnotenBeziehungenQuery(i7checkedTables, querkupplungIDs));
-                const resultsNsgKpFeld = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_QUERKUPPLUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_QUERKUPPLUNG), querkupplungIDs));
+                const i7knotenBeziehungen = yield this.mysqlController.execQuery((0, integral_sql_1.getI7KnotenBeziehungenQuery)(i7checkedTables, querkupplungIDs));
+                const resultsNsgKpFeld = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.NSG_QUERKUPPLUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_QUERKUPPLUNG), querkupplungIDs));
                 const filteredResultsNsgKpFeld = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(resultsNsgKpFeld, variantenNr, onlyEingeblendet);
                 for (const i7Data of filteredResultsNsgKpFeld) {
                     DLConverterI7.registerNsgObjectAndGetSchemaKay(i7Data, integral_sql_1.Integral7TableNames.NSG_QUERKUPPLUNG);
@@ -634,8 +634,8 @@ class DLConverterI7 {
                     integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.KNOTEN_STARR]
                 ];
                 const i7checkedTables = this.filterTablesByAvailability(i7relevantTables);
-                const i7knotenBeziehungen = yield this.mysqlController.execQuery(integral_sql_1.getI7KnotenBeziehungenQuery(i7checkedTables, laengskupplungIDs));
-                const resultsNsgLKupplung = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_LAENGSKUPPLUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_LAENGSKUPPLUNG), [...nsgSAABIDs.values()]));
+                const i7knotenBeziehungen = yield this.mysqlController.execQuery((0, integral_sql_1.getI7KnotenBeziehungenQuery)(i7checkedTables, laengskupplungIDs));
+                const resultsNsgLKupplung = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.NSG_LAENGSKUPPLUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_LAENGSKUPPLUNG), [...nsgSAABIDs.values()]));
                 const filteredResultsNsgLKupplung = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(resultsNsgLKupplung, variantenNr, onlyEingeblendet);
                 for (const i7Data of filteredResultsNsgLKupplung) {
                     DLConverterI7.registerNsgObjectAndGetSchemaKay(i7Data, integral_sql_1.Integral7TableNames.NSG_LAENGSKUPPLUNG);
@@ -741,7 +741,7 @@ class DLConverterI7 {
             }
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_TRAFO2W) && nsgStandortIDs.size > 0) {
                 // Da TrafoIDs nicht im Integral7Model hinterlegt werden, Trafos auf Basis der NsgSO-IDs ermitteln (äuqivalent zu Netz-Trafo2W)
-                const results = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_TRAFO2W, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_TRAFO2W), [...nsgStandortIDs.values()]));
+                const results = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.NSG_TRAFO2W, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_TRAFO2W), [...nsgStandortIDs.values()]));
                 const filteredResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(results, variantenNr, onlyEingeblendet);
                 for (const i7Data of filteredResults) {
                     const schemaObjKey = DLConverterI7.registerNsgObjectAndGetSchemaKay(i7Data, data_types_1.DataTypes.NSG_TRAFO2W);
@@ -843,9 +843,9 @@ class DLConverterI7 {
             }
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_TRAFO3W) && nsgStandortIDs.size > 0) {
                 // Da TrafoIDs nicht im Integral7Model hinterlegt werden, Trafos auf Basis der NsgSO-IDs ermitteln (äuqivalent zu Netz-Trafo2W)
-                const results = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_TRAFO3W, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_TRAFO3W), [...nsgStandortIDs.values()]));
+                const results = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.NSG_TRAFO3W, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_TRAFO3W), [...nsgStandortIDs.values()]));
                 const filteredResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(results, variantenNr, onlyEingeblendet);
-                const netzTrafoResults = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TRAFO3W, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TRAFO3W), [...netzStandortIDs.values()]));
+                const netzTrafoResults = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.TRAFO3W, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TRAFO3W), [...netzStandortIDs.values()]));
                 const netzTrafos = new Map(netzTrafoResults.map(obj => [obj.id, obj]));
                 for (const i7Data of filteredResults) {
                     const schemaObjKey = DLConverterI7.registerNsgObjectAndGetSchemaKay(i7Data, data_types_1.DataTypes.NSG_TRAFO3W);
@@ -981,11 +981,11 @@ class DLConverterI7 {
             }
             const leitungIDs = [...this.inputArgs.integralLeitungen.keys(), ...this.inputArgs.integralHgueLeitungen.keys()];
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_LEITUNG) && this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_LEITUNGSPUNKT) && leitungIDs.length > 0) {
-                const leitungResults = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_LEITUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_LEITUNG), leitungIDs));
+                const leitungResults = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.NSG_LEITUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_LEITUNG), leitungIDs));
                 let filteredLeitungResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(leitungResults, variantenNr, onlyEingeblendet);
                 const nsgLeitungIDs = filteredLeitungResults.map(elem => elem.id);
                 if (nsgLeitungIDs.length > 0) {
-                    const leitungspktResults = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_LEITUNGSPUNKT, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_LEITUNGSPUNKT), nsgLeitungIDs));
+                    const leitungspktResults = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.NSG_LEITUNGSPUNKT, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_LEITUNGSPUNKT), nsgLeitungIDs));
                     let filteredLeitungspktResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(leitungspktResults, variantenNr, onlyEingeblendet);
                     for (const i7Data of filteredLeitungResults) {
                         const schemaObjKey = DLConverterI7.createSchemaKeyObject({ i7ID: i7Data.id, variantenNr });
@@ -1116,7 +1116,7 @@ class DLConverterI7 {
                                 type = integral_sql_1.I7Objects.STROMKREISABSCHNITT_FREILEITUNG;
                             }
                             // TODO quickfix for parameter 'availableColumnNames'
-                            const leitungStromkreisabschnitt = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(type, ['leitung', 'laenge', 'pos', 'typ'], [netzLeitungsObject.id]));
+                            const leitungStromkreisabschnitt = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(type, ['leitung', 'laenge', 'pos', 'typ'], [netzLeitungsObject.id]));
                             leitungStromkreisabschnitt.sort((a, b) => a.pos - b.pos);
                             const acSegmentPercentages = [];
                             let completeLength = 0;
@@ -1188,7 +1188,7 @@ class DLConverterI7 {
             const whereIDs = [...DLConverterI7.i7ID2DbNsgObjectInFrame.keys()].map(arg => DLConverterI7.parseSchemaKeyObject(arg).i7ID);
             // const whereIDs = [...integral7.i7SchemaID2Type.keys()].map(value => DLUtilFunctions.parseSchemaKey(value).id);
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_QUERZWEIG) && whereIDs.length > 0) {
-                const results = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_QUERZWEIG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_QUERZWEIG), whereIDs));
+                const results = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.NSG_QUERZWEIG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_QUERZWEIG), whereIDs));
                 let filteredResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(results, variantenNr, onlyEingeblendet);
                 for (const i7Data of filteredResults) {
                     const schemaObjKey = DLConverterI7.registerNsgObjectAndGetSchemaKay(i7Data, data_types_1.DataTypes.NSG_QUERZWEIG);