@enervance/insight-cim-model 0.0.269-beta1 → 0.0.269-beta10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/converter/integral7/converter.integral7.d.ts +3 -3
- package/dist/converter/integral7/converter.integral7.js +96 -11
- package/dist/converter/integral7/converter.integral7.js.map +1 -1
- package/dist/converter/integral7/interface-i7/data-structures-i7.d.ts +11 -1
- package/dist/converter/integral7/interface-i7/data-structures-i7.js.map +1 -1
- package/dist/converter/integral7/model/integral/Netzbereich.d.ts +6 -1
- package/dist/converter/integral7/model/integral/Netzbereich.js +7 -4
- package/dist/converter/integral7/model/integral/Netzbereich.js.map +1 -1
- package/dist/converter/integral7/model/integral/NetzbereichAussen.d.ts +7 -0
- package/dist/converter/integral7/model/integral/NetzbereichAussen.js +12 -0
- package/dist/converter/integral7/model/integral/NetzbereichAussen.js.map +1 -0
- package/dist/converter/integral7/model/integral/NetzbereichInnen.d.ts +7 -0
- package/dist/converter/integral7/model/integral/NetzbereichInnen.js +12 -0
- package/dist/converter/integral7/model/integral/NetzbereichInnen.js.map +1 -0
- package/dist/converter/integral7/sql/integral.sql.js +6 -1
- package/dist/converter/integral7/sql/integral.sql.js.map +1 -1
- package/dist/converter/integral7/tp-bd-profile/model/BoundarySet.d.ts +6 -0
- package/dist/converter/integral7/tp-bd-profile/model/BoundarySet.js +16 -2
- package/dist/converter/integral7/tp-bd-profile/model/BoundarySet.js.map +1 -1
- package/dist/converter/integral7/tp-bd-profile/model/ExternalPoint.d.ts +8 -0
- package/dist/converter/integral7/tp-bd-profile/model/ExternalPoint.js +13 -0
- package/dist/converter/integral7/tp-bd-profile/model/ExternalPoint.js.map +1 -0
- package/dist/converter/integral7/tp-bd-profile/model/InternalPoint.d.ts +8 -0
- package/dist/converter/integral7/tp-bd-profile/model/InternalPoint.js +13 -0
- package/dist/converter/integral7/tp-bd-profile/model/InternalPoint.js.map +1 -0
- package/dist/converter/integral7/tp-bd-profile/model/convert-net-equivalent.model.d.ts +8 -0
- package/dist/converter/integral7/tp-bd-profile/model/convert-net-equivalent.model.js +9 -0
- package/dist/converter/integral7/tp-bd-profile/model/convert-net-equivalent.model.js.map +1 -0
- package/dist/converter/integral7/tp-bd-profile/tb-bd-converter.utilities.d.ts +4 -1
- package/dist/converter/integral7/tp-bd-profile/tb-bd-converter.utilities.js +59 -3
- package/dist/converter/integral7/tp-bd-profile/tb-bd-converter.utilities.js.map +1 -1
- package/dist/converter/integral7/tp-bd-profile/tb-bd-converter.utilities.types.d.ts +18 -2
- package/dist/converter/integral7/tp-bd-profile/tp-bd-converter.d.ts +3 -0
- package/dist/converter/integral7/tp-bd-profile/tp-bd-converter.js +112 -14
- package/dist/converter/integral7/tp-bd-profile/tp-bd-converter.js.map +1 -1
- package/dist/index.d.ts +2 -0
- package/dist/index.js +5 -1
- package/dist/index.js.map +1 -1
- package/dist/utils2/parser.utils.js +2 -2
- package/dist/utils2/parser.utils.js.map +1 -1
- package/package.json +1 -1
|
@@ -5,7 +5,7 @@ import { PowerTransformerEnd } from '../../model/wires/PowerTransformerEnd.js';
|
|
|
5
5
|
import { MySQLConfig, MysqlController } from '../../util/database/mysql-controller.js';
|
|
6
6
|
import { INTEGRALModelContainer } from '../../model-container/model/INTEGRALModelContainer.js';
|
|
7
7
|
import { ModelContainer } from '../../model-container/model/ModelContainer.js';
|
|
8
|
-
import { ConverterStatus, IExportConfig, Integral7Model, ITargetVoltage } from './interface-i7/data-structures-i7.js';
|
|
8
|
+
import { ConverterStatus, ConvertWithNetzbereichResponse, IExportConfig, Integral7Model, ITargetVoltage } from './interface-i7/data-structures-i7.js';
|
|
9
9
|
import { DefaultValuesConfigInterface } from './interface-i7/default-values-config.interface.js';
|
|
10
10
|
import { I7ExportFrame } from './interface-i7/export-frame-i7.js';
|
|
11
11
|
import { ObjectMappingConfigInterface } from './interface-i7/object-mapping-config.interface.js';
|
|
@@ -13,7 +13,7 @@ import { AsynchronmotorTyp, Einspeisung, Ersatzquerzweig, GeneratorTyp, KDrossel
|
|
|
13
13
|
import { ConfigurableDLConvertOptions, Executor } from './dl-convert/executor.js';
|
|
14
14
|
import { IEnergySourceTypeMapping } from './interface-i7/energy-source.type.mapping.js';
|
|
15
15
|
import { IUuidConfig } from './interface-i7/uuid-config.interface.js';
|
|
16
|
-
import {
|
|
16
|
+
import { NetEquivalentOptions } from './tp-bd-profile/model/convert-net-equivalent.model.js';
|
|
17
17
|
export declare class ConverterIntegral7 {
|
|
18
18
|
#private;
|
|
19
19
|
logger: ILogger;
|
|
@@ -63,8 +63,8 @@ export declare class ConverterIntegral7 {
|
|
|
63
63
|
defaultValuesConfig: DefaultValuesConfigInterface;
|
|
64
64
|
set configurableDLConvertOptions(arg: ConfigurableDLConvertOptions);
|
|
65
65
|
get configurableDLConvertOptions(): ConfigurableDLConvertOptions;
|
|
66
|
-
tpBdConverter: TpBdConverter;
|
|
67
66
|
constructor();
|
|
67
|
+
convertWithNetzbereich(objectMappingConfig: ObjectMappingConfigInterface, defaultValuesConfig: DefaultValuesConfigInterface, energyTypesConfig: any, exportConfig: IExportConfig[], energySourceTypeMappingConfig: IEnergySourceTypeMapping[], configUuid: Array<IUuidConfig>, tempDirPath: string, netEquivalentOptions: NetEquivalentOptions): Promise<ConvertWithNetzbereichResponse>;
|
|
68
68
|
/**
|
|
69
69
|
* Konvertiert das Netz aus der MySQL Datenbank
|
|
70
70
|
* @param defaultValuesConfig Standardwerte zur Verwendung bei nicht gepflegten Angaben
|
|
@@ -157,6 +157,10 @@ class ConverterIntegral7 {
|
|
|
157
157
|
return tslib_1.__classPrivateFieldGet(this, _ConverterIntegral7_configurableDLConvertOptions, "f");
|
|
158
158
|
}
|
|
159
159
|
/* ---------- ---------- ---------- */
|
|
160
|
+
/* ---------- ---------- ---------- */
|
|
161
|
+
// TP-BD-Converter related properties
|
|
162
|
+
// tpBdConverter: TpBdConverter;
|
|
163
|
+
/* ---------- ---------- ---------- */
|
|
160
164
|
constructor() {
|
|
161
165
|
/** Exportnetze gemäß Konfiguration */
|
|
162
166
|
this.exportFrames = new Map();
|
|
@@ -193,6 +197,98 @@ class ConverterIntegral7 {
|
|
|
193
197
|
this.blocktransformatoren = [];
|
|
194
198
|
_ConverterIntegral7_configurableDLConvertOptions.set(this, {});
|
|
195
199
|
}
|
|
200
|
+
convertWithNetzbereich(objectMappingConfig, defaultValuesConfig, energyTypesConfig, exportConfig, energySourceTypeMappingConfig, configUuid, tempDirPath, netEquivalentOptions) {
|
|
201
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
202
|
+
this.objectMappingConfig = objectMappingConfig;
|
|
203
|
+
this.defaultValuesConfig = defaultValuesConfig;
|
|
204
|
+
this.configUuid = configUuid;
|
|
205
|
+
try {
|
|
206
|
+
yield this.createColumnIndex();
|
|
207
|
+
yield this.configExportFrames(exportConfig, defaultValuesConfig, tempDirPath);
|
|
208
|
+
/** Typinformationen abfragen */
|
|
209
|
+
yield this.convertBetriebsmitteltypenKdrossel();
|
|
210
|
+
yield this.convertBetriebsmitteltypenLeitung();
|
|
211
|
+
yield this.convertBetriebsmitteltypenTrafo();
|
|
212
|
+
yield this.convertBetriebsmitteltypenGenerator();
|
|
213
|
+
yield this.convertBetriebsmitteltypenAsynchronmotor();
|
|
214
|
+
yield this.convertMultiplikationsfaktoren();
|
|
215
|
+
yield this.queryLeitungsAnschlussIDs();
|
|
216
|
+
yield this.queryTrafosAnschlussIDs();
|
|
217
|
+
yield this.queryHgueAnschlussIDs();
|
|
218
|
+
yield this.queryLDroselAnschlussIDs();
|
|
219
|
+
yield this.queryErsatzLaengsAnschlussIDs();
|
|
220
|
+
yield this.queryLkondensatorAnschlussIDs();
|
|
221
|
+
const tpBdConverter = new tp_bd_converter_1.TpBdConverter(this.mysqlController, this.logger, configUuid);
|
|
222
|
+
tpBdConverter.initDatabaseMetaData(this.availableTableNames);
|
|
223
|
+
tpBdConverter.setupLookupMaps(this.integralID2UUID);
|
|
224
|
+
tpBdConverter.setExportTempDirPath(tempDirPath);
|
|
225
|
+
/** BD Profile */
|
|
226
|
+
this.logger.debug('Convert BD Profiles');
|
|
227
|
+
console.log('Convert BD Profiles');
|
|
228
|
+
let boundaryEqUUId = undefined;
|
|
229
|
+
for (const entry of this.exportFramesBoundary.entries()) {
|
|
230
|
+
const geoRegionUUID = entry[0];
|
|
231
|
+
const frame = entry[1];
|
|
232
|
+
boundaryEqUUId = frame.getModelUUID(rdf_xml_1.RDF_XML.PROFILE_EQ_BD);
|
|
233
|
+
const geoRegion = frame.cimModel.getGeographicalRegion(geoRegionUUID);
|
|
234
|
+
if (!geoRegion)
|
|
235
|
+
continue;
|
|
236
|
+
yield this.convertFrame(frame, geoRegion, objectMappingConfig, energyTypesConfig, defaultValuesConfig, energySourceTypeMappingConfig);
|
|
237
|
+
}
|
|
238
|
+
this.logger.debug('Convert MAS Profiles');
|
|
239
|
+
console.log('Convert MAS Profiles');
|
|
240
|
+
for (const entry of this.exportFrames.entries()) {
|
|
241
|
+
const geoRegionUUID = entry[0];
|
|
242
|
+
const frame = entry[1];
|
|
243
|
+
const geoRegion = frame.cimModel.getGeographicalRegion(geoRegionUUID);
|
|
244
|
+
if (!geoRegion)
|
|
245
|
+
continue;
|
|
246
|
+
this.logger.debug(`Convert MAS profile: ${frame.mas}`);
|
|
247
|
+
console.log(`Convert MAS profile: ${frame.mas}`);
|
|
248
|
+
yield this.convertFrame(frame, geoRegion, objectMappingConfig, energyTypesConfig, defaultValuesConfig, energySourceTypeMappingConfig);
|
|
249
|
+
if (boundaryEqUUId) {
|
|
250
|
+
frame.addDependentModel(rdf_xml_1.RDF_XML.PROFILE_EQ, boundaryEqUUId);
|
|
251
|
+
}
|
|
252
|
+
frame.validateCIMModel();
|
|
253
|
+
yield tpBdConverter.convertNetzbereich(frame.cimModel, netEquivalentOptions.netzbereichID);
|
|
254
|
+
frame.purgeData();
|
|
255
|
+
const startTime = perf_hooks.performance.now();
|
|
256
|
+
frame.openXMLModel();
|
|
257
|
+
this.logger.debug(`Serialize MAS profile: ${frame.mas}`);
|
|
258
|
+
console.log(`Serialize MAS profile: ${frame.mas}`);
|
|
259
|
+
frame.serializeModel(defaultValuesConfig);
|
|
260
|
+
yield frame.closeXMLModel();
|
|
261
|
+
let endTime = perf_hooks.performance.now();
|
|
262
|
+
// frame.cimModel.purgeData();
|
|
263
|
+
console.log(`\nSerializeModel ${geoRegion.name} ${(endTime - startTime) / 1000} seconds\n`);
|
|
264
|
+
}
|
|
265
|
+
this.logger.debug('Serialize TP-BD Profiles');
|
|
266
|
+
console.log('Serialize TP-BD Profiles');
|
|
267
|
+
// await tpBdConverter.serialize(defaultValuesConfig);
|
|
268
|
+
// this.logger.debug('Serialize Default Profile');
|
|
269
|
+
// this.exportFrameDefault.openXMLModel();
|
|
270
|
+
// this.exportFrameDefault.serializeModel(defaultValuesConfig);
|
|
271
|
+
// await this.exportFrameDefault.closeXMLModel();
|
|
272
|
+
return {
|
|
273
|
+
status: 'successful',
|
|
274
|
+
message: 'ok',
|
|
275
|
+
data: {
|
|
276
|
+
boundarySets: tpBdConverter.exportTopologyBoundaries,
|
|
277
|
+
frames: [...this.exportFrames.values()]
|
|
278
|
+
// net: frame,
|
|
279
|
+
}
|
|
280
|
+
};
|
|
281
|
+
}
|
|
282
|
+
catch (e) {
|
|
283
|
+
this.logger.error(e);
|
|
284
|
+
console.error('ERROR:' + e);
|
|
285
|
+
return { status: 'error', message: e.toString() };
|
|
286
|
+
}
|
|
287
|
+
finally {
|
|
288
|
+
yield this.dropColumnIndex();
|
|
289
|
+
}
|
|
290
|
+
});
|
|
291
|
+
}
|
|
196
292
|
/**
|
|
197
293
|
* Konvertiert das Netz aus der MySQL Datenbank
|
|
198
294
|
* @param defaultValuesConfig Standardwerte zur Verwendung bei nicht gepflegten Angaben
|
|
@@ -220,10 +316,6 @@ class ConverterIntegral7 {
|
|
|
220
316
|
yield this.queryLDroselAnschlussIDs();
|
|
221
317
|
yield this.queryErsatzLaengsAnschlussIDs();
|
|
222
318
|
yield this.queryLkondensatorAnschlussIDs();
|
|
223
|
-
this.tpBdConverter = new tp_bd_converter_1.TpBdConverter(this.mysqlController, this.logger, configUuid);
|
|
224
|
-
this.tpBdConverter.initDatabaseMetaData(this.availableTableNames);
|
|
225
|
-
this.tpBdConverter.setupLookupMaps(this.integralID2UUID);
|
|
226
|
-
this.tpBdConverter.setExportTempDirPath(tempDirPath);
|
|
227
319
|
/** BD Profile */
|
|
228
320
|
this.logger.debug('Convert BD Profiles');
|
|
229
321
|
console.log('Convert BD Profiles');
|
|
@@ -283,9 +375,6 @@ class ConverterIntegral7 {
|
|
|
283
375
|
let endTime = perf_hooks.performance.now();
|
|
284
376
|
console.log(`\nSerializeModel ${geoRegion.name} ${(endTime - startTime) / 1000} seconds\n`);
|
|
285
377
|
}
|
|
286
|
-
this.logger.debug('Serialize TP-BD Profiles');
|
|
287
|
-
console.log('Serialize TP-BD Profiles');
|
|
288
|
-
yield this.tpBdConverter.serialize(defaultValuesConfig);
|
|
289
378
|
this.logger.debug('Serialize Default Profile');
|
|
290
379
|
this.exportFrameDefault.openXMLModel();
|
|
291
380
|
this.exportFrameDefault.serializeModel(defaultValuesConfig);
|
|
@@ -569,10 +658,6 @@ class ConverterIntegral7 {
|
|
|
569
658
|
if (schaltfeldIDs.length)
|
|
570
659
|
yield this.createTopologicalNodes(cimModel);
|
|
571
660
|
logExecutionTime(this.logger, startTime, `createTopologicalNodes()`);
|
|
572
|
-
/** TP-BD Profile */
|
|
573
|
-
if (!frame.boundary) {
|
|
574
|
-
yield this.tpBdConverter.convert(frame.cimModel);
|
|
575
|
-
}
|
|
576
661
|
/** DL Profile */
|
|
577
662
|
if (!frame.boundary) {
|
|
578
663
|
this.executor = new executor_1.Executor(this.mysqlController, this.configUuid);
|