@enervance/insight-cim-model 0.0.172 → 0.0.173

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

@@ -135,7 +135,6 @@ const CsPpccControlKind_1 = require("../../model/dc/CsPpccControlKind.js");
 const ApparentPowerLimit_1 = require("../../model/operationallimits/ApparentPowerLimit.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_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");
@@ -537,17 +536,16 @@ class ConverterIntegral7 {
             yield this.assignTerminalSequenceNumber(cimModel);
             logExecutionTime(this.logger, startTime, `assignment of sequence number`);
             /** DC Model */
-            /** DL Profile */
+            /**
+             * DL Profile
+             **/
             this.executor = new executor_1.Executor(this.mysqlController, this.configUuid);
             yield this.executor.mergeDataFromIntegralID2UUID(this.integralID2UUID);
+            for (const boundaryFrame of this.exportFramesBoundary.values()) {
+                yield this.executor.mergeDataFromFrame(boundaryFrame);
+            }
             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 netz_standortIds = standortIDs.map(standortId => {
                 return { id: standortId };
             });
@@ -590,21 +588,35 @@ class ConverterIntegral7 {
                 if (resultingObject instanceof Diagram_1.Diagram) {
                     // UUIDs von Diagram-Objekten werden aus I7 übernommen
                     frame.cimModel.addDiagram(resultingObject);
-                }
-                else if (resultingObject instanceof DiagramObject_1.DiagramObject) {
-                    // UUIDs gemäß UUID v5 generieren
-                    const diagramObject = resultingObject;
-                    const uuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.DiagramObject, this.configUuid, diagramObject.getIdentifiedObjectUUID());
-                    diagramObject.mrid = uuid;
-                    for (const diagramObjectPoint of diagramObject.diagramObjectPoints) {
-                        const key = uuid + String((_a = diagramObjectPoint.sequenceNumber) !== null && _a !== void 0 ? _a : 1);
-                        const pointUuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.DiagramObjectPoint, this.configUuid, key);
-                        diagramObjectPoint.mrid = pointUuid;
-                    }
-                    frame.cimModel.addDiagramObject(resultingObject);
-                }
-            }
-            console.log('over');
+                    while (resultingObject.diagramElements.length > 0) {
+                        const currentDiagramObject = resultingObject.diagramElements.pop();
+                        // const diagramObject = resultingObject as DiagramObject;
+                        const uuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.DiagramObject, this.configUuid, currentDiagramObject.getIdentifiedObjectUUID());
+                        currentDiagramObject.mrid = uuid;
+                        for (const diagramObjectPoint of currentDiagramObject.diagramObjectPoints) {
+                            const key = uuid + String((_a = diagramObjectPoint.sequenceNumber) !== null && _a !== void 0 ? _a : 1);
+                            const pointUuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.DiagramObjectPoint, this.configUuid, key);
+                            diagramObjectPoint.mrid = pointUuid;
+                        }
+                        frame.cimModel.addDiagramObject(currentDiagramObject);
+                    }
+                    resultingObject.diagramElements = [];
+                    // } else if (resultingObject instanceof DiagramObject) {
+                    //   // UUIDs gemäß UUID v5 generieren
+                    //   const diagramObject = resultingObject as DiagramObject;
+                    //   const uuid = CommonUtils.generateUUIDv5(ClassNames.DiagramObject, this.configUuid, diagramObject.getIdentifiedObjectUUID());
+                    //   diagramObject.mrid = uuid;
+                    //
+                    //   for (const diagramObjectPoint of diagramObject.diagramObjectPoints) {
+                    //     const key = uuid + String(diagramObjectPoint.sequenceNumber ?? 1);
+                    //     const pointUuid = CommonUtils.generateUUIDv5(ClassNames.DiagramObjectPoint, this.configUuid, key);
+                    //     diagramObjectPoint.mrid = pointUuid;
+                    //   }
+                    //   frame.cimModel.addDiagramObject(resultingObject);
+                }
+            }
+            this.executor.dataManager.cimModelGraph.purgeAll();
+            this.executor.dataManager.dbObjectKeyCimModelUuidGraph.purgeAll();
         });
     }
     assignTerminalSequenceNumber(cimModel) {
@@ -2925,7 +2937,8 @@ class ConverterIntegral7 {
                     }
                     rControl.targetDeadband = (0, parser_utils_1.isNumericI7)(uband) ? uband : undefined; //zulässiges Spannungsband
                     /** Spannung in kilo*/
-                    rControl.targetValue = usoll;
+                    //TODO TEMP FIX bei lokaler Regelegung bleibt usoll = null.
+                    rControl.targetValue = !usoll ? i7Data.usoll : usoll;
                     const guidSuffix = (_a = tCn === null || tCn === void 0 ? void 0 : tCn.getVoltageLevel()) === null || _a === void 0 ? void 0 : _a.getUUID().substring(0, 8);
                     rControl.name = (0, util_create_1.createNotation)([rControl.name, '_', guidSuffix, '_RC'], 32, true);
                     rControl.terminalUUID = cterminal.getUUID();