nayota-show-sdk 1.3.69 → 1.3.71

package/package.json

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

package/utils/iot-module-specs.js

@@ -160,6 +160,13 @@ function normalizeHierarchyFloorPlan(data = {}) {
 }
 
 function mapDepartsToIotBody(data = {}) {
+  const hasParentId = Object.prototype.hasOwnProperty.call(data, 'parentId')
+  const hasFather = Object.prototype.hasOwnProperty.call(data, 'father')
+  const parentId = hasParentId
+    ? data.parentId
+    : hasFather
+      ? resolveLegacyReference(data.father)
+      : undefined
   const metadata = mergeMetadata(data.metadata, {
     mapCenter: data.mapCenter,
     latlng: data.latlng,
@@ -183,7 +190,7 @@ function mapDepartsToIotBody(data = {}) {
       'departNo'
     ]),
     code: data.code || data.departNo || undefined,
-    parentId: data.parentId != null ? data.parentId : resolveLegacyReference(data.father),
+    parentId,
     sortOrder: data.sortOrder != null ? data.sortOrder : data.sort,
     isActive: data.isActive != null ? data.isActive : data.status,
     floorPlan: normalizeHierarchyFloorPlan(data),
@@ -297,6 +304,136 @@ function mapDeviceEasyListRequest(data = {}) {
   })
 }
 
+function normalizeLegacyCurrentValue(value) {
+  if (value && typeof value === 'object') {
+    if (value.value !== undefined) {
+      return value.value
+    }
+    if (value.currentValue !== undefined) {
+      return value.currentValue
+    }
+    if (value.label !== undefined) {
+      return value.label
+    }
+    if (value.valueStr !== undefined) {
+      return value.valueStr
+    }
+  }
+
+  return value
+}
+
+function normalizeLegacyValueStr(value, fallback = '') {
+  if (fallback !== undefined && fallback !== null && fallback !== '') {
+    return String(fallback)
+  }
+
+  if (value && typeof value === 'object') {
+    if (value.valueStr !== undefined && value.valueStr !== null) {
+      return String(value.valueStr)
+    }
+    if (value.label !== undefined && value.label !== null) {
+      return String(value.label)
+    }
+  }
+
+  return ''
+}
+
+function normalizeLegacyPropLine(source = {}, prop = {}, row = {}) {
+  if (typeof source.line === 'boolean') {
+    return source.line
+  }
+
+  if (typeof prop.line === 'boolean') {
+    return prop.line
+  }
+
+  if (typeof source.pointLine === 'boolean') {
+    return source.pointLine
+  }
+
+  if (typeof row.line === 'boolean') {
+    return row.line
+  }
+
+  return null
+}
+
+function normalizeLegacyEasyListProp(source = {}, row = {}) {
+  const prop = withLegacyId(source.prop || {})
+  const propId = source.propId || source.devicePropertyId || prop._id || source._id || source.id
+  const value = prop.value !== undefined
+    ? prop.value
+    : source.value !== undefined
+      ? source.value
+      : normalizeLegacyCurrentValue(source.rawValue)
+  const valueStr = normalizeLegacyValueStr(
+    source.rawValue,
+    prop.valueStr !== undefined ? prop.valueStr : source.valueStr
+  )
+  const valueAt = prop.valueAt || source.valueAt || source.lastSyncAt || source.lastUpdateAt || row.lineTime || ''
+  const interval = prop.interval || source.interval || source.valueMap || ''
+  const line = normalizeLegacyPropLine(source, prop, row)
+  const isMain = Boolean(source.isMain)
+  const isStatus = Boolean(source.isStatus)
+  const isNumber = Boolean(source.isNumber)
+  const isImport = Boolean(source.isImport || isMain || isStatus || isNumber)
+
+  const legacyProp = removeUndefinedFields({
+    ...prop,
+    _id: propId,
+    deviceId: prop.deviceId || source.deviceId || '',
+    key: prop.key || source.propertyKey,
+    name: prop.name || source.propName || source.name || source.code || source.propertyKey,
+    shortAddress: prop.shortAddress || source.shortAddress,
+    line,
+    value,
+    valueStr,
+    unit: prop.unit != null ? prop.unit : source.unit,
+    company: prop.company || source.company,
+    valueMap: prop.valueMap !== undefined ? prop.valueMap : source.valueMap,
+    interval,
+    thresholdRules: prop.thresholdRules !== undefined ? prop.thresholdRules : source.thresholdRules,
+    valueAt,
+    sort: prop.sort !== undefined ? prop.sort : source.sort,
+    parent: prop.parent !== undefined ? prop.parent : source.parent,
+    parentName: prop.parentName || source.parentName
+  })
+
+  return removeUndefinedFields({
+    ...source,
+    _id: source._id || source.id,
+    propId,
+    devicePropertyId: source.devicePropertyId || propId,
+    code: source.code || source.name || source.propertyKey,
+    propName: source.propName || source.name || prop.name || source.code || source.propertyKey,
+    isImport,
+    isMain,
+    isStatus,
+    isNumber,
+    line,
+    value,
+    valueStr,
+    interval,
+    valueAt,
+    prop: legacyProp
+  })
+}
+
+function normalizeLegacyEasyListRow(item = {}) {
+  const row = withLegacyId(item)
+  const props = Array.isArray(row.props)
+    ? row.props.map(prop => normalizeLegacyEasyListProp(prop, row))
+    : []
+
+  return removeUndefinedFields({
+    ...row,
+    props,
+    lineTime: row.lineTime || props.find(prop => prop.isImport && prop.valueAt)?.valueAt || row.updatedAt || null
+  })
+}
+
 function hasOwn(value, key) {
   return Object.prototype.hasOwnProperty.call(value || {}, key)
 }
