nayota-show-sdk 1.3.92 → 1.3.94

package/api/alarmRecord.js

@@ -1,4 +1,138 @@
 import requestAlarm from '../utils/alarm-request'
+import { isV2 } from '../utils/version'
+import { getOne as getDeviceClassOne } from './deviceClass'
+
+function getLegacyRefId(value) {
+  if (value == null) return ''
+
+  if (typeof value === 'string' || typeof value === 'number') {
+    return String(value)
+  }
+
+  if (typeof value === 'object') {
+    if (value._id != null) return String(value._id)
+    if (value.id != null) return String(value.id)
+  }
+
+  return ''
+}
+
+function getLegacyRefName(value) {
+  if (!value || typeof value !== 'object') return ''
+  return value.name || value.deviceClassName || value.typeName || value.label || ''
+}
+
+function normalizeLegacyDeviceClass(value, fallbackId = '') {
+  if (!value || typeof value !== 'object') return value
+
+  const id = getLegacyRefId(value) || fallbackId
+  return {
+    ...value,
+    _id: value._id || id || undefined,
+    id: value.id || id || undefined,
+    name: getLegacyRefName(value) || undefined
+  }
+}
+
+function getAlarmRows(response) {
+  if (Array.isArray(response?.data?.rows)) return response.data.rows
+  if (Array.isArray(response?.rows)) return response.rows
+  return []
+}
+
+function withAlarmRows(response, rows) {
+  if (Array.isArray(response?.data?.rows)) {
+    return {
+      ...response,
+      data: {
+        ...response.data,
+        rows
+      }
+    }
+  }
+
+  if (Array.isArray(response?.rows)) {
+    return {
+      ...response,
+      rows
+    }
+  }
+
+  return response
+}
+
+async function loadDeviceClassMap(ids = []) {
+  const uniqueIds = [...new Set(ids.filter(Boolean))]
+  const entries = await Promise.all(uniqueIds.map(async id => {
+    try {
+      const response = await getDeviceClassOne(id)
+      const item = response?.data
+      const normalized = normalizeLegacyDeviceClass(item, id)
+      return [id, normalized && getLegacyRefName(normalized) ? normalized : null]
+    } catch (error) {
+      return [id, null]
+    }
+  }))
+
+  return new Map(entries.filter(([, item]) => item))
+}
+
+async function normalizeV2AlarmRecordListResponse(response) {
+  if (!isV2()) return response
+
+  const rows = getAlarmRows(response)
+  if (!rows.length) return response
+
+  const rowsWithLocalDeviceClass = rows.map(row => {
+    const deviceClass = row?.deviceClass
+    const deviceDeviceClass = row?.device?.deviceClass
+
+    if (getLegacyRefName(deviceClass)) {
+      return {
+        ...row,
+        deviceClass: normalizeLegacyDeviceClass(deviceClass)
+      }
+    }
+
+    if (getLegacyRefName(deviceDeviceClass)) {
+      return {
+        ...row,
+        deviceClass: normalizeLegacyDeviceClass(
+          deviceDeviceClass,
+          getLegacyRefId(deviceClass)
+        )
+      }
+    }
+
+    return row
+  })
+
+  const missingIds = rowsWithLocalDeviceClass
+    .filter(row => row?.deviceClass && !getLegacyRefName(row.deviceClass))
+    .map(row => getLegacyRefId(row.deviceClass))
+
+  if (!missingIds.length) {
+    return withAlarmRows(response, rowsWithLocalDeviceClass)
+  }
+
+  const deviceClassMap = await loadDeviceClassMap(missingIds)
+  if (!deviceClassMap.size) {
+    return withAlarmRows(response, rowsWithLocalDeviceClass)
+  }
+
+  return withAlarmRows(response, rowsWithLocalDeviceClass.map(row => {
+    if (!row?.deviceClass || getLegacyRefName(row.deviceClass)) return row
+
+    const id = getLegacyRefId(row.deviceClass)
+    const deviceClass = deviceClassMap.get(id)
+    if (!deviceClass) return row
+
+    return {
+      ...row,
+      deviceClass
+    }
+  }))
+}
 /**
  * @file 报警记录api
  * @module 报警记录接口
@@ -324,7 +458,7 @@ export function list(query) {
     url: '/alarm-records',
     method: 'get',
     params: query
-  })
+  }).then(normalizeV2AlarmRecordListResponse)
 }
 
 /**

package/api/alarmRecord.test.js

@@ -0,0 +1,126 @@
+jest.mock('../utils', () => ({
+  requestShow: jest.fn(),
+  requestIot: jest.fn(),
+  requestForm: jest.fn()
+}))
+
+const urlcfg = require('../config/urlcfg').default
+const { requestIot, requestShow } = require('../utils')
+const { list } = require('./alarmRecord')
+
+describe('alarmRecord api compatibility', () => {
+  const originalVersion = urlcfg.version
+  const originalIotServer = urlcfg.iotServer
+
+  afterEach(() => {
+    urlcfg.version = originalVersion
+    urlcfg.iotServer = originalIotServer
+    jest.clearAllMocks()
+  })
+
+  test('keeps v1 list response unchanged', async () => {
+    const response = {
+      code: 0,
+      data: {
+        rows: [
+          {
+            _id: 'alarm-1',
+            deviceClass: 'type-1'
+          }
+        ]
+      }
+    }
+    urlcfg.version = 'v1'
+    requestShow.mockResolvedValue(response)
+
+    await expect(list({ limit: 1 })).resolves.toBe(response)
+    expect(requestShow).toHaveBeenCalledWith({
+      url: '/alarm-records',
+      method: 'get',
+      params: { limit: 1 }
+    })
+    expect(requestIot).not.toHaveBeenCalled()
+  })
+
+  test('fills v2 alarm deviceClass name from digital twin type detail', async () => {
+    urlcfg.version = 'v2'
+    urlcfg.iotServer = '/iot-api'
+    requestIot.mockImplementation(config => {
+      if (config.url === '/alarm-records') {
+        return Promise.resolve({
+          code: 0,
+          data: {
+            total: 1,
+            rows: [
+              {
+                _id: 'alarm-1',
+                device: { name: '安消智能摄像头' },
+                deviceClass: 'type-1',
+                subType: '事件告警'
+              }
+            ]
+          }
+        })
+      }
+
+      if (config.url === '/digital-twin-types/type-1') {
+        return Promise.resolve({
+          code: 0,
+          data: {
+            id: 'type-1',
+            name: '安消智能摄像头',
+            typeCode: 'CAMERA'
+          }
+        })
+      }
+
+      return Promise.reject(new Error(`unexpected request: ${config.url}`))
+    })
+
+    const response = await list({ limit: 1 })
+
+    expect(response.data.rows[0].deviceClass).toMatchObject({
+      _id: 'type-1',
+      id: 'type-1',
+      name: '安消智能摄像头',
+      code: 'CAMERA'
+    })
+    expect(requestIot).toHaveBeenCalledWith({
+      url: '/alarm-records',
+      method: 'get',
+      params: { limit: 1 }
+    })
+    expect(requestIot).toHaveBeenCalledWith({
+      url: '/digital-twin-types/type-1',
+      method: 'get'
+    })
+  })
+
+  test('does not request device class detail when v2 row already has name', async () => {
+    urlcfg.version = 'v2'
+    urlcfg.iotServer = '/iot-api'
+    requestIot.mockResolvedValue({
+      code: 0,
+      data: {
+        rows: [
+          {
+            _id: 'alarm-1',
+            deviceClass: {
+              _id: 'type-1',
+              name: '摄像头'
+            }
+          }
+        ]
+      }
+    })
+
+    const response = await list({ limit: 1 })
+
+    expect(response.data.rows[0].deviceClass).toMatchObject({
+      _id: 'type-1',
+      id: 'type-1',
+      name: '摄像头'
+    })
+    expect(requestIot).toHaveBeenCalledTimes(1)
+  })
+})

package/package.json

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