nayota-show-sdk 1.3.76 → 1.3.78

package/api/alarmProgress.js

@@ -7,7 +7,7 @@
  * const { list, getOne, create, updateOne, deleteOne, deleteMany } = alarmProgress
  * list({ page: 1, limit: 50 })
  */
-import { requestShow } from '../utils'
+import requestAlarm from '../utils/alarm-request'
 
 
 /**
@@ -56,7 +56,7 @@ import { requestShow } from '../utils'
     ]}
  */
 export function list(query) {
-  return requestShow({
+  return requestAlarm({
     url: '/alarm-progress',
     method: 'get',
     params: query
@@ -88,7 +88,7 @@ export function list(query) {
  * }
  */
 export function create(data) {
-  return requestShow({
+  return requestAlarm({
     url: '/alarm-progress',
     method: 'post',
     data
@@ -115,7 +115,7 @@ export function create(data) {
  }
  */
 export function getOne(id) {
-  return requestShow({
+  return requestAlarm({
     url: `/alarm-progress/${id}`,
     method: 'get'
   })
@@ -148,7 +148,7 @@ export function getOne(id) {
 * }
  */
 export function updateOne(data) {
-  return requestShow({
+  return requestAlarm({
     url: `/alarm-progress/${data._id}`,
     method: 'put',
     data
@@ -175,7 +175,7 @@ export function updateOne(data) {
 * }
  */
 export function deleteOne(id) {
-  return requestShow({
+  return requestAlarm({
     url: `/alarm-progress/${id}`,
     method: 'delete'
   })
@@ -194,7 +194,7 @@ export function deleteOne(id) {
 * }
  */
 export function deleteMany(ids) {
-  return requestShow({
+  return requestAlarm({
     url: '/alarm-progress',
     method: 'delete',
     data: ids // delete传递主体要包含在data里

package/api/alarmRecord.js

@@ -1,4 +1,4 @@
-import { requestShow } from '../utils'
+import requestAlarm from '../utils/alarm-request'
 /**
  * @file 报警记录api
  * @module 报警记录接口
@@ -320,7 +320,7 @@ import { requestShow } from '../utils'
  }
  */
 export function list(query) {
-  return requestShow({
+  return requestAlarm({
     url: '/alarm-records',
     method: 'get',
     params: query
@@ -373,7 +373,7 @@ export function list(query) {
  }
  */
 export function create(data) {
-  return requestShow({
+  return requestAlarm({
     url: '/alarm-records',
     method: 'post',
     data
@@ -409,7 +409,7 @@ export function create(data) {
 *   }
  */
 export function getOne(id) {
-  return requestShow({
+  return requestAlarm({
     url: `/alarm-records/${id}`,
     method: 'get'
   })
@@ -461,7 +461,7 @@ export function getOne(id) {
   }
  */
 export function updateOne(data) {
-  return requestShow({
+  return requestAlarm({
     url: `/alarm-records/${data._id}`,
     method: 'put',
     data
@@ -498,7 +498,7 @@ export function updateOne(data) {
 * }
  */
 export function deleteOne(id) {
-  return requestShow({
+  return requestAlarm({
     url: `/alarm-records/${id}`,
     method: 'delete'
   })
@@ -516,7 +516,7 @@ export function deleteOne(id) {
 * }
  */
 export function deleteMany(ids) {
-  return requestShow({
+  return requestAlarm({
     url: '/alarm-records',
     method: 'delete',
     data: ids // delete传递主体要包含在data里
@@ -563,7 +563,7 @@ export function deleteMany(ids) {
   }
   */
 export function getAlarmCount(data) {
-  return requestShow({
+  return requestAlarm({
     url: '/alarm-records/alarm-count',
     method: 'post',
     data
@@ -593,7 +593,7 @@ export function getAlarmCount(data) {
  }
  */
 export function getAlarmTotalCount() {
-  return requestShow({
+  return requestAlarm({
     url: '/alarm-records/alarm-total-count',
     method: 'post'
   })
@@ -638,7 +638,7 @@ export function getAlarmTotalCount() {
  }
  */
 export function processingManyAlarm(data) {
-  return requestShow({
+  return requestAlarm({
     url: '/alarm-records/processing-many-alarm',
     method: 'post',
     data
@@ -668,7 +668,7 @@ export function processingManyAlarm(data) {
 }
 */
 export function exportAlarmRecord(data) {
-  return requestShow({
+  return requestAlarm({
     url: '/alarm-records/export-alarm-excel',
     method: 'post',
     data
@@ -724,7 +724,7 @@ export function exportAlarmRecord(data) {
    ]}
    */
 export function getMoreAlarmCount(data) {
-  return requestShow({
+  return requestAlarm({
     url: '/alarm-records/more-alarm-count',
     method: 'post',
     data
@@ -742,7 +742,7 @@ export function getMoreAlarmCount(data) {
  * @returns {Object} data - 统计结果
  */
 export function alarmStatistics(query) {
-  return requestShow({
+  return requestAlarm({
     url: '/alarm-records/alarm-statistics',
     method: 'get',
     params: query
@@ -759,7 +759,7 @@ export function alarmStatistics(query) {
  * @returns {Object} data - 统计结果
  */
 export function alarmAverageResponseDuration(query) {
-  return requestShow({
+  return requestAlarm({
     url: '/alarm-records/alarm-average-response-duration',
     method: 'get',
     params: query
@@ -779,7 +779,7 @@ export function alarmAverageResponseDuration(query) {
  * @returns {Array<Object>} data - 告警类型统计结果
  */
 export function alarmTypeCount(query) {
-  return requestShow({
+  return requestAlarm({
     url: '/alarm-records/alarm-type-count',
     method: 'get',
     params: query
@@ -796,7 +796,7 @@ export function alarmTypeCount(query) {
  * @returns {Object} data - 查询结果
  */
 export function topDepart(query) {
-  return requestShow({
+  return requestAlarm({
     url: '/alarm-records/top-depart',
     method: 'get',
     params: query
@@ -815,7 +815,7 @@ export function topDepart(query) {
  * @returns {Array<Object>} data - 排行榜结果
  */
 export function alarmRankingCount(query) {
-  return requestShow({
+  return requestAlarm({
     url: '/alarm-records/alarm-ranking-count',
     method: 'get',
     params: query

package/api/upload.js

@@ -1,4 +1,5 @@
-import { requestShow, requestForm } from '../utils'
+import urlcfg from '../config/urlcfg'
+import { requestShow, requestForm, requestIot } from '../utils'
 /**
  * @file 文件管理api
  * @module 文件管理接口
@@ -25,6 +26,67 @@ import { requestShow, requestForm } from '../utils'
  * }
 */
 
+function getUploadPayload(response) {
+  if (response && typeof response === 'object') {
+    if (response.code === 0 && response.data) {
+      return response.data
+    }
+
+    if (typeof response.status === 'number' && response.data) {
+      return response.data
+    }
+  }
+
+  return response
+}
+
+function getUrlOrigin(baseUrl) {
+  if (!baseUrl) {
+    return typeof window !== 'undefined' && window.location ? window.location.origin : ''
+  }
+
+  if (/^https?:\/\//i.test(baseUrl)) {
+    try {
+      return new URL(baseUrl).origin
+    } catch (error) {
+      return ''
+    }
+  }
+
+  return typeof window !== 'undefined' && window.location ? window.location.origin : ''
+}
+
+function toAbsoluteConfigFileUrl(fileUrl) {
+  if (!fileUrl || /^https?:\/\//i.test(fileUrl)) {
+    return fileUrl
+  }
+
+  const origin = getUrlOrigin(urlcfg.getIotUrl())
+  if (!origin) {
+    return fileUrl
+  }
+
+  return `${origin}${fileUrl.startsWith('/') ? '' : '/'}${fileUrl}`
+}
+
+function normalizeV2UploadResponse(response) {
+  const payload = getUploadPayload(response) || {}
+  const id = payload.id || payload._id || payload.filename
+  const path = toAbsoluteConfigFileUrl(payload.path || payload.url)
+
+  return {
+    code: 0,
+    success: true,
+    data: {
+      ...payload,
+      _id: id,
+      id,
+      name: payload.name || payload.originalname || payload.filename,
+      path
+    }
+  }
+}
+
 /**
  * 获取文件列表
  * @param {Object} query - 请求对象
@@ -50,6 +112,21 @@ export function list(query) {
  * @returns {string} data - 新增成功的数据，见表结构upload定义
  */
 export function upload(data) {
+  if (urlcfg.isV2()) {
+    if (!urlcfg.getIotUrl()) {
+      throw new Error('[nayota-show-sdk][v2] iotServer is required for upload module.')
+    }
+
+    return requestIot({
+      url: '/files/upload',
+      method: 'post',
+      data,
+      headers: {
+        'Content-Type': 'multipart/form-data'
+      }
+    }).then(normalizeV2UploadResponse)
+  }
+
   return requestForm({
     url: '/uploads',
     method: 'post',
@@ -117,4 +194,3 @@ export default {
   deleteMany,
   getOne
 }
-

package/api/upload.test.js

@@ -0,0 +1,81 @@
+jest.mock('../utils', () => ({
+  requestShow: jest.fn(),
+  requestForm: jest.fn(),
+  requestIot: jest.fn()
+}))
+
+const urlcfg = require('../config/urlcfg').default
+const { requestForm, requestIot } = require('../utils')
+const { upload } = require('./upload')
+
+describe('upload api compatibility', () => {
+  const originalVersion = urlcfg.version
+  const originalIotServer = urlcfg.iotServer
+
+  afterEach(() => {
+    urlcfg.version = originalVersion
+    urlcfg.iotServer = originalIotServer
+    jest.clearAllMocks()
+  })
+
+  test('uses legacy show uploads endpoint in v1', async () => {
+    const formData = { file: 'file-content' }
+    requestForm.mockResolvedValue({ code: 0, data: { path: '/uploads/a.svg' } })
+
+    const response = await upload(formData)
+
+    expect(requestForm).toHaveBeenCalledWith({
+      url: '/uploads',
+      method: 'post',
+      data: formData
+    })
+    expect(requestIot).not.toHaveBeenCalled()
+    expect(response).toEqual({ code: 0, data: { path: '/uploads/a.svg' } })
+  })
+
+  test('uses config v2 files upload endpoint and returns legacy path shape', async () => {
+    const formData = { file: 'file-content' }
+    urlcfg.version = 'v2'
+    urlcfg.iotServer = 'http://config.local/api/v1'
+    requestIot.mockResolvedValue({
+      status: 201,
+      data: {
+        filename: 'floor.svg',
+        url: '/api/v1/files/floor.svg'
+      }
+    })
+
+    const response = await upload(formData)
+
+    expect(requestIot).toHaveBeenCalledWith({
+      url: '/files/upload',
+      method: 'post',
+      data: formData,
+      headers: {
+        'Content-Type': 'multipart/form-data'
+      }
+    })
+    expect(requestForm).not.toHaveBeenCalled()
+    expect(response).toEqual({
+      code: 0,
+      success: true,
+      data: {
+        _id: 'floor.svg',
+        id: 'floor.svg',
+        filename: 'floor.svg',
+        name: 'floor.svg',
+        path: 'http://config.local/api/v1/files/floor.svg',
+        url: '/api/v1/files/floor.svg'
+      }
+    })
+  })
+
+  test('requires iotServer for v2 uploads', () => {
+    urlcfg.version = 'v2'
+    urlcfg.iotServer = ''
+
+    expect(() => upload({ file: 'file-content' })).toThrow(
+      '[nayota-show-sdk][v2] iotServer is required for upload module.'
+    )
+  })
+})

package/package.json

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

package/utils/alarm-request.js

@@ -0,0 +1,22 @@
+import urlcfg from '../config/urlcfg'
+import { requestIot, requestShow } from './index'
+
+export function getAlarmRequestTarget() {
+  if (!urlcfg.isV2()) {
+    return 'show'
+  }
+
+  if (!urlcfg.getIotUrl()) {
+    throw new Error('[nayota-show-sdk][v2] iotServer is required for alarm module.')
+  }
+
+  return 'iot'
+}
+
+export function requestAlarm(config) {
+  return getAlarmRequestTarget() === 'iot'
+    ? requestIot(config)
+    : requestShow(config)
+}
+
+export default requestAlarm

package/utils/alarm-request.test.js

@@ -0,0 +1,35 @@
+const urlcfg = require('../config/urlcfg').default
+const { getAlarmRequestTarget } = require('./alarm-request')
+
+describe('alarm request target', () => {
+  const originalVersion = urlcfg.version
+  const originalIotServer = urlcfg.iotServer
+
+  afterEach(() => {
+    urlcfg.version = originalVersion
+    urlcfg.iotServer = originalIotServer
+  })
+
+  test('uses show target by default', () => {
+    urlcfg.version = 'v1'
+    urlcfg.iotServer = ''
+
+    expect(getAlarmRequestTarget()).toBe('show')
+  })
+
+  test('uses iot target in v2', () => {
+    urlcfg.version = 'v2'
+    urlcfg.iotServer = '/iot-api'
+
+    expect(getAlarmRequestTarget()).toBe('iot')
+  })
+
+  test('requires iotServer in v2', () => {
+    urlcfg.version = 'v2'
+    urlcfg.iotServer = ''
+
+    expect(() => getAlarmRequestTarget()).toThrow(
+      '[nayota-show-sdk][v2] iotServer is required for alarm module.'
+    )
+  })
+})

package/utils/iot-module-specs.js

@@ -41,6 +41,37 @@ function normalizeAreaFloorPlan(data = {}) {
   return undefined
 }
 
+function normalizeAreaCenterPoint(data = {}) {
+  if (data.centerPoint) {
+    return data.centerPoint
+  }
+
+  if (Array.isArray(data.centerCoordinate) && data.centerCoordinate.length >= 2) {
+    return removeUndefinedFields({
+      x: data.centerCoordinate[0],
+      y: data.centerCoordinate[1]
+    })
+  }
+
+  return undefined
+}
+
+function normalizeAreaCenterCoordinate(item = {}) {
+  if (Array.isArray(item.centerCoordinate)) {
+    return item.centerCoordinate
+  }
+
+  if (item.centerPoint && typeof item.centerPoint === 'object') {
+    const x = item.centerPoint.x != null ? item.centerPoint.x : item.centerPoint.longitude
+    const y = item.centerPoint.y != null ? item.centerPoint.y : item.centerPoint.latitude
+    if (x != null && y != null) {
+      return [x, y]
+    }
+  }
+
+  return undefined
+}
+
 function mapAreaToIotQuery(query = {}) {
   const next = removeUndefinedFields({
     ...omitKeys(query, ['_id', 'depart', 'visible', 'areaClass', 'sort']),
@@ -74,7 +105,8 @@ function mapAreaToIotBody(data = {}) {
       'areaClass',
       'targetDepartId',
       'type',
-      'relationInfo'
+      'relationInfo',
+      'centerCoordinate'
     ]),
     code: data.code || fallbackCode(data.name || data._id, 'SPACE'),
     spaceType: data.spaceType || 'zone',
@@ -83,6 +115,7 @@ function mapAreaToIotBody(data = {}) {
     area: data.area != null ? data.area : data.areaSize,
     areaClassId: data.areaClassId || resolveLegacyReference(data.areaClass),
     targetHierarchyId: data.targetHierarchyId || resolveLegacyReference(data.targetDepartId),
+    centerPoint: normalizeAreaCenterPoint(data),
     floorPlan: normalizeAreaFloorPlan(data),
     statisticsJson: parseLegacyJson(data.statisticsJson),
     metadata: Object.keys(metadata).length ? metadata : undefined
@@ -105,6 +138,7 @@ function mapIotAreaToLegacy(item = {}) {
     areaClass: entity.areaClassId,
     targetDepartId: entity.targetHierarchyId,
     type: metadata.legacyType || entity.type,
+    centerCoordinate: normalizeAreaCenterCoordinate(entity),
     imageUrl: entity.imageUrl || getNestedValue(entity, 'floorPlan.url'),
     statisticsJson: stringifyLegacyJson(entity.statisticsJson),
     relationInfo
@@ -368,60 +402,6 @@ function normalizeLegacyPropLine(source = {}, prop = {}, row = {}) {
   return null
 }
 
-const LEGACY_SWITCH_STATUS_KEYWORDS = [
-  '开关',
-  '电源',
-  '启停',
-  '启动',
-  '运行',
-  'switch',
-  'power'
-]
-
-const LEGACY_SWITCH_STATUS_EXCLUDE_KEYWORDS = [
-  '模式',
-  '温度',
-  '风速',
-  '设定',
-  '设置',
-  '锁屏',
-  '锁定',
-  'lock',
-  'mode',
-  'temp',
-  'speed',
-  'set'
-]
-
-function isLegacyBinaryInterval(interval) {
-  try {
-    const payload = typeof interval === 'string' ? JSON.parse(interval) : interval
-    return Array.isArray(payload) && Array.isArray(payload[0]) && payload[0].length === 2
-  } catch {
-    return false
-  }
-}
-
-function isLegacySwitchOperateStatus(source = {}, interval = '') {
-  if (source.propType !== 'Operate' || !isLegacyBinaryInterval(interval)) {
-    return false
-  }
-
-  const normalized = [
-    source.propertyKey,
-    source.propName,
-    source.name,
-    source.code,
-    source.shortAddress
-  ].filter(Boolean).join(' ').toLowerCase()
-
-  if (LEGACY_SWITCH_STATUS_EXCLUDE_KEYWORDS.some(keyword => normalized.includes(keyword))) {
-    return false
-  }
-
-  return LEGACY_SWITCH_STATUS_KEYWORDS.some(keyword => normalized.includes(keyword))
-}
-
 function normalizeLegacyNumber(value) {
   if (value === undefined || value === null || value === '') {
     return null
@@ -530,7 +510,7 @@ function normalizeLegacyEasyListProp(source = {}, row = {}) {
   const interval = prop.interval || source.interval || source.valueMap || ''
   const line = normalizeLegacyPropLine(source, prop, row)
   const isMain = Boolean(source.isMain)
-  const isStatus = Boolean(source.isStatus || isLegacySwitchOperateStatus(source, interval))
+  const isStatus = Boolean(source.isStatus)
   const isNumber = Boolean(source.isNumber)
   const isImport = Boolean(source.isImport || isMain || isStatus || isNumber)
 
@@ -556,7 +536,7 @@ function normalizeLegacyEasyListProp(source = {}, row = {}) {
   })
 
   return removeUndefinedFields({
-    ...source,
+    ...omitKeys(source, ['isShow', 'isCensus']),
     _id: source._id || source.id,
     propId,
     devicePropertyId: source.devicePropertyId || propId,

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

@@ -127,6 +127,43 @@ describe('iotModuleSpecs departs hierarchy compatibility', () => {
   })
 })
 
+describe('iotModuleSpecs area space compatibility', () => {
+  const area = iotModuleSpecs.area.operations
+
+  test('maps legacy centerCoordinate to space centerPoint when creating areas', () => {
+    const request = area.create.toRequest({
+      name: '前厅区域',
+      depart: 'hierarchy-1',
+      bounds: [[0, 0], [10, 0], [10, 10], [0, 10]],
+      centerCoordinate: [5, 5]
+    })
+
+    expect(request.url).toBe('/spaces')
+    expect(request.method).toBe('post')
+    expect(request.data.centerCoordinate).toBeUndefined()
+    expect(request.data.centerPoint).toEqual({ x: 5, y: 5 })
+  })
+
+  test('maps space centerPoint back to legacy centerCoordinate', () => {
+    const response = area.list.fromResponse({
+      code: 0,
+      data: {
+        total: 1,
+        items: [
+          {
+            id: 'space-1',
+            name: '前厅区域',
+            hierarchyId: 'hierarchy-1',
+            centerPoint: { x: 12, y: 34 }
+          }
+        ]
+      }
+    })
+
+    expect(response.data.rows[0].centerCoordinate).toEqual([12, 34])
+  })
+})
+
 describe('iotModuleSpecs devices write compatibility', () => {
   const devices = iotModuleSpecs.devices.operations
 
@@ -238,11 +275,11 @@ describe('iotModuleSpecs devices easyList legacy compatibility', () => {
 
     expect(row._id).toBe('twin-1')
     expect(row.status).toEqual({
-      value: 1,
-      label: '开',
-      valueStr: '开',
-      total: 3,
-      open: 1
+      value: 0,
+      label: '解锁',
+      valueStr: '解锁',
+      total: 2,
+      open: 0
     })
     expect(modeProp).toEqual(
       expect.objectContaining({
@@ -270,12 +307,14 @@ describe('iotModuleSpecs devices easyList legacy compatibility', () => {
     expect(switchProp).toEqual(
       expect.objectContaining({
         propType: 'Operate',
-        isStatus: true,
-        isImport: true,
+        isStatus: false,
+        isImport: false,
         value: 1,
         valueStr: '开'
       })
     )
+    expect(switchProp.isShow).toBeUndefined()
+    expect(switchProp.isCensus).toBeUndefined()
     expect(electricProp).toEqual(
       expect.objectContaining({
         isMain: true,