@enervance/insight-cim-model 0.0.208 → 0.0.209
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/dl-convert/data-manager.js +35 -37
- package/dist/converter/integral7/dl-convert/data-manager.js.map +1 -1
- package/dist/converter/integral7/dl-convert/dl-converter-i7.js.map +1 -1
- package/dist/converter/integral7/dl-convert/executor.d.ts +1 -0
- package/dist/converter/integral7/dl-convert/executor.js +39 -31
- package/dist/converter/integral7/dl-convert/executor.js.map +1 -1
- package/dist/converter/integral7/interface-i7/data-structures-i7.d.ts +0 -23
- package/dist/converter/integral7/interface-i7/export-frame-i7.d.ts +0 -22
- package/dist/converter/integral7/interface-i7/export-frame-i7.js +6 -39
- package/dist/converter/integral7/interface-i7/export-frame-i7.js.map +1 -1
- package/dist/converter/integral7/model/dl-utils/util-functions.d.ts +2 -0
- package/dist/converter/integral7/model/dl-utils/util-functions.js +8 -0
- package/dist/converter/integral7/model/dl-utils/util-functions.js.map +1 -1
- package/dist/etl/etl-neplan/et-neplan-regex.d.ts +4 -0
- package/dist/etl/etl-neplan/et-neplan-regex.js +5 -1
- package/dist/etl/etl-neplan/et-neplan-regex.js.map +1 -1
- package/dist/etl/etl-neplan/etl-neplan-csv.d.ts +2 -2
- package/dist/etl/etl-neplan/etl-neplan-csv.js +15 -10
- package/dist/etl/etl-neplan/etl-neplan-csv.js.map +1 -1
- package/dist/model/extensions/enervance/assetinfo/EVWireInfo.d.ts +3 -0
- package/dist/model/extensions/enervance/assetinfo/EVWireInfo.js +17 -0
- package/dist/model/extensions/enervance/assetinfo/EVWireInfo.js.map +1 -1
- package/dist/model/extensions/integral/assetinfo/INTEGRALPowerTransformer2WInfo.d.ts +3 -0
- package/dist/model/extensions/integral/assetinfo/INTEGRALPowerTransformer2WInfo.js +16 -0
- package/dist/model/extensions/integral/assetinfo/INTEGRALPowerTransformer2WInfo.js.map +1 -1
- package/dist/model/extensions/integral/assetinfo/INTEGRALPowerTransformer3WInfo.d.ts +3 -0
- package/dist/model/extensions/integral/assetinfo/INTEGRALPowerTransformer3WInfo.js +20 -0
- package/dist/model/extensions/integral/assetinfo/INTEGRALPowerTransformer3WInfo.js.map +1 -1
- package/dist/model/extensions/neplan-westnetz/wires/WNEnergyConsumer.d.ts +4 -4
- package/dist/model/extensions/neplan-westnetz/wires/WNEnergyConsumer.js +4 -4
- package/dist/model/extensions/neplan-westnetz/wires/WNEnergyConsumer.js.map +1 -1
- package/package.json +1 -1
|
@@ -22,70 +22,68 @@ class DataManager {
|
|
|
22
22
|
this.dbObjectKeyCimModelUuidGraph = graph;
|
|
23
23
|
}
|
|
24
24
|
loadFromMySQL(mysqlController, options, currentFrameBoundary) {
|
|
25
|
-
var _a;
|
|
26
25
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
27
26
|
const tableMetaData = yield mysqlController.getTableMetaData();
|
|
28
27
|
for (const tableName in options) {
|
|
29
28
|
if (tableMetaData.has(tableName)) {
|
|
30
29
|
/* BEGIN: query-build */
|
|
31
|
-
let
|
|
30
|
+
let where_conditions_concats_and = [];
|
|
32
31
|
for (const columnName in options[tableName]) {
|
|
33
32
|
if (options[tableName][columnName].eq) { //&& options[tableName][columnName].eq.length > 0) {
|
|
34
33
|
const eqConditions = options[tableName][columnName].eq.map(arg => {
|
|
35
34
|
return `${columnName} = ${arg}`;
|
|
36
35
|
}).join(' OR ');
|
|
37
|
-
|
|
36
|
+
where_conditions_concats_and.push(eqConditions);
|
|
38
37
|
}
|
|
39
38
|
else if (options[tableName][columnName].in) { //&& options[tableName][columnName].in.length > 0) {
|
|
40
39
|
const inConditions = options[tableName][columnName].in.join(', ');
|
|
41
|
-
|
|
40
|
+
where_conditions_concats_and.push(` ${columnName} IN (${inConditions})`);
|
|
42
41
|
}
|
|
43
42
|
}
|
|
44
43
|
let selectQuery = `SELECT *
|
|
45
44
|
FROM ${tableName}`;
|
|
46
|
-
if (
|
|
47
|
-
selectQuery += ` WHERE ${
|
|
45
|
+
if (where_conditions_concats_and.length > 0) {
|
|
46
|
+
selectQuery += ` WHERE ${where_conditions_concats_and.join(' AND ')}`;
|
|
48
47
|
}
|
|
49
48
|
selectQuery += ';';
|
|
50
49
|
/* END: query-build */
|
|
51
50
|
try {
|
|
52
51
|
let queryResultsAllSites = undefined;
|
|
53
52
|
if (tableName === 'nsg_nsgstandort') {
|
|
54
|
-
const selectQuery = `SELECT * FROM nsg_nsgstandort WHERE ${
|
|
53
|
+
const selectQuery = `SELECT * FROM nsg_nsgstandort WHERE ${where_conditions_concats_and[0]}` + ';';
|
|
55
54
|
queryResultsAllSites = yield mysqlController.execQuery(selectQuery);
|
|
56
55
|
}
|
|
57
56
|
const queryResults = yield mysqlController.execQuery(selectQuery);
|
|
58
57
|
if (queryResults.length > 0) {
|
|
59
|
-
if
|
|
60
|
-
|
|
61
|
-
}
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
}
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
}
|
|
58
|
+
// if(tableName !== 'nsg_nsgstandort'){
|
|
59
|
+
this.dbObjectGraph.addObjects(tableName, convert_graph_keys_1.i7TableNamesToPrimaryKeys[tableName], queryResults);
|
|
60
|
+
// }else if(queryResultsAllSites !== undefined && queryResults.length/queryResultsAllSites.length>0.5){//ignore cause this variant is not the main variant for this sites
|
|
61
|
+
// console.log(tableName);
|
|
62
|
+
// console.log('---------------queryResultsAllSites---------------');
|
|
63
|
+
// console.log(queryResultsAllSites.length);
|
|
64
|
+
// console.log('---------------queryResults---------------');
|
|
65
|
+
// console.log(queryResults.length);
|
|
66
|
+
// this.dbObjectGraph[tableName] = this.dbObjectGraph[tableName] ?? {};
|
|
67
|
+
// let bdSites:number[] = [];
|
|
68
|
+
// if(currentFrameBoundary!==undefined){
|
|
69
|
+
// for(let site of currentFrameBoundary){
|
|
70
|
+
// const filter = queryResults.filter(elem => elem.id === site);
|
|
71
|
+
// if(filter.length > 0){
|
|
72
|
+
// bdSites.push(filter);
|
|
73
|
+
// }
|
|
74
|
+
// let stop = true;
|
|
75
|
+
// }
|
|
76
|
+
// }
|
|
77
|
+
// if(bdSites.length/queryResults.length<=0.5){
|
|
78
|
+
// this.dbObjectGraph.addObjects(
|
|
79
|
+
// tableName as keyof I7TableNameKeys, i7TableNamesToPrimaryKeys[tableName], queryResults
|
|
80
|
+
// );
|
|
81
|
+
// }else{
|
|
82
|
+
// let stop = true;
|
|
83
|
+
// }
|
|
84
|
+
// }else{
|
|
85
|
+
// let stop = true;
|
|
86
|
+
// }
|
|
89
87
|
}
|
|
90
88
|
else { //ignore cause this variant contains no elements for this tablename
|
|
91
89
|
let stop = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-manager.js","sourceRoot":"","sources":["../../../../src/converter/integral7/dl-convert/data-manager.ts"],"names":[],"mappings":";;;;AACA,uEAKwC;AAIxC,yCAAsC;AAYtC,MAAa,WAAW;IAStB,YAAY,MAAgB;QAC1B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QAErB,IAAI,CAAC,4BAA4B,GAAG,IAAI,GAAG,EAAkB,CAAC;IAChE,CAAC;IAED,gBAAgB,CAAC,KAAmE;QAClF,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;IAC7B,CAAC;IAED,gBAAgB,CAAC,KAAoB;QACnC,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;IAC7B,CAAC;IAED,sCAAsC,CAAC,IAAY,EAAE,IAAY;QAC/D,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACpD,CAAC;IAED,+BAA+B,CAAC,KAAmE;QACjG,IAAI,CAAC,4BAA4B,GAAG,KAAK,CAAC;IAC5C,CAAC;IAEK,aAAa,CAAC,eAAgC,EAAE,OAA6B,EAAE,oBAA+C
|
|
1
|
+
{"version":3,"file":"data-manager.js","sourceRoot":"","sources":["../../../../src/converter/integral7/dl-convert/data-manager.ts"],"names":[],"mappings":"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"}
|