nayota-show-sdk 1.3.74 → 1.3.76

package/package.json

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

package/utils/iot-module-specs.js

@@ -215,12 +215,16 @@ function mapIotDepartsToLegacy(item = {}) {
 }
 
 function mapDevicesToIotQuery(query = {}) {
+  const digitalTwinTypeId = query.digitalTwinTypeId != null && query.digitalTwinTypeId !== ''
+    ? query.digitalTwinTypeId
+    : resolveLegacyReference(query.deviceClass) || undefined
+
   return removeUndefinedFields({
     ...omitKeys(query, ['_id', 'depart', 'area', 'deviceClass', 'cloudType', 'status', 'sort']),
     id: query.id || query._id,
     hierarchyId: query.hierarchyId || query.depart,
     spaceId: query.spaceId || query.area,
-    digitalTwinTypeId: query.digitalTwinTypeId || resolveLegacyReference(query.deviceClass),
+    digitalTwinTypeId,
     isActive: query.isActive != null ? query.isActive : (query.cloudType != null ? query.cloudType : query.status),
     ...parseLegacySort(query.sort, {
       deviceClass: 'digitalTwinTypeId',
@@ -232,6 +236,10 @@ function mapDevicesToIotQuery(query = {}) {
 }
 
 function mapDevicesToIotBody(data = {}) {
+  const digitalTwinTypeId = data.digitalTwinTypeId != null && data.digitalTwinTypeId !== ''
+    ? data.digitalTwinTypeId
+    : resolveLegacyReference(data.deviceClass) || undefined
+
   const metadata = mergeMetadata(data.metadata, {
     configDeviceId: data.n_device,
     mapLatLng: data.mapLatLng,
@@ -268,7 +276,7 @@ function mapDevicesToIotBody(data = {}) {
     twinId: data.twinId || data.n_device || fallbackCode(data.name || data._id, 'TWIN'),
     hierarchyId: data.hierarchyId || data.depart,
     spaceId: data.spaceId || data.area,
-    digitalTwinTypeId: data.digitalTwinTypeId || resolveLegacyReference(data.deviceClass),
+    digitalTwinTypeId,
     isActive: data.isActive != null ? data.isActive : (data.cloudType != null ? data.cloudType : data.status),
     metadata: Object.keys(metadata).length ? metadata : undefined
   })
@@ -360,6 +368,60 @@ 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
@@ -468,7 +530,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)
+  const isStatus = Boolean(source.isStatus || isLegacySwitchOperateStatus(source, interval))
   const isNumber = Boolean(source.isNumber)
   const isImport = Boolean(source.isImport || isMain || isStatus || isNumber)
 

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

@@ -127,6 +127,25 @@ describe('iotModuleSpecs departs hierarchy compatibility', () => {
   })
 })
 
+describe('iotModuleSpecs devices write compatibility', () => {
+  const devices = iotModuleSpecs.devices.operations
+
+  test('does not send digitalTwinTypeId null for partial map coordinate updates', () => {
+    const request = devices.updateOne.toRequest({
+      _id: '77b8889e-7d3a-4efa-9fc9-858305468d6c',
+      digitalTwinTypeId: null,
+      spaceId: 'c13c121f-1a23-4656-be54-9e7488f43c55',
+      svgCoordinates: [891.4283167347667, 739.999788571489]
+    })
+
+    expect(request.url).toBe('/digital-twins/77b8889e-7d3a-4efa-9fc9-858305468d6c')
+    expect(request.method).toBe('patch')
+    expect(request.data.digitalTwinTypeId).toBeUndefined()
+    expect(request.data.spaceId).toBe('c13c121f-1a23-4656-be54-9e7488f43c55')
+    expect(request.data.svgCoordinates).toEqual([891.4283167347667, 739.999788571489])
+  })
+})
+
 describe('iotModuleSpecs devices easyList legacy compatibility', () => {
   const easyList = iotModuleSpecs.devices.operations.easyList
 
@@ -168,14 +187,29 @@ describe('iotModuleSpecs devices easyList legacy compatibility', () => {
                 name: '模式设定',
                 isStatus: true,
                 line: true,
-                value: 1,
-                valueStr: '制热',
+                value: 0,
+                valueStr: '制冷',
                 interval: '[["制冷","制热"],[0,1]]',
                 valueAt: '2026-04-25T06:30:00.000Z',
                 prop: {
                   id: 'device-prop-mode'
                 }
               },
+              {
+                id: 'twin-prop-switch',
+                propId: 'device-prop-switch',
+                propertyKey: 'powerSwitch',
+                name: '开关',
+                propType: 'Operate',
+                line: true,
+                value: 1,
+                valueStr: '开',
+                interval: '[["关","开"],[0,1]]',
+                valueAt: '2026-04-25T06:30:30.000Z',
+                prop: {
+                  id: 'device-prop-switch'
+                }
+              },
               {
                 id: 'twin-prop-electric',
                 propId: 'device-prop-electric',
@@ -199,14 +233,15 @@ describe('iotModuleSpecs devices easyList legacy compatibility', () => {
 
     const row = response.data.rows[0]
     const modeProp = row.props[1]
-    const electricProp = row.props[2]
+    const switchProp = row.props[2]
+    const electricProp = row.props[3]
 
     expect(row._id).toBe('twin-1')
     expect(row.status).toEqual({
       value: 1,
-      label: '制热',
-      valueStr: '制热',
-      total: 2,
+      label: '开',
+      valueStr: '开',
+      total: 3,
       open: 1
     })
     expect(modeProp).toEqual(
@@ -216,8 +251,8 @@ describe('iotModuleSpecs devices easyList legacy compatibility', () => {
         isStatus: true,
         isImport: true,
         line: true,
-        value: 1,
-        valueStr: '制热',
+        value: 0,
+        valueStr: '制冷',
         interval: '[["制冷","制热"],[0,1]]',
         valueAt: '2026-04-25T06:30:00.000Z'
       })
@@ -226,12 +261,21 @@ describe('iotModuleSpecs devices easyList legacy compatibility', () => {
       expect.objectContaining({
         _id: 'device-prop-mode',
         line: true,
-        value: 1,
-        valueStr: '制热',
+        value: 0,
+        valueStr: '制冷',
         interval: '[["制冷","制热"],[0,1]]',
         valueAt: '2026-04-25T06:30:00.000Z'
       })
     )
+    expect(switchProp).toEqual(
+      expect.objectContaining({
+        propType: 'Operate',
+        isStatus: true,
+        isImport: true,
+        value: 1,
+        valueStr: '开'
+      })
+    )
     expect(electricProp).toEqual(
       expect.objectContaining({
         isMain: true,