@enervance/insight-cim-model 1.0.25 → 1.0.26
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.
|
@@ -8,18 +8,16 @@ class SubstationDao extends EquipmentContainerDao_1.EquipmentContainerDao {
|
|
|
8
8
|
...super.toInsertStatements(),
|
|
9
9
|
{
|
|
10
10
|
sql: `
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
set region_mrid = excluded.region_mrid
|
|
11
|
+
insert into cim.substation (
|
|
12
|
+
mrid,
|
|
13
|
+
number
|
|
14
|
+
) values (?, ?)
|
|
15
|
+
on conflict (mrid) do update
|
|
16
|
+
set number = excluded.number
|
|
18
17
|
`,
|
|
19
18
|
params: [
|
|
20
19
|
this.cimObject.getUUID(),
|
|
21
|
-
this.cimObject.getNumber() ?? null
|
|
22
|
-
this.cimObject.subGeographicalRegion?.getUUID() ?? null
|
|
20
|
+
this.cimObject.getNumber() ?? null
|
|
23
21
|
]
|
|
24
22
|
}
|
|
25
23
|
];
|
|
@@ -27,6 +25,17 @@ class SubstationDao extends EquipmentContainerDao_1.EquipmentContainerDao {
|
|
|
27
25
|
toAssociationInsertStatements() {
|
|
28
26
|
return [
|
|
29
27
|
...super.toAssociationInsertStatements(),
|
|
28
|
+
{
|
|
29
|
+
sql: `
|
|
30
|
+
update cim.substation
|
|
31
|
+
set region_mrid = ?
|
|
32
|
+
where mrid = ?
|
|
33
|
+
`,
|
|
34
|
+
params: [
|
|
35
|
+
this.cimObject.subGeographicalRegion?.getUUID() ?? null,
|
|
36
|
+
this.cimObject.getUUID()
|
|
37
|
+
]
|
|
38
|
+
},
|
|
30
39
|
...Array.from(this.cimObject.normalEnergizedFeeder.values()).map((feeder) => ({
|
|
31
40
|
sql: `
|
|
32
41
|
insert into cim.substation_normal_energized_feeder (
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SubstationDao.js","sourceRoot":"","sources":["../../../src/database/core/SubstationDao.ts"],"names":[],"mappings":";;;AAAA,mEAAgE;AAIhE,MAAa,aAAc,SAAQ,6CAAiC;IAEzD,kBAAkB;QACzB,OAAO;YACL,GAAG,KAAK,CAAC,kBAAkB,EAAE;YAC7B;gBACE,GAAG,EAAE
|
|
1
|
+
{"version":3,"file":"SubstationDao.js","sourceRoot":"","sources":["../../../src/database/core/SubstationDao.ts"],"names":[],"mappings":";;;AAAA,mEAAgE;AAIhE,MAAa,aAAc,SAAQ,6CAAiC;IAEzD,kBAAkB;QACzB,OAAO;YACL,GAAG,KAAK,CAAC,kBAAkB,EAAE;YAC7B;gBACE,GAAG,EAAE;;;;;;;SAOJ;gBACD,MAAM,EAAE;oBACN,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE;oBACxB,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,IAAI;iBACnC;aACF;SACF,CAAC;IACJ,CAAC;IAGQ,6BAA6B;QACpC,OAAO;YACL,GAAG,KAAK,CAAC,6BAA6B,EAAE;YACxC;gBACE,GAAG,EAAE;;;;SAIJ;gBACD,MAAM,EAAE;oBACN,IAAI,CAAC,SAAS,CAAC,qBAAqB,EAAE,OAAO,EAAE,IAAI,IAAI;oBACvD,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE;iBACzB;aACF;YACD,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;gBAC5E,GAAG,EAAE;;;;;;SAMJ;gBACD,MAAM,EAAE;oBACN,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE;oBACxB,MAAM,CAAC,OAAO,EAAE;iBACjB;aACF,CAAC,CAAC;SACJ,CAAC;IACJ,CAAC;CACF;AApDD,sCAoDC"}
|
|
@@ -15,19 +15,20 @@ class DaoStatementPlanner {
|
|
|
15
15
|
return statements;
|
|
16
16
|
}
|
|
17
17
|
planManyObjects(roots, powerGridId) {
|
|
18
|
-
const visited = new Set();
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
for (const
|
|
18
|
+
/* const visited = new Set<string>();
|
|
19
|
+
const orderedObjects: IdentifiedObject[] = [];
|
|
20
|
+
const resolver = new DaoDependencyResolver();
|
|
21
|
+
|
|
22
|
+
for (const root of roots) {
|
|
23
|
+
for (const obj of resolver.resolve(root)) {
|
|
23
24
|
if (!visited.has(obj.getUUID())) {
|
|
24
|
-
|
|
25
|
-
|
|
25
|
+
visited.add(obj.getUUID());
|
|
26
|
+
orderedObjects.push(obj);
|
|
26
27
|
}
|
|
27
|
-
|
|
28
|
-
|
|
28
|
+
}
|
|
29
|
+
}*/
|
|
29
30
|
const coreStatements = [];
|
|
30
|
-
for (const obj of
|
|
31
|
+
for (const obj of roots) {
|
|
31
32
|
const dao = dao_factory_1.DaoFactory.create(obj, powerGridId);
|
|
32
33
|
coreStatements.push(...dao.toInsertStatements());
|
|
33
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dao-statement-planner.js","sourceRoot":"","sources":["../../src/database/dao-statement-planner.ts"],"names":[],"mappings":";;;AACA,+CAA2C;AAC3C,uEAAkE;AAIlE,MAAa,mBAAmB;IACb,QAAQ,GAAG,IAAI,+CAAqB,EAAE,CAAC;IAExD,IAAI,CAAC,IAAsB,EAAE,WAAmB;QAC9C,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC5C,MAAM,UAAU,GAAsB,EAAE,CAAC;QAEzC,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;YAC1B,MAAM,GAAG,GAAG,wBAAU,CAAC,MAAM,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;YAChD,UAAU,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,kBAAkB,EAAE,CAAC,CAAC;QAC/C,CAAC;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,eAAe,CAAC,KAAyB,EAAE,WAAmB;
|
|
1
|
+
{"version":3,"file":"dao-statement-planner.js","sourceRoot":"","sources":["../../src/database/dao-statement-planner.ts"],"names":[],"mappings":";;;AACA,+CAA2C;AAC3C,uEAAkE;AAIlE,MAAa,mBAAmB;IACb,QAAQ,GAAG,IAAI,+CAAqB,EAAE,CAAC;IAExD,IAAI,CAAC,IAAsB,EAAE,WAAmB;QAC9C,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC5C,MAAM,UAAU,GAAsB,EAAE,CAAC;QAEzC,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;YAC1B,MAAM,GAAG,GAAG,wBAAU,CAAC,MAAM,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;YAChD,UAAU,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,kBAAkB,EAAE,CAAC,CAAC;QAC/C,CAAC;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,eAAe,CAAC,KAAyB,EAAE,WAAmB;QAChE;;;;;;;;;;;eAWO;QAEH,MAAM,cAAc,GAAsB,EAAE,CAAC;QAC7C,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;YACxB,MAAM,GAAG,GAAG,wBAAU,CAAC,MAAM,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;YAChD,cAAc,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,kBAAkB,EAAE,CAAC,CAAC;QACnD,CAAC;QAED,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,oBAAoB,CAAC,KAAyB,EAAE,WAAmB;QACjE,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;QAClC,MAAM,cAAc,GAAuB,EAAE,CAAC;QAC9C,MAAM,QAAQ,GAAG,IAAI,+CAAqB,EAAE,CAAC;QAE7C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,KAAK,MAAM,GAAG,IAAI,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;gBACzC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;oBAChC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;oBAC3B,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAC3B,CAAC;YACH,CAAC;QACH,CAAC;QAED,MAAM,qBAAqB,GAAsB,EAAE,CAAC;QACpD,KAAK,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;YACjC,MAAM,GAAG,GAAG,wBAAU,CAAC,MAAM,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;YAChD,qBAAqB,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,6BAA6B,EAAE,CAAC,CAAC;QACrE,CAAC;QAED,OAAO,qBAAqB,CAAC;IAC/B,CAAC;CACF;AA5DD,kDA4DC"}
|