nayota-show-sdk 1.3.96 → 1.3.98

package/api/bmsRouter.js

@@ -1,4 +1,5 @@
 import { requestShow } from '../utils'
+import { normalizeLegacyCameraRouterResponse } from '../utils/legacy-bms-router'
 /**
  * @file BMS路由api
  * @module BMS路由接口
@@ -134,7 +135,7 @@ export function list(query) {
     url: '/bms-routers',
     method: 'get',
     params: query
-  })
+  }).then(response => normalizeLegacyCameraRouterResponse(response))
 }
 
 /**
@@ -212,4 +213,3 @@ export default {
   deleteMany,
   getOne
 }
-

package/api/devices.js

@@ -399,6 +399,10 @@ export function getPropHistoryData(data) {
  * }
  */
 export function updateDepart(data) {
+  if (shouldUseIot('updateDepart')) {
+    return executeIotModuleAction(MODULE_NAME, 'updateDepart', data)
+  }
+
   return requestShow({
     url: '/devices/updateDepart',
     method: 'post',
@@ -407,6 +411,10 @@ export function updateDepart(data) {
 }
 
 export function updateProp(data) {
+  if (shouldUseIot('updateProp')) {
+    return executeIotModuleAction(MODULE_NAME, 'updateProp', data)
+  }
+
   return requestShow({
     url: '/devices/updateProp',
     method: 'post',

package/package.json

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

package/utils/iot-module-specs.js

@@ -1195,6 +1195,40 @@ export const iotModuleSpecs = {
             message: data?.message ?? payload?.message
           })
         }
+      },
+      updateDepart: {
+        toRequest(data = {}) {
+          return {
+            url: '/devices/updateDepart',
+            method: 'post',
+            data
+          }
+        },
+        fromResponse(response) {
+          const payload = response && response.data && response.status ? response.data : response
+          const data = payload?.data !== undefined ? payload.data : payload
+          return removeUndefinedFields({
+            code: Number(data?.code ?? payload?.code ?? 0),
+            message: data?.message ?? payload?.message ?? '更新成功'
+          })
+        }
+      },
+      updateProp: {
+        toRequest(data = {}) {
+          return {
+            url: '/devices/updateProp',
+            method: 'post',
+            data
+          }
+        },
+        fromResponse(response) {
+          const payload = response && response.data && response.status ? response.data : response
+          const data = payload?.data !== undefined ? payload.data : payload
+          return removeUndefinedFields({
+            code: Number(data?.code ?? payload?.code ?? 0),
+            message: data?.message ?? payload?.message ?? '更新成功'
+          })
+        }
       }
     }
   },

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

@@ -735,3 +735,54 @@ describe('iotModuleSpecs devices getPropHistoryData legacy compatibility', () =>
     })
   })
 })
+
+describe('iotModuleSpecs devices legacy mutation compatibility', () => {
+  const devices = iotModuleSpecs.devices.operations
+
+  test('posts updateDepart to the v2 legacy-compatible endpoint', () => {
+    const payload = {
+      deviceIds: ['twin-1', 'twin-2'],
+      depart: 'hierarchy-1'
+    }
+
+    const request = devices.updateDepart.toRequest(payload)
+
+    expect(request).toEqual({
+      url: '/devices/updateDepart',
+      method: 'post',
+      data: payload
+    })
+
+    expect(devices.updateDepart.fromResponse({ code: 0 })).toEqual({
+      code: 0,
+      message: '更新成功'
+    })
+  })
+
+  test('posts updateProp to the v2 legacy-compatible endpoint', () => {
+    const payload = {
+      deviceId: 'twin-1',
+      iotDeviceId: 'device-1',
+      props: [
+        {
+          type: 'Operate',
+          address: 'powerSwitch',
+          name: '开关'
+        }
+      ]
+    }
+
+    const request = devices.updateProp.toRequest(payload)
+
+    expect(request).toEqual({
+      url: '/devices/updateProp',
+      method: 'post',
+      data: payload
+    })
+
+    expect(devices.updateProp.fromResponse({ code: 0, message: '更新成功' })).toEqual({
+      code: 0,
+      message: '更新成功'
+    })
+  })
+})

package/utils/legacy-bms-router.js