@@ -337,7 +474,7 @@ function normalizeLegacyUiRelation(relation = {}, fallbackType = 'ba_card') {
   })
 }
 
-function resolveDigitalTwinTypeUiRelation(data = {}) {
+function  resolveDigitalTwinTypeUiRelation(data = {}) {
   if (hasOwn(data, 'uiId')) {
     return data.uiId == null ? null : normalizeLegacyUiRelation({ uiId: data.uiId, ui: data.ui })
   }
@@ -597,7 +734,7 @@ export const iotModuleSpecs = {
             code: 0,
             data: {
               total: Number(data?.total ?? rows.length ?? 0),
-              rows: rows.map(item => withLegacyId(item))
+              rows: rows.map(item => normalizeLegacyEasyListRow(item))
             }
           }
         }

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

@@ -93,3 +93,135 @@ describe('iotModuleSpecs deviceClass UI compatibility', () => {
     ])
   })
 })
+
+describe('iotModuleSpecs departs hierarchy compatibility', () => {
+  const departs = iotModuleSpecs.departs.operations
+
+  test('does not send parentId for partial relationInfo updates', () => {
+    const request = departs.updateOne.toRequest({
+      _id: 'e245a3f6-d2c7-4ce1-9e02-ba9bbb347ed7',
+      relationInfo: {
+        image: {
+          imagePath: 'upload/2026/4/25/upload.svg'
+        }
+      }
+    })
+
+    expect(request.url).toBe('/hierarchies/e245a3f6-d2c7-4ce1-9e02-ba9bbb347ed7')
+    expect(request.method).toBe('patch')
+    expect(request.data.parentId).toBeUndefined()
+    expect(request.data.relationInfo).toEqual({
+      image: {
+        imagePath: 'upload/2026/4/25/upload.svg'
+      }
+    })
+  })
+
+  test('keeps explicit legacy father null as root move', () => {
+    const request = departs.updateOne.toRequest({
+      _id: 'e245a3f6-d2c7-4ce1-9e02-ba9bbb347ed7',
+      father: null
+    })
+
+    expect(request.data.parentId).toBeNull()
+  })
+})
+
+describe('iotModuleSpecs devices easyList legacy compatibility', () => {
+  const easyList = iotModuleSpecs.devices.operations.easyList
+
+  test('normalizes iot easyList properties to the legacy BMS prop shape', () => {
+    const response = easyList.fromResponse({
+      code: 0,
+      data: {
+        total: 1,
+        rows: [
+          {
+            id: 'twin-1',
+            name: '会议室空调',
+            line: false,
+            props: [
+              {
+                id: 'twin-prop-mode',
+                propId: 'device-prop-mode',
+                propertyKey: 'mode',
+                name: '模式设定',
+                isStatus: true,
+                line: true,
+                value: 1,
+                valueStr: '制热',
+                interval: '[["制冷","制热"],[0,1]]',
+                valueAt: '2026-04-25T06:30:00.000Z',
+                prop: {
+                  id: 'device-prop-mode'
+                }
+              },
+              {
+                id: 'twin-prop-electric',
+                propId: 'device-prop-electric',
+                propertyKey: 'electricA',
+                code: '电流有效值',
+                isMain: true,
+                isNumber: true,
+                line: true,
+                value: 0.043,
+                company: 'A',
+                valueAt: '2026-04-25T06:31:00.000Z',
+                prop: {
+                  id: 'device-prop-electric'
+                }
+              }
+            ]
+          }
+        ]
+      }
+    })
+
+    const row = response.data.rows[0]
+    const modeProp = row.props[0]
+    const electricProp = row.props[1]
+
+    expect(row._id).toBe('twin-1')
+    expect(modeProp).toEqual(
+      expect.objectContaining({
+        _id: 'twin-prop-mode',
+        propId: 'device-prop-mode',
+        isStatus: true,
+        isImport: true,
+        line: true,
+        value: 1,
+        valueStr: '制热',
+        interval: '[["制冷","制热"],[0,1]]',
+        valueAt: '2026-04-25T06:30:00.000Z'
+      })
+    )
+    expect(modeProp.prop).toEqual(
+      expect.objectContaining({
+        _id: 'device-prop-mode',
+        line: true,
+        value: 1,
+        valueStr: '制热',
+        interval: '[["制冷","制热"],[0,1]]',
+        valueAt: '2026-04-25T06:30:00.000Z'
+      })
+    )
+    expect(electricProp).toEqual(
+      expect.objectContaining({
+        isMain: true,
+        isNumber: true,
+        isImport: true,
+        line: true,
+        value: 0.043,
+        valueAt: '2026-04-25T06:31:00.000Z'
+      })
+    )
+    expect(electricProp.prop).toEqual(
+      expect.objectContaining({
+        line: true,
+        value: 0.043,
+        company: 'A',
+        valueAt: '2026-04-25T06:31:00.000Z'
+      })
+    )
+  })
+})