Skip to content

Commit 764707d

Browse files
feat: update find medical technology to new digital twin model
1 parent 30aa036 commit 764707d

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

Diff for: src/main/kotlin/infrastructure/digitaltwins/DigitalTwinManager.kt

+3-6
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,10 @@ import entity.zone.Room
2222
import entity.zone.RoomID
2323
import infrastructure.digitaltwins.adtpresentation.MedicalTechnologyAdtPresentation.toDigitalTwin
2424
import infrastructure.digitaltwins.adtpresentation.MedicalTechnologyAdtPresentation.toMedicalTechnology
25-
import infrastructure.digitaltwins.adtpresentation.RoomAdtPresentation
2625
import infrastructure.digitaltwins.adtpresentation.RoomAdtPresentation.toDigitalTwin
2726
import infrastructure.digitaltwins.adtpresentation.RoomAdtPresentation.toRoom
2827
import infrastructure.digitaltwins.query.AdtQuery
2928
import infrastructure.digitaltwins.query.AdtQuery.Companion.AdtQueryUtils.eq
30-
import infrastructure.digitaltwins.query.AdtQuery.Companion.AdtQueryUtils.isOfModel
3129
import kotlinx.serialization.json.Json
3230
import kotlinx.serialization.json.jsonObject
3331
import kotlinx.serialization.json.jsonPrimitive
@@ -90,11 +88,10 @@ class DigitalTwinManager : RoomDigitalTwinManager, MedicalTechnologyDigitalTwinM
9088
roomId = query(
9189
AdtQuery
9290
.createQuery()
93-
.selectTop(1, "T.\$dtId")
91+
.selectTop(1, "CT.\$dtId")
9492
.fromDigitalTwins("T")
95-
.joinRelationship("CT", "T", "rel_contains_medical_technology")
96-
.where("T" isOfModel RoomAdtPresentation.OPERATING_ROOM_MODEL)
97-
.and("CT.\$dtId" eq medicalTechnologyId.value)
93+
.joinRelationship("CT", "T", "rel_is_located")
94+
.where("T.\$dtId" eq medicalTechnologyId.value)
9895
.query,
9996
String::class.java
10097
).let {

Diff for: src/main/kotlin/infrastructure/digitaltwins/adtpresentation/RoomAdtPresentation.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ import entity.zone.ZoneID
2727
*/
2828
object RoomAdtPresentation {
2929
/** Operating room Azure Digital Twins model. */
30-
const val OPERATING_ROOM_MODEL = "dtmi:io:github:smartoperatingblock:OperatingRoom;1"
30+
private const val OPERATING_ROOM_MODEL = "dtmi:io:github:smartoperatingblock:OperatingRoom;1"
3131
/** Pre-operating room Azure Digital Twins model. */
32-
const val PRE_OPERATING_ROOM_MODEL = "dtmi:io:github:smartoperatingblock:PrePostOperatingRoom;1"
32+
private const val PRE_OPERATING_ROOM_MODEL = "dtmi:io:github:smartoperatingblock:PrePostOperatingRoom;1"
3333
private const val NAME_PROPERTY = "name"
3434
private const val ZONE_ID_PROPERTY = "zone_id"
3535
private const val TEMPERATURE_PROPERTY = "temperature"

0 commit comments

Comments
 (0)