nayota-show-sdk 1.3.63 → 1.3.66

package/api/deviceClass.js

@@ -10,6 +10,10 @@ function shouldUseIot(action) {
  * @file 设备类型api
  * @module 设备类型接口
  * @category 设备管理
+ * @import
+ * import { deviceClass } from 'nayota-show-sdk'
+ * const { list, create, getOne, updateOne, deleteOne, deleteMany, getDeviceOffline, onlineRate } = deviceClass
+ * list({ page: 1, limit: 10 })
  * @categoryOrder 2
  */
 
@@ -209,6 +213,48 @@ export function getDeviceOffline(data) {
   })
 }
 
+/**
+ * 获取设备类型在线率
+ * @param {Object} query - 查询参数
+ * @param {number} query.year - 统计年份，例如 2026
+ * @param {number} [query.month] - 统计月份，1-12；不传表示查询整年
+ * @param {string} [query.creator] - 所属用户ID
+ * @param {Array<string>|string} [query.deviceClasses] - 设备类型ID列表，也兼容逗号分隔字符串
+ * @returns {number} code - 返回码，0表示成功
+ * @returns {Object} data - 在线率统计结果
+ * @returns {number} data.year - 统计年份
+ * @returns {number|null} data.month - 统计月份；查询全年时为 null
+ * @returns {number} data.startTime - 统计开始时间戳
+ * @returns {number} data.endTime - 统计结束时间戳
+ * @returns {Object} data.summary - 所有设备类型汇总在线率
+ * @returns {number} data.summary.onlineDuration - 汇总在线时长，单位毫秒
+ * @returns {number} data.summary.offlineDuration - 汇总离线时长，单位毫秒
+ * @returns {number} data.summary.totalDuration - 汇总总时长，单位毫秒
+ * @returns {number} data.summary.onlineRate - 汇总在线率，0-1
+ * @returns {number} data.summary.onlineRatePercent - 汇总在线率百分比
+ * @returns {Array<Object>} data.items - 各设备类型在线率列表
+ * @returns {string} data.items[].deviceClass - 设备类型ID
+ * @returns {string} data.items[].deviceClassName - 设备类型名称
+ * @returns {number} data.items[].alarmTotal - 参与统计的在离线 alarm 数量
+ * @returns {Object} data.items[].summary - 当前设备类型在线率汇总
+ * @returns {number} data.items[].summary.onlineDuration - 在线时长，单位毫秒
+ * @returns {number} data.items[].summary.offlineDuration - 离线时长，单位毫秒
+ * @returns {number} data.items[].summary.totalDuration - 总时长，单位毫秒
+ * @returns {number} data.items[].summary.onlineRate - 在线率，0-1
+ * @returns {number} data.items[].summary.onlineRatePercent - 在线率百分比
+ */
+export function onlineRate(query) {
+  if (shouldUseIot('onlineRate')) {
+    return executeIotModuleAction(MODULE_NAME, 'onlineRate', query)
+  }
+
+  return requestShow({
+    url: '/device-classes/online-rate',
+    method: 'get',
+    params: query
+  })
+}
+
 export default {
   list,
   create,
@@ -216,5 +262,6 @@ export default {
   deleteOne,
   deleteMany,
   getOne,
-  getDeviceOffline
+  getDeviceOffline,
+  onlineRate
 }

package/index.test.js

@@ -1,27 +1,38 @@
-import sdk from './index'
+let modules
+beforeAll(() => {
+  jest.mock('./__mocks__/requireContext')
 
-describe('nayota-show-sdk exports', () => {
-  test('exposes config entry and core API modules', () => {
-    expect(sdk).toBeDefined()
-    expect(typeof sdk.config).toBe('function')
-    expect(typeof sdk.on).toBe('function')
-
-    expect(sdk.area).toBeDefined()
-    expect(typeof sdk.area.list).toBe('function')
-
-    expect(sdk.areaClass).toBeDefined()
-    expect(typeof sdk.areaClass.getOne).toBe('function')
-
-    expect(sdk.components).toBeDefined()
-    expect(typeof sdk.components.create).toBe('function')
+  modules = require('./index.js')
+})
 
-    expect(sdk.departs).toBeDefined()
-    expect(typeof sdk.departs.updateOne).toBe('function')
+// Test the modules object
+describe('modules', () => {
+  test('should have the correct structure', () => {
+    expect(modules).toBeDefined()
+    expect(typeof modules).toBe('object')
+    expect(Object.keys(modules)).toHaveLength(17) // Assuming there is only one module in the littleTool directory
 
-    expect(sdk.devices).toBeDefined()
-    expect(typeof sdk.devices.easyList).toBe('function')
+    // Test the structure of the module
+    // const module = modules['api'] // Assuming the module name is 'api'
+    // expect(module).toBeDefined()
+    // expect(typeof module).toBe('object')
+    // expect(Object.keys(module)).toHaveLength(13) // Assuming there are 13 sub-modules in the api directory
 
-    expect(sdk.deviceClass).toBeDefined()
-    expect(typeof sdk.deviceClass.deleteOne).toBe('function')
+    // // Test the structure of each sub-module
+    // expect(module['alarms']).toBeDefined()
+    // expect(module['checkReduces']).toBeDefined()
+    // expect(module['user']).toBeDefined()
+    // expect(module['httpDrives']).toBeDefined()
+    // expect(module['hardwares']).toBeDefined()
+    // expect(module['checks']).toBeDefined()
+    // expect(module['cloudHardwares']).toBeDefined()
+    // expect(module['loraSlaves']).toBeDefined()
+    // expect(module['lorawanDevices']).toBeDefined()
+    // expect(module['nbiotDrives']).toBeDefined()
+    // expect(module['nbm2mDevices']).toBeDefined()
+    // expect(module['netDrives']).toBeDefined()
+    // expect(module['netMqttDevices']).toBeDefined()
+    // // 添加alarms list请求的测试
+    // expect(module['alarms']['list']).toBeDefined()
   })
 })

package/package.json

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

package/utils/http-config-iot.js

@@ -1,12 +1,24 @@
 import urlcfg from '../config/urlcfg'
 import createHttpInstance from './http-factory'
 
+function isLegacySuccessCode(code) {
+  if (typeof code === 'number') {
+    return code >= 200 && code < 300
+  }
+
+  if (typeof code === 'string' && /^2\d{2}$/.test(code)) {
+    return true
+  }
+
+  return false
+}
+
 function normalizeIotResponseData(data) {
   if (!data || typeof data !== 'object' || Array.isArray(data)) {
     return data
   }
 
-  if (data.code === 200) {
+  if (isLegacySuccessCode(data.code)) {
     return {
       ...data,
       code: 0
@@ -16,10 +28,15 @@ function normalizeIotResponseData(data) {
   return data
 }
 
+function isIotSuccessResponseData(data) {
+  return data && typeof data === 'object' && data.code === 0
+}
+
 export default function httpConfigIot() {
   return createHttpInstance({
     getBaseUrl: () => urlcfg.getIotUrl(),
     contentType: 'application/json;charset=UTF-8',
-    normalizeResponseData: normalizeIotResponseData
+    normalizeResponseData: normalizeIotResponseData,
+    isSuccessResponseData: isIotSuccessResponseData
   })
 }

package/utils/http-factory.js

@@ -4,10 +4,15 @@ import axios from 'axios'
 import urlcfg from '../config/urlcfg'
 import emitter from './EventEmitter'
 
+function isSuccessStatus(status) {
+  return typeof status === 'number' && status >= 200 && status < 300
+}
+
 function createHttpInstance({
   getBaseUrl,
   contentType,
-  normalizeResponseData
+  normalizeResponseData,
+  isSuccessResponseData
 }) {
   const http = axios.create({
     baseURL: getBaseUrl(),
@@ -53,8 +58,12 @@ function createHttpInstance({
         return res
       }
 
-      if (res.status === 200) {
-        if (data.code !== 0) {
+      if (isSuccessStatus(res.status)) {
+        const success = typeof isSuccessResponseData === 'function'
+          ? isSuccessResponseData(data, res)
+          : data.code === 0
+
+        if (!success) {
           return Promise.reject(data)
         }
         return data

package/utils/iot-adapter-helpers.js

@@ -199,18 +199,19 @@ export function parseLegacySort(sortValue, sortFieldMap = {}) {
 
 export function buildLegacyListResponse(response, mapItem) {
   const payload = extractResponsePayload(response)
-  const items = Array.isArray(payload?.items)
-    ? payload.items
-    : Array.isArray(payload?.rows)
-      ? payload.rows
-      : Array.isArray(payload)
-        ? payload
+  const data = payload?.data !== undefined ? payload.data : payload
+  const items = Array.isArray(data?.items)
+    ? data.items
+    : Array.isArray(data?.rows)
+      ? data.rows
+      : Array.isArray(data)
+        ? data
         : []
 
   return {
     code: 0,
     data: {
-      total: Number(payload?.total ?? items.length ?? 0),
+      total: Number(data?.total ?? items.length ?? 0),
       rows: items.map(item => (mapItem ? mapItem(item) : withLegacyId(item)))
     }
   }

package/utils/iot-module-specs.js

@@ -503,11 +503,17 @@ export const iotModuleSpecs = {
         },
         fromResponse(response) {
           const payload = response && response.data && response.status ? response.data : response
+          const data = payload?.data !== undefined ? payload.data : payload
+          const rows = Array.isArray(data?.rows)
+            ? data.rows
+            : Array.isArray(data?.items)
+              ? data.items
+              : []
           return {
             code: 0,
             data: {
-              total: Number(payload?.total || 0),
-              rows: Array.isArray(payload?.rows) ? payload.rows.map(item => withLegacyId(item)) : []
+              total: Number(data?.total ?? rows.length ?? 0),
+              rows: rows.map(item => withLegacyId(item))
             }
           }
         }

package/http-config-iot.test.js

@@ -1,49 +0,0 @@
-import httpConfigIot from './utils/http-config-iot'
-
-jest.mock('axios', () => {
-  const create = jest.fn(() => {
-    const instance = jest.fn()
-    instance.interceptors = {
-      request: { use: jest.fn() },
-      response: { use: jest.fn() }
-    }
-    return instance
-  })
-
-  return {
-    __esModule: true,
-    default: {
-      create,
-      defaults: {
-        headers: {
-          common: {}
-        }
-      }
-    }
-  }
-})
-
-describe('httpConfigIot', () => {
-  test('normalizes iot success code 200 into legacy success code 0', () => {
-    const http = httpConfigIot()
-    const responseInterceptor = http.interceptors.response.use.mock.calls[0][0]
-
-    expect(
-      responseInterceptor({
-        status: 200,
-        headers: {},
-        data: {
-          code: 200,
-          data: {
-            id: 'space-1'
-          }
-        }
-      })
-    ).toEqual({
-      code: 0,
-      data: {
-        id: 'space-1'
-      }
-    })
-  })
-})

package/iot-adapter-helpers.test.js

@@ -1,29 +0,0 @@
-import { buildLegacyListResponse } from './utils/iot-adapter-helpers'
-
-describe('iot adapter helpers', () => {
-  test('wraps list responses as code + data.total/data.rows', () => {
-    const result = buildLegacyListResponse({
-      total: 1,
-      items: [
-        {
-          id: 'type-1',
-          name: '风速仪'
-        }
-      ]
-    })
-
-    expect(result).toEqual({
-      code: 0,
-      data: {
-        total: 1,
-        rows: [
-          {
-            id: 'type-1',
-            _id: 'type-1',
-            name: '风速仪'
-          }
-        ]
-      }
-    })
-  })
-})