@enervance/insight-cim-model 0.0.60 → 0.0.61

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

@@ -66,7 +66,7 @@ export declare class ConverterI7 {
     convertKnotenLk(cimModel: Model, laengskupplungIDs: number[]): Promise<void>;
     convertSchlaufen(cimModel: Model, integral7: Integral7Model, knotenSoIDs: number[]): Promise<void>;
     convertBelastungen(cimModel: INTEGRALModel, knotenSfIDs: number[], defaultValuesConfig: IDefaultValuesConfig, targetClass: string): Promise<any>;
-    convertEinspeisungen(cimModel: INTEGRALModel, knotenSfIDs: number[], targetClass: string): Promise<void>;
+    convertEinspeisungen(cimModel: INTEGRALModel, knotenSfIDs: number[], objectMappingConfig: IObjectMappingConfig): Promise<void>;
     convertErsatzQuerZweige(cimModel: INTEGRALModel, knotenSfIDs: number[], targetClass: string): Promise<void>;
     convertGeneratoren(cimModel: INTEGRALModel, knotenSfIDs: number[], energyTypesConfig: any): Promise<void>;
     convertAsynchronmotor(cimModel: INTEGRALModel, knotenSfIDs: number[], defaultValuesConfig: IDefaultValuesConfig): Promise<void>;

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

@@ -324,7 +324,7 @@ class ConverterI7 {
             }
             if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
                 startTime = perf_hooks_1.performance.now();
-                yield this.convertEinspeisungen(cimModel, soSfKnoten, objectMappingConfig.Einspeisung.class);
+                yield this.convertEinspeisungen(cimModel, soSfKnoten, objectMappingConfig);
                 logExecutionTime(this.logger, startTime, `convertEinspeisungen`);
             }
             if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
@@ -1984,8 +1984,11 @@ class ConverterI7 {
             }
         });
     }
-    convertEinspeisungen(cimModel, knotenSfIDs, targetClass) {
+    convertEinspeisungen(cimModel, knotenSfIDs, objectMappingConfig) {
+        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const targetConfig = objectMappingConfig.Einspeisung;
+            const targetClass = objectMappingConfig.Einspeisung.class;
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.EINSPEISUNG)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.EINSPEISUNG, knotenSfIDs));
                 switch (targetClass) {
@@ -1998,7 +2001,15 @@ class ConverterI7 {
                         break;
                     }
                     default: {
-                        yield this.convertEinspeisungen2EnergySource(cimModel, result);
+                        if ((_a = targetConfig.referencePriority) === null || _a === void 0 ? void 0 : _a.prio) {
+                            const i7SlacksResults = result.filter(it => it.spannungsgeregelt);
+                            const i7EnergySourceResults = result.filter(it => !it.spannungsgeregelt);
+                            yield this.convertEinspeisungen2EnergySource(cimModel, i7EnergySourceResults);
+                            yield this.convertEinspeisungen2ExternalNetworkInjection(cimModel, i7SlacksResults);
+                        }
+                        else {
+                            yield this.convertEinspeisungen2EnergySource(cimModel, result);
+                        }
                     }
                 }
             }
@@ -2963,7 +2974,6 @@ class ConverterI7 {
                             externalNetworkInjection.controlEnabled = inBetrieb;
                             regulatingControl.addRegulatingCondEq(externalNetworkInjection);
                             externalNetworkInjection.regulatingControl = regulatingControl;
-                            this.setTapChangerControl;
                             cimModel.addRegulatingControl(regulatingControl);
                             break;
                         }