nayota-show-sdk 1.3.67 → 1.3.69

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nayota-show-sdk",
-  "version": "1.3.67",
+  "version": "1.3.69",
   "description": "nayota-show-server rest-api",
   "type": "module",
   "main": "index.js",

package/utils/iot-adapter-helpers.js

@@ -2,6 +2,17 @@ function isPlainObject(value) {
   return Object.prototype.toString.call(value) === '[object Object]'
 }
 
+function stripResourceIdPrefix(value) {
+  if (value == null) {
+    return value
+  }
+
+  const normalized = String(value)
+  const match = normalized.match(/^[a-z][a-z0-9-]*:([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})$/i)
+
+  return match ? match[1] : normalized
+}
+
 export function removeUndefinedFields(value) {
   if (!isPlainObject(value)) {
     return value
@@ -35,7 +46,7 @@ export function getLegacyId(value) {
   }
 
   if (typeof value === 'string' || typeof value === 'number') {
-    return String(value)
+    return stripResourceIdPrefix(value)
   }
 
   if (Array.isArray(value)) {
@@ -44,10 +55,10 @@ export function getLegacyId(value) {
 
   if (typeof value === 'object') {
     if (value._id != null) {
-      return String(value._id)
+      return stripResourceIdPrefix(value._id)
     }
     if (value.id != null) {
-      return String(value.id)
+      return stripResourceIdPrefix(value.id)
     }
   }
 
@@ -89,6 +100,14 @@ export function withLegacyId(value) {
     return acc
   }, {})
 
+  if (next.id != null) {
+    next.id = stripResourceIdPrefix(next.id)
+  }
+
+  if (next._id != null) {
+    next._id = stripResourceIdPrefix(next._id)
+  }
+
   if (next.id != null && next._id == null) {
     next._id = next.id
   }

package/utils/iot-module-specs.js

@@ -297,6 +297,71 @@ function mapDeviceEasyListRequest(data = {}) {
   })
 }
 
+function hasOwn(value, key) {
+  return Object.prototype.hasOwnProperty.call(value || {}, key)
+}
+
+function getLegacyUiRelationId(relation = {}) {
+  if (relation.uiId != null) {
+    return getLegacyId(relation.uiId)
+  }
+
+  if (relation.ui != null) {
+    return getLegacyId(relation.ui)
+  }
+
+  if (relation.id != null || relation._id != null) {
+    return getLegacyId(relation)
+  }
+
+  return ''
+}
+
+function normalizeLegacyUiRelation(relation = {}, fallbackType = 'ba_card') {
+  const source = relation.ui && typeof relation.ui === 'object'
+    ? relation.ui
+    : relation
+  const uiId = getLegacyUiRelationId(relation)
+
+  if (!uiId) {
+    return null
+  }
+
+  return removeUndefinedFields({
+    uiId,
+    uiName: relation.uiName || source.name,
+    uiCode: relation.uiCode || source.code,
+    type: relation.type || source.type || fallbackType,
+    props: relation.props,
+    attrs: Array.isArray(relation.attrs) ? relation.attrs : []
+  })
+}
+
+function resolveDigitalTwinTypeUiRelation(data = {}) {
+  if (hasOwn(data, 'uiId')) {
+    return data.uiId == null ? null : normalizeLegacyUiRelation({ uiId: data.uiId, ui: data.ui })
+  }
+
+  if (data.ui) {
+    return normalizeLegacyUiRelation(data.ui)
+  }
+
+  const relations = Array.isArray(data.uis) ? data.uis : []
+  return relations.find(item => item && item.type === 'ba_card') ||
+    relations.find(item => item && item.type === 'component') ||
+    relations[0] ||
+    null
+}
+
+function getDigitalTwinTypeUiId(data = {}) {
+  if (hasOwn(data, 'uiId')) {
+    return data.uiId == null ? null : getLegacyId(data.uiId)
+  }
+
+  const relation = resolveDigitalTwinTypeUiRelation(data)
+  return relation ? getLegacyUiRelationId(relation) : undefined
+}
+
 function mapDeviceClassToIotQuery(query = {}) {
   return removeUndefinedFields({
     ...omitKeys(query, ['_id', 'code', 'sort']),
@@ -309,6 +374,8 @@ function mapDeviceClassToIotQuery(query = {}) {
 }
 
 function mapDeviceClassToIotBody(data = {}) {
+  const twinUiRelation = resolveDigitalTwinTypeUiRelation(data)
+  const uiId = getDigitalTwinTypeUiId(data)
   const metadata = mergeMetadata(data.metadata, {
     display: mergeMetadata(getNestedValue(data, 'metadata.display'), {
       icon: data.icon
@@ -316,6 +383,7 @@ function mapDeviceClassToIotBody(data = {}) {
     bms: mergeMetadata(getNestedValue(data, 'metadata.bms'), {
       deviceUI: data.deviceUI,
       uis: data.uis,
+      twinUi: twinUiRelation ? normalizeLegacyUiRelation(twinUiRelation) : undefined,
       paramType: data.paramType,
       departTag: data.departTag,
       isSimulation: data.isSimulation,
@@ -329,6 +397,8 @@ function mapDeviceClassToIotBody(data = {}) {
       '_id',
       'id',
       'code',
+      'ui',
+      'uiId',
       'deviceUI',
       'uis',
       'paramType',
@@ -338,6 +408,7 @@ function mapDeviceClassToIotBody(data = {}) {
       'icon'
     ]),
     typeCode: data.typeCode || data.code || fallbackCode(data.name || data._id, 'TYPE'),
+    uiId,
     metadata: Object.keys(metadata).length ? metadata : undefined
   })
 }
@@ -347,12 +418,22 @@ function mapIotDeviceClassToLegacy(item = {}) {
   const metadata = getMetadata(entity.metadata)
   const bms = getMetadata(metadata.bms)
   const display = getMetadata(metadata.display)
+  const twinUiRelation = normalizeLegacyUiRelation({
+    uiId: entity.uiId,
+    ui: entity.ui,
+    type: entity.ui && entity.ui.type
+  })
+  const bmsUis = Array.isArray(bms.uis) ? bms.uis : undefined
+  const uis = bmsUis && bmsUis.length
+    ? bmsUis
+    : twinUiRelation ? [twinUiRelation] : entity.uis
 
   return removeUndefinedFields({
     ...entity,
     code: entity.typeCode || entity.code,
     deviceUI: bms.deviceUI || entity.deviceUI,
-    uis: bms.uis || entity.uis,
+    uis,
+    uiCode: entity.uiCode || twinUiRelation?.uiCode,
     paramType: bms.paramType || entity.paramType,
     departTag: bms.departTag || entity.departTag,
     isSimulation: bms.isSimulation != null ? bms.isSimulation : entity.isSimulation,

package/utils/iot-module-specs.test.js

@@ -0,0 +1,95 @@
+const { iotModuleSpecs } = require('./iot-module-specs')
+
+describe('iotModuleSpecs deviceClass UI compatibility', () => {
+  const deviceClass = iotModuleSpecs.deviceClass.operations
+
+  test('maps legacy ba_card relation to digital twin type uiId', () => {
+    const request = deviceClass.updateOne.toRequest({
+      _id: 'type-1',
+      name: '照明',
+      code: 'LIGHT',
+      deviceUI: 'legacy-device-ui-1',
+      uis: [
+        {
+          uiId: 'legacy-device-ui-1',
+          uiName: '旧展示设备UI',
+          uiCode: 'LegacyDeviceUi',
+          type: 'device_ui',
+          attrs: []
+        },
+        {
+          uiId: 'card-ui-1',
+          uiName: '照明卡片',
+          uiCode: 'NaLightingCard',
+          type: 'ba_card',
+          attrs: [{ name: '名称' }]
+        }
+      ]
+    })
+
+    expect(request.url).toBe('/digital-twin-types/type-1')
+    expect(request.method).toBe('patch')
+    expect(request.data.uiId).toBe('card-ui-1')
+    expect(request.data.metadata.bms.deviceUI).toBe('legacy-device-ui-1')
+    expect(request.data.metadata.bms.twinUi).toEqual({
+      uiId: 'card-ui-1',
+      uiName: '照明卡片',
+      uiCode: 'NaLightingCard',
+      type: 'ba_card',
+      attrs: [{ name: '名称' }]
+    })
+  })
+
+  test('does not treat legacy deviceUI as digital twin type uiId', () => {
+    const request = deviceClass.create.toRequest({
+      name: '空调',
+      code: 'AIR',
+      deviceUI: 'legacy-device-ui-2'
+    })
+
+    expect(request.data.uiId).toBeUndefined()
+    expect(request.data.metadata.bms.deviceUI).toBe('legacy-device-ui-2')
+  })
+
+  test('expands digital twin type ui relation back to legacy uis', () => {
+    const response = deviceClass.list.fromResponse({
+      code: 0,
+      data: {
+        total: 1,
+        items: [
+          {
+            id: 'type-1',
+            typeCode: 'LIGHT',
+            name: '照明',
+            uiId: 'card-ui-1',
+            ui: {
+              id: 'card-ui-1',
+              name: '照明卡片',
+              code: 'NaLightingCard',
+              type: 'ba_card'
+            },
+            metadata: {
+              bms: {
+                deviceUI: 'legacy-device-ui-1'
+              }
+            }
+          }
+        ]
+      }
+    })
+
+    expect(response.data.rows[0]._id).toBe('type-1')
+    expect(response.data.rows[0].code).toBe('LIGHT')
+    expect(response.data.rows[0].deviceUI).toBe('legacy-device-ui-1')
+    expect(response.data.rows[0].uiCode).toBe('NaLightingCard')
+    expect(response.data.rows[0].uis).toEqual([
+      {
+        uiId: 'card-ui-1',
+        uiName: '照明卡片',
+        uiCode: 'NaLightingCard',
+        type: 'ba_card',
+        attrs: []
+      }
+    ])
+  })
+})