@@ -0,0 +1,133 @@
+const CAMERA_GROUP_SUBJECT = 'models-camera'
+const CAMERA_DEVICE_SUBJECT = 'models-camera-device'
+
+function text(value) {
+  return String(value || '').trim()
+}
+
+function lower(value) {
+  return text(value).toLowerCase()
+}
+
+function isCameraRoute(route = {}) {
+  const subject = lower(route.subject)
+  const path = lower(route.path)
+  const name = text(route.name || route.title)
+  const icon = lower(route.icon && typeof route.icon === 'object' ? route.icon.icon : route.icon)
+
+  return (
+    subject.includes('camera') ||
+    path.includes('camera') ||
+    name.includes('摄像头') ||
+    name.includes('视频监控') ||
+    icon.includes('camera') ||
+    icon.includes('video')
+  )
+}
+
+function hasCameraChild(route = {}) {
+  return Array.isArray(route.children) && route.children.some(child => isCameraRoute(child))
+}
+
+function toLegacyCameraChild(route = {}, level) {
+  return {
+    ...route,
+    name: route.name === '摄像头监控' ? '设备管理' : route.name || '设备管理',
+    type: '页面',
+    path: CAMERA_DEVICE_SUBJECT,
+    subject: CAMERA_DEVICE_SUBJECT,
+    level: level + 1,
+    children: []
+  }
+}
+
+export function normalizeLegacyCameraRouterItem(route = {}) {
+  const children = Array.isArray(route.children)
+    ? route.children.map(child => normalizeLegacyCameraRouterItem(child))
+    : []
+  const routeWithChildren = { ...route, children }
+
+  if (!isCameraRoute(routeWithChildren)) {
+    return routeWithChildren
+  }
+
+  if (
+    lower(routeWithChildren.subject) === CAMERA_DEVICE_SUBJECT ||
+    lower(routeWithChildren.path) === CAMERA_DEVICE_SUBJECT
+  ) {
+    return {
+      ...routeWithChildren,
+      type: routeWithChildren.type || '页面',
+      path: CAMERA_DEVICE_SUBJECT,
+      subject: CAMERA_DEVICE_SUBJECT
+    }
+  }
+
+  if (hasCameraChild(routeWithChildren)) {
+    return {
+      ...routeWithChildren,
+      name: routeWithChildren.name || '摄像头监控',
+      subject: routeWithChildren.subject && lower(routeWithChildren.subject).includes('camera')
+        ? routeWithChildren.subject
+        : CAMERA_GROUP_SUBJECT
+    }
+  }
+
+  const level = Number.isFinite(Number(routeWithChildren.level))
+    ? Number(routeWithChildren.level)
+    : 0
+
+  return {
+    ...routeWithChildren,
+    name: routeWithChildren.name || '摄像头监控',
+    type: '分组',
+    path: routeWithChildren.path && lower(routeWithChildren.path).includes('camera')
+      ? undefined
+      : routeWithChildren.path,
+    subject: CAMERA_GROUP_SUBJECT,
+    level,
+    children: [toLegacyCameraChild(routeWithChildren, level)]
+  }
+}
+
+function normalizeRows(rows) {
+  return rows.map(row => normalizeLegacyCameraRouterItem(row))
+}
+
+export function normalizeLegacyCameraRouterResponse(response) {
+  if (!response || typeof response !== 'object') {
+    return response
+  }
+
+  if (Array.isArray(response.rows)) {
+    return {
+      ...response,
+      rows: normalizeRows(response.rows)
+    }
+  }
+
+  if (response.data && Array.isArray(response.data.rows)) {
+    return {
+      ...response,
+      data: {
+        ...response.data,
+        rows: normalizeRows(response.data.rows)
+      }
+    }
+  }
+
+  if (response.data?.data && Array.isArray(response.data.data.rows)) {
+    return {
+      ...response,
+      data: {
+        ...response.data,
+        data: {
+          ...response.data.data,
+          rows: normalizeRows(response.data.data.rows)
+        }
+      }
+    }
+  }
+
+  return response
+}

package/utils/legacy-bms-router.test.js

@@ -0,0 +1,74 @@
+const {
+  normalizeLegacyCameraRouterItem,
+  normalizeLegacyCameraRouterResponse
+} = require('./legacy-bms-router')
+
+describe('legacy BMS router camera compatibility', () => {
+  test('wraps camera leaf route as the legacy camera group', () => {
+    const result = normalizeLegacyCameraRouterItem({
+      _id: 'route-camera',
+      name: '摄像头监控',
+      type: '页面',
+      subject: 'route-legacy-camera',
+      path: 'camera-management',
+      level: 0,
+      children: []
+    })
+
+    expect(result).toMatchObject({
+      _id: 'route-camera',
+      name: '摄像头监控',
+      type: '分组',
+      subject: 'models-camera',
+      level: 0
+    })
+    expect(result.children).toHaveLength(1)
+    expect(result.children[0]).toMatchObject({
+      name: '设备管理',
+      type: '页面',
+      subject: 'models-camera-device',
+      path: 'models-camera-device',
+      level: 1,
+      children: []
+    })
+  })
+
+  test('keeps existing legacy camera children and normalizes group subject', () => {
+    const result = normalizeLegacyCameraRouterItem({
+      name: '摄像头监控',
+      type: '分组',
+      subject: 'group-models-1731378379908',
+      children: [
+        {
+          name: '设备管理',
+          type: '页面',
+          subject: 'models-camera-device',
+          path: 'models-camera-device'
+        }
+      ]
+    })
+
+    expect(result.subject).toBe('models-camera')
+    expect(result.children[0].subject).toBe('models-camera-device')
+  })
+
+  test('normalizes rows in legacy response envelopes', () => {
+    const result = normalizeLegacyCameraRouterResponse({
+      code: 0,
+      data: {
+        total: 1,
+        rows: [
+          {
+            name: '摄像头监控',
+            type: '页面',
+            subject: 'camera-page',
+            children: []
+          }
+        ]
+      }
+    })
+
+    expect(result.data.rows[0].subject).toBe('models-camera')
+    expect(result.data.rows[0].children[0].subject).toBe('models-camera-device')
+  })
+})