nayota-show-sdk 1.3.99 → 1.3.100

package/api/appRouter.js

@@ -154,7 +154,7 @@ import { requestShow } from '../utils'
             ]
         }
     ],
-    "creator": "64af6ad2f432a57cb0b68bc4",
+    "creator": "11111111-1111-4111-8111-111111111111",
     "createdAt": "2022-12-06T04:24:23.940Z",
     "updatedAt": "2023-12-22T02:51:01.292Z",
     "__v": 84
@@ -254,4 +254,3 @@ export default {
   deleteMany,
   getOne
 }
-

package/api/application.js

@@ -23,7 +23,7 @@ import { requestShow } from '../utils'
     "icon": "能耗分析",
     "color": "#213DF3",
     "url": "https://ss.ningbomart.com/analytics",
-    "creator": "64af6ad2f432a57cb0b68bc4",
+    "creator": "11111111-1111-4111-8111-111111111111",
     "createdAt": "2023-11-28T06:11:42.997Z",
     "updatedAt": "2023-11-28T06:11:42.997Z",
     "__v": 0
@@ -125,4 +125,3 @@ export default {
   deleteMany,
   getOne
 }
-

package/api/attendanceRecord.js

@@ -27,7 +27,7 @@ import { requestShow } from '../utils'
  * @property {boolean} isOvertime - 是否加班
  * @property {number} [overtimeDuration] - 加班时长，单位分钟
  * @property {string} [remark] - 备注
- * @property {string} [creator] - 创建者
+ * @property {string} [creator] - 创建者 UUID
  * @property {Date} createdAt - 创建时间
  * @property {Date} updatedAt - 更新时间
  * @example
@@ -47,7 +47,7 @@ import { requestShow } from '../utils'
  *   "isOvertime": false,
  *   "overtimeDuration": 0,
  *   "remark": "正常出勤",
- *   "creator": "67f8f0000000000000000003",
+ *   "creator": "11111111-1111-4111-8111-111111111111",
  *   "createdAt": "2026-03-31T08:05:00.000Z",
  *   "updatedAt": "2026-03-31T08:05:00.000Z"
  * }
@@ -60,7 +60,7 @@ import { requestShow } from '../utils'
  * @property {'week'|'month'|'year'} [dimension] - 查询维度，不传时由服务端按时间跨度自动推断
  * @property {string} [user] - 用户id
  * @property {number} [shiftType] - 班次类型，1 早班，2 中班，3 晚班
- * @property {string} [creator] - 创建者
+ * @property {string} [creator] - 创建者 UUID
  */
 
 /**
@@ -147,7 +147,7 @@ export function violationStatistics(query) {
  * @param {Object} query - 查询参数
  * @param {number} query.year - 统计年份，例如 2026
  * @param {number} [query.month] - 统计月份，1-12；不传表示查询整年
- * @param {string} [query.creator] - 创建者
+ * @param {string} [query.creator] - 创建者 UUID
  * @param {string} [query.user] - 用户id
  * @param {number} [query.shiftType] - 班次类型，1 早班，2 中班，3 晚班
  * @returns {number} code - 返回码，0 表示成功
@@ -172,7 +172,7 @@ export function attendanceStatistics(query) {
  * @param {Object} query - 查询参数
  * @param {number} query.year - 统计年份，例如 2026
  * @param {number} [query.month] - 统计月份，1-12；不传表示查询整年
- * @param {string} [query.creator] - 创建者
+ * @param {string} [query.creator] - 创建者 UUID
  * @param {string} [query.user] - 用户id
  * @returns {number} code - 返回码，0 表示成功
  * @returns {Object} data - 分析结果
@@ -192,7 +192,7 @@ export function arrivalComplianceAnalysis(query) {
  * @param {Object} query - 查询参数
  * @param {number} query.year - 统计年份，例如 2026
  * @param {number} [query.month] - 统计月份，1-12；不传表示查询整年
- * @param {string} [query.creator] - 创建者
+ * @param {string} [query.creator] - 创建者 UUID
  * @param {string} [query.user] - 用户id
  * @returns {number} code - 返回码，0 表示成功
  * @returns {Object} data - 统计结果

package/api/inspectionPoints.js

@@ -20,7 +20,7 @@ import { requestShow } from '../utils'
     {
         "_id": "67073bfe463d6e00099becdd",
         "name": "1号位置",
-        "creator": "6678e31ff340dfdecd9e1a28",
+        "creator": "11111111-1111-4111-8111-111111111111",
         "createdAt": "2024-10-10T02:29:18.026Z",
         "updatedAt": "2024-10-10T02:29:18.026Z",
         "__v": 0
@@ -121,4 +121,3 @@ export default {
   deleteMany,
   getOne
 }
-

package/api/inspectionTask.js

@@ -35,12 +35,12 @@ import { requestShow } from '../utils'
             "_id": "674e7a4de81aed0009fecddb",
             "name": "测试路线",
             "status": true,
-            "creator": "6678e31ff340dfdecd9e1a28",
+            "creator": "11111111-1111-4111-8111-111111111111",
             "createdAt": "2024-12-03T03:26:05.382Z",
             "updatedAt": "2024-12-03T03:26:05.382Z",
             "__v": 0
         },
-        "creator": "6678e31ff340dfdecd9e1a28",
+        "creator": "11111111-1111-4111-8111-111111111111",
         "__v": 0,
         "createdAt": "2024-12-03T03:26:19.597Z",
         "updatedAt": "2024-12-03T03:26:19.597Z"
@@ -61,12 +61,12 @@ import { requestShow } from '../utils'
             "_id": "674e7a4de81aed0009fecddb",
             "name": "测试路线",
             "status": true,
-            "creator": "6678e31ff340dfdecd9e1a28",
+            "creator": "11111111-1111-4111-8111-111111111111",
             "createdAt": "2024-12-03T03:26:05.382Z",
             "updatedAt": "2024-12-03T03:26:05.382Z",
             "__v": 0
         },
-        "creator": "6678e31ff340dfdecd9e1a28",
+        "creator": "11111111-1111-4111-8111-111111111111",
         "__v": 0,
         "createdAt": "2024-12-03T03:26:19.622Z",
         "updatedAt": "2024-12-03T03:26:19.622Z"
@@ -87,12 +87,12 @@ import { requestShow } from '../utils'
             "_id": "674e7a4de81aed0009fecddb",
             "name": "测试路线",
             "status": true,
-            "creator": "6678e31ff340dfdecd9e1a28",
+            "creator": "11111111-1111-4111-8111-111111111111",
             "createdAt": "2024-12-03T03:26:05.382Z",
             "updatedAt": "2024-12-03T03:26:05.382Z",
             "__v": 0
         },
-        "creator": "6678e31ff340dfdecd9e1a28",
+        "creator": "11111111-1111-4111-8111-111111111111",
         "__v": 0,
         "createdAt": "2024-12-03T03:26:19.633Z",
         "updatedAt": "2024-12-03T03:26:19.633Z"
@@ -230,4 +230,3 @@ export default {
   refreshProcedure,
   delProcedure
 }
-

package/api/line.js

@@ -21,7 +21,7 @@ import { requestShow } from '../utils'
     "_id": "674e7a4de81aed0009fecddb",
     "name": "测试路线",
     "status": true,
-    "creator": "6678e31ff340dfdecd9e1a28",
+    "creator": "11111111-1111-4111-8111-111111111111",
     "createdAt": "2024-12-03T03:26:05.382Z",
     "updatedAt": "2024-12-03T03:26:05.382Z",
     "__v": 0
@@ -35,7 +35,7 @@ import { requestShow } from '../utils'
     "_id": "674e7a4de81aed0009fecddb",
     "name": "测试路线",
     "status": true,
-    "creator": "6678e31ff340dfdecd9e1a28",
+    "creator": "11111111-1111-4111-8111-111111111111",
     "createdAt": "2024-12-03T03:26:05.382Z",
     "updatedAt": "2024-12-03T03:26:05.382Z",
     "__v": 0
@@ -56,7 +56,7 @@ import { requestShow } from '../utils'
     "_id": "674e7a4de81aed0009fecddb",
     "name": "测试路线",
     "status": true,
-    "creator": "6678e31ff340dfdecd9e1a28",
+    "creator": "11111111-1111-4111-8111-111111111111",
     "createdAt": "2024-12-03T03:26:05.382Z",
     "updatedAt": "2024-12-03T03:26:05.382Z",
     "__v": 0
@@ -72,7 +72,7 @@ import { requestShow } from '../utils'
     "_id": "674e7a4de81aed0009fecddb",
     "name": "测试路线",
     "status": true,
-    "creator": "6678e31ff340dfdecd9e1a28",
+    "creator": "11111111-1111-4111-8111-111111111111",
     "createdAt": "2024-12-03T03:26:05.382Z",
     "updatedAt": "2024-12-03T03:26:05.382Z",
     "__v": 0
@@ -160,4 +160,3 @@ export default {
   deleteMany,
   getOne
 }
-

package/api/maintenancePlan.js

@@ -20,7 +20,7 @@ import { requestShow } from '../utils'
  * @property {Date} endTime - 结束时间
  * @property {Date} [planFinishTime] - 计划完成时间
  * @property {string} remark - 备注
- * @property {string} creator - 创建者
+ * @property {string} creator - 创建者 UUID
  * @property {Date} createdAt - 创建日期
  * @property {Date} updatedAt - 更新日期
  * @example
@@ -32,7 +32,7 @@ import { requestShow } from '../utils'
  *   "startTime": "2024-11-29T02:07:02.042Z",
  *   "endTime": "2024-11-29T12:07:02.042Z",
  *   "remark": "定期维保",
- *   "creator": "6678e31ff340dfdecd9e1a28",
+ *   "creator": "11111111-1111-4111-8111-111111111111",
  *   "createdAt": "2024-11-29T02:07:02.042Z",
  *   "updatedAt": "2024-11-29T02:07:02.042Z"
  * }
@@ -145,7 +145,7 @@ export function deleteMany(ids) {
  * @param {Object} query - 查询参数
  * @param {number} query.year - 统计年份，例如 2026
  * @param {number} [query.month] - 统计月份，1-12；不传表示查询整年
- * @param {string} [query.creator] - 创建者
+ * @param {string} [query.creator] - 创建者 UUID
  * @returns {number} code - 返回码，0表示成功
  * @returns {Object} data - 统计结果
  */
@@ -162,7 +162,7 @@ export function analysisStatistics(query) {
  * @param {Object} query - 查询参数
  * @param {number} query.year - 统计年份，例如 2026
  * @param {number} [query.month] - 统计月份，1-12；不传表示查询整年
- * @param {string} [query.creator] - 创建者
+ * @param {string} [query.creator] - 创建者 UUID
  * @returns {number} code - 返回码，0表示成功
  * @returns {Object} data - 分析结果
  * @returns {Object} data.summary - 汇总覆盖情况
@@ -181,7 +181,7 @@ export function coverageAnalysis(query) {
  * @param {Object} query - 查询参数
  * @param {number} query.year - 统计年份，例如 2026
  * @param {number} [query.month] - 统计月份，1-12；不传表示查询整年
- * @param {string} [query.creator] - 创建者
+ * @param {string} [query.creator] - 创建者 UUID
  * @returns {number} code - 返回码，0表示成功
  * @returns {Object} data - 趋势统计结果
  */
@@ -198,7 +198,7 @@ export function completionStatistics(query) {
  * @param {Object} query - 查询参数
  * @param {number} query.year - 统计年份，例如 2026
  * @param {number} [query.month] - 统计月份，1-12；不传表示查询整年
- * @param {string} [query.creator] - 创建者
+ * @param {string} [query.creator] - 创建者 UUID
  * @returns {number} code - 返回码，0表示成功
  * @returns {Object} data - 风险趋势结果
  */

package/api/maintenanceRecord.js

@@ -26,7 +26,7 @@ import { requestShow } from '../utils'
  * @property {number} processingTime - 处理时间时间戳
  * @property {number} disposalDuration - 处置时长
  * @property {number} noticeWay - 通知方式
- * @property {string} creator - 创建者
+ * @property {string} creator - 创建者 UUID
  * @property {string} recall - 唯一码
  * @property {number} type - 类型
  * @property {Date} createdAt - 创建时间
@@ -45,7 +45,7 @@ import { requestShow } from '../utils'
  *   "processingResult": 3,
  *   "disposalDuration": 0,
  *   "noticeWay": 3,
- *   "creator": "67cfbf6d2b4b3f0009e4a003",
+ *   "creator": "11111111-1111-4111-8111-111111111111",
  *   "recall": "maintenance-test-001",
  *   "type": 3,
  *   "createdAt": "2026-03-11T00:00:00.000Z",

package/api/reservation.js

@@ -1,4 +1,67 @@
+import urlcfg from '../config/urlcfg'
 import { requestShow } from '../utils'
+
+function isPlainObject(value) {
+  return Object.prototype.toString.call(value) === '[object Object]'
+}
+
+function mapReservationRequestFields(value) {
+  if (!urlcfg.isV2() || !isPlainObject(value)) {
+    return value
+  }
+
+  const next = { ...value }
+  if (next.space === undefined && Object.prototype.hasOwnProperty.call(next, 'area')) {
+    next.space = next.area
+  }
+  if (next.hierarchy === undefined && Object.prototype.hasOwnProperty.call(next, 'depart')) {
+    next.hierarchy = next.depart
+  }
+  delete next.area
+  delete next.depart
+  return next
+}
+
+function mapReservationEntity(entity) {
+  if (!urlcfg.isV2() || !isPlainObject(entity)) {
+    return entity
+  }
+
+  return {
+    ...entity,
+    area: entity.area !== undefined ? entity.area : entity.space,
+    depart: entity.depart !== undefined ? entity.depart : entity.hierarchy
+  }
+}
+
+function mapReservationResponse(response) {
+  if (!urlcfg.isV2() || !isPlainObject(response)) {
+    return response
+  }
+
+  if (Array.isArray(response.rows)) {
+    return {
+      ...response,
+      rows: response.rows.map(mapReservationEntity)
+    }
+  }
+
+  if (response.data !== undefined) {
+    return {
+      ...response,
+      data: Array.isArray(response.data)
+        ? response.data.map(mapReservationEntity)
+        : mapReservationEntity(response.data)
+    }
+  }
+
+  return mapReservationEntity(response)
+}
+
+async function requestReservation(config) {
+  const response = await requestShow(config)
+  return mapReservationResponse(response)
+}
 /**
  * @file 预约记录api
  * @module 预约记录接口
@@ -12,32 +75,34 @@ import { requestShow } from '../utils'
 
 /**
  * @typedef {Object} Reservation - 预约记录
- * @property {string} _id - 预约记录id
+ * @property {string} _id - 预约记录 UUID
  * @property {string} reserverName - 预约人名称
  * @property {Date} startTime - 开始时间
  * @property {Date} endTime - 结束时间
- * @property {string} area - 空间（关联到Area模型）
- * @property {string} depart - 层级（关联到Depart模型）
+ * @property {string} space - 空间 UUID，引用外部配置服务空间
+ * @property {string} hierarchy - 层级 UUID，引用外部配置服务层级
+ * @property {string} [area] - v2 SDK 兼容字段，映射自 space
+ * @property {string} [depart] - v2 SDK 兼容字段，映射自 hierarchy
  * @property {string} originalRemark - 预约备注
  * @property {string} approverRemark - 审批备注
  * @property {string} approver - 审批人
  * @property {Date} approveTime - 审批时间
  * @property {number} approveStatus - 审批状态（0-待审批，1-已批准，2-已拒绝）
- * @property {string} creator - 创建者
+ * @property {string} creator - 创建者 UUID
  * @example
  * {
-    "_id": "67073bfe463d6e00099becee",
+    "_id": "11111111-1111-4111-8111-111111111111",
     "reserverName": "张三",
     "startTime": "2025-03-07T08:00:00.000Z",
     "endTime": "2025-03-07T10:00:00.000Z",
-    "area": "67073bfe463d6e00099becdd",
-    "depart": "667d2ecc52d21700095b58b4",
+    "space": "22222222-2222-4222-8222-222222222222",
+    "hierarchy": "55555555-5555-4555-8555-555555555555",
     "originalRemark": "项目讨论会议",
     "approverRemark": "审批备注",
     "approver": "李四",
     "approveTime": "2025-03-06T10:00:00.000Z",
     "approveStatus": 1,
-    "creator": "667d2ecc52d21700095b58b5",
+    "creator": "33333333-3333-4333-8333-333333333333",
     "createdAt": "2025-03-06T09:00:00.000Z",
     "updatedAt": "2025-03-06T10:00:00.000Z"
  }
@@ -49,8 +114,10 @@ import { requestShow } from '../utils'
  * @param {Object} query - 请求对象
  * @param {number} query.page - 页码
  * @param {number} query.limit - 每页数量
- * @param {string} [query.area] - 按空间筛选
- * @param {string} [query.depart] - 按层级筛选
+ * @param {string} [query.space] - 按空间 UUID 筛选
+ * @param {string} [query.hierarchy] - 按层级 UUID 筛选
+ * @param {string} [query.area] - v2 兼容别名，发送时映射为 space
+ * @param {string} [query.depart] - v2 兼容别名，发送时映射为 hierarchy
  * @param {number} [query.approveStatus] - 按审批状态筛选
  * @param {string} [query.startDate] - 开始日期筛选
  * @param {string} [query.endDate] - 结束日期筛选
@@ -58,7 +125,7 @@ import { requestShow } from '../utils'
  * {
  *    "page": 1,
  *    "limit": 10,
- *    "area": "67073bfe463d6e00099becdd",
+ *    "space": "22222222-2222-4222-8222-222222222222",
  *    "approveStatus": 1
  * }
  * @returns {number} code - 返回码，0表示成功
@@ -73,10 +140,10 @@ import { requestShow } from '../utils'
  }
  */
 export function list(query) {
-  return requestShow({
+  return requestReservation({
     url: '/reservations',
     method: 'get',
-    params: query
+    params: mapReservationRequestFields(query)
   })
 }
 
@@ -87,10 +154,10 @@ export function list(query) {
  * @returns {string} data - 新增成功的数据 见表结构reservation定义
  */
 export function create(data) {
-  return requestShow({
+  return requestReservation({
     url: '/reservations',
     method: 'post',
-    data
+    data: mapReservationRequestFields(data)
   })
 }
 
@@ -101,7 +168,7 @@ export function create(data) {
  * @returns {Object} data - 预约记录对象 见表结构reservation定义
  */
 export function getOne(id) {
-  return requestShow({
+  return requestReservation({
     url: `/reservations/${id}`,
     method: 'get'
   })
@@ -114,10 +181,10 @@ export function getOne(id) {
  * @returns {string} data - 修改成功的数据 见表结构reservation定义
  */
 export function updateOne(data) {
-  return requestShow({
+  return requestReservation({
     url: `/reservations/${data._id}`,
     method: 'put',
-    data
+    data: mapReservationRequestFields(data)
   })
 }
 
@@ -128,7 +195,7 @@ export function updateOne(data) {
  * @returns {string} data - 删除成功的数据 见表结构reservation定义
  */
 export function deleteOne(id) {
-  return requestShow({
+  return requestReservation({
     url: `/reservations/${id}`,
     method: 'delete'
   })
@@ -140,7 +207,7 @@ export function deleteOne(id) {
  * @returns {number} code - 返回码，0表示成功
  */
 export function deleteMany(ids) {
-  return requestShow({
+  return requestReservation({
     url: '/reservations',
     method: 'delete',
     data: ids // delete传递主体要包含在data里
@@ -151,14 +218,15 @@ export function deleteMany(ids) {
 /**
  * 查询当前时间下特定层级的预约记录及关联设备
  * @param {Object} query - 查询选项
- * @param {string} query.depart - 层级ID
+ * @param {string} query.hierarchy - 层级 UUID
+ * @param {string} [query.depart] - v2 兼容别名，发送时映射为 hierarchy
  * @returns {Object} result - 返回结果
  * @returns {number} result.code - 返回码，0表示成功
  * @returns {Array} result.rows - 预约记录数组，每个记录包含关联设备
  * @example
  * // 请求示例
  * {
- *   "depart": "667d2ecc52d21700095b58b4"
+ *   "hierarchy": "55555555-5555-4555-8555-555555555555"
  * }
  * 
  * // 返回示例
@@ -167,26 +235,26 @@ export function deleteMany(ids) {
  *   "rows": [
  *     {
  *       // 预约记录信息，见表结构reservation定义
- *       "_id": "67073bfe463d6e00099becee",
+ *       "_id": "11111111-1111-4111-8111-111111111111",
  *       "reserverName": "张三",
  *       "startTime": "2025-03-07T08:00:00.000Z",
  *       "endTime": "2025-03-07T10:00:00.000Z",
- *       "area": "67073bfe463d6e00099becdd",
- *       "depart": "667d2ecc52d21700095b58b4",
+ *       "space": "22222222-2222-4222-8222-222222222222",
+ *       "hierarchy": "55555555-5555-4555-8555-555555555555",
  *       "remark": "项目讨论会议",
  *       "approveStatus": 1,
- *       "creator": "667d2ecc52d21700095b58b5",
+ *       "creator": "33333333-3333-4333-8333-333333333333",
  *       // 关联区域列表
  *       "areas": [{
- *         "_id": "67073bfe463d6e00099becdd",
+ *         "_id": "22222222-2222-4222-8222-222222222222",
  *         "name": "会议室"
  *       }],
  *       // 关联设备列表
  *       "devices": [
  *         {
- *           "_id": "67073c1e463d6e00099becef",
+ *           "_id": "44444444-4444-4444-8444-444444444444",
  *           "name": "会议室投影仪",
- *           "area": "67073bfe463d6e00099becdd",
+ *           "area": "22222222-2222-4222-8222-222222222222",
  *           "status": 1
  *           // 其他设备属性
  *         }
@@ -196,10 +264,13 @@ export function deleteMany(ids) {
  * }
  */
 export function getReservationsByDepart(query) {
-  return requestShow({
-    url: `/reservations/current/${query.depart}`,
+  const source = query || {}
+  const params = mapReservationRequestFields(source)
+  const hierarchy = params.hierarchy || params.depart || source.hierarchyId || source.departId
+  return requestReservation({
+    url: `/reservations/current/${hierarchy}`,
     method: 'get',
-    params: query
+    params
   })
 }
 

package/api/reservation.test.js

@@ -0,0 +1,94 @@
+jest.mock('../utils', () => ({
+  requestShow: jest.fn()
+}))
+
+const urlcfg = require('../config/urlcfg').default
+const { requestShow } = require('../utils')
+const reservation = require('./reservation').default
+
+describe('reservation api v2 field compatibility', () => {
+  const originalVersion = urlcfg.version
+
+  afterEach(() => {
+    urlcfg.version = originalVersion
+    jest.clearAllMocks()
+  })
+
+  test('keeps legacy area/depart payload in v1', async () => {
+    const query = {
+      area: 'space-legacy',
+      depart: 'hierarchy-legacy'
+    }
+    requestShow.mockResolvedValue({ code: 0, rows: [] })
+
+    await reservation.list(query)
+
+    expect(requestShow).toHaveBeenCalledWith({
+      url: '/reservations',
+      method: 'get',
+      params: query
+    })
+  })
+
+  test('maps legacy area/depart request fields to space/hierarchy in v2', async () => {
+    urlcfg.version = 'v2'
+    const data = {
+      _id: 'reservation-1',
+      area: '22222222-2222-4222-8222-222222222222',
+      depart: '55555555-5555-4555-8555-555555555555',
+      approveStatus: 1
+    }
+    requestShow.mockResolvedValue({ code: 0, data: {} })
+
+    await reservation.updateOne(data)
+
+    expect(requestShow).toHaveBeenCalledWith({
+      url: '/reservations/reservation-1',
+      method: 'put',
+      data: {
+        _id: 'reservation-1',
+        space: '22222222-2222-4222-8222-222222222222',
+        hierarchy: '55555555-5555-4555-8555-555555555555',
+        approveStatus: 1
+      }
+    })
+  })
+
+  test('maps v2 response space/hierarchy back to legacy aliases', async () => {
+    urlcfg.version = 'v2'
+    requestShow.mockResolvedValue({
+      code: 0,
+      rows: [{
+        id: 'reservation-1',
+        space: '22222222-2222-4222-8222-222222222222',
+        hierarchy: '55555555-5555-4555-8555-555555555555'
+      }]
+    })
+
+    const response = await reservation.list({})
+
+    expect(response.rows[0]).toEqual(expect.objectContaining({
+      space: '22222222-2222-4222-8222-222222222222',
+      hierarchy: '55555555-5555-4555-8555-555555555555',
+      area: '22222222-2222-4222-8222-222222222222',
+      depart: '55555555-5555-4555-8555-555555555555'
+    }))
+  })
+
+  test('uses hierarchy for current reservation endpoint in v2', async () => {
+    urlcfg.version = 'v2'
+    requestShow.mockResolvedValue({ code: 0, rows: [] })
+
+    await reservation.getReservationsByDepart({
+      depart: '55555555-5555-4555-8555-555555555555'
+    })
+
+    expect(requestShow).toHaveBeenCalledWith({
+      url: '/reservations/current/55555555-5555-4555-8555-555555555555',
+      method: 'get',
+      params: {
+        hierarchy: '55555555-5555-4555-8555-555555555555'
+      }
+    })
+  })
+})

package/api/scadaProject.js

@@ -12,7 +12,7 @@ import { requestShow } from '../utils'
  * @property {string} description - 项目描述
  * @property {Object} canvas - 画布配置
  * @property {Array} elements - 元素列表
- * @property {string} creator - 创建者id
+ * @property {string} creator - 创建者 UUID
  * @property {string} createdAt - 创建时间
  * @property {string} updatedAt - 更新时间
  * @example
@@ -22,7 +22,7 @@ import { requestShow } from '../utils'
     "description": "这是一个测试项目",
     "canvas": { "width": 1920, "height": 1080, "backgroundColor": "#ffffff" },
     "elements": [ { "type": "text", "content": "Hello World" } ],
-    "creator": "64af6ad2f432a57cb0b68bc4",
+    "creator": "11111111-1111-4111-8111-111111111111",
     "createdAt": "2024-06-18T04:20:57.811Z",
     "updatedAt": "2024-06-18T04:20:57.811Z"
  * }
@@ -119,4 +119,4 @@ export default {
   deleteOne,
   deleteMany,
   getOne
-} 
+}

package/api/sensor.js

@@ -16,7 +16,7 @@ import { requestShow } from '../utils'
  * @property {Object} device - 关联设备信息
  * @property {number} state - 状态
  * @property {string} stateDescription - 状态说明
- * @property {string} creator - 创建者ID
+ * @property {string} creator - 创建者 UUID
  * @property {Array} svgCoordinates - svg坐标
  * @property {string} depart - 层级ID
  * @property {Date} createdAt - 创建时间
@@ -34,7 +34,7 @@ import { requestShow } from '../utils'
  *   },
  *   "state": 1,
  *   "stateDescription": "正常",
- *   "creator": "6678e31ff340dfdecd9e1a28",
+ *   "creator": "11111111-1111-4111-8111-111111111111",
  *   "svgCoordinates": [],
  *   "depart": "674e7a4de81aed0009fecddb",
  *   "createdAt": "2024-12-03T03:26:05.382Z",
@@ -178,4 +178,4 @@ export default {
     deleteOne,
     deleteMany,
     importExcel
-} 
+}

package/api/sensorStatusConfig.js

@@ -16,7 +16,7 @@ import { requestShow } from '../utils'
  * @property {string} type - 传感器类型
  * @property {Array<string>} range - 维保状态区间
  * @property {string} remark - 备注
- * @property {string} creator - 创建者
+ * @property {string} creator - 创建者 UUID
  * @property {Date} createdAt - 创建时间
  * @property {Date} updatedAt - 更新时间
  * @example
@@ -25,7 +25,7 @@ import { requestShow } from '../utils'
  *   "type": "温度",
  *   "range": ["正常", "预警", "报警"],
  *   "remark": "默认区间",
- *   "creator": "66f000000000000000000002",
+ *   "creator": "11111111-1111-4111-8111-111111111111",
  *   "createdAt": "2026-03-11T00:00:00.000Z",
  *   "updatedAt": "2026-03-11T00:00:00.000Z"
  * }

package/api/workSchedule.js

@@ -20,21 +20,28 @@ import { requestShow } from '../utils'
 
 /**
  * @typedef {Object} WorkSchedule - 排班表
- * @property {string} _id - 排班表id
- * @property {string|Object} user - 关联用户
+ * @property {string} _id - 排班表 UUID
+ * @property {string|Object} user - 关联用户 UUID
+ * @property {Array<string|Object>} users - 关联用户 UUID 数组
+ * @property {string|null} [space] - 关联空间 UUID，引用外部配置服务空间
  * @property {number} year - 年份
  * @property {number} month - 月份，1-12
  * @property {number} shiftType - 默认班次类型，1 早班，2 中班，3 晚班（当天结束后跨到次日 00:00-08:00）
  * @property {Array<WorkScheduleDetail>} scheduleDetails - 每日排班明细
  * @property {number} status - 状态，0 草稿，1 已发布
  * @property {string} [remark] - 备注
- * @property {string} [creator] - 创建者
+ * @property {string} [creator] - 创建者 UUID
  * @property {Date} createdAt - 创建时间
  * @property {Date} updatedAt - 更新时间
  * @example
  * {
- *   "_id": "67f8f0000000000000000101",
- *   "user": "67f8f0000000000000000002",
+ *   "_id": "11111111-1111-4111-8111-111111111111",
+ *   "user": "22222222-2222-4222-8222-222222222222",
+ *   "users": [
+ *     "22222222-2222-4222-8222-222222222222",
+ *     "33333333-3333-4333-8333-333333333333"
+ *   ],
+ *   "space": "44444444-4444-4444-8444-444444444444",
  *   "year": 2026,
  *   "month": 3,
  *   "shiftType": 1,
@@ -43,7 +50,7 @@ import { requestShow } from '../utils'
  *       "day": 8,
  *       "shiftType": 2,
  *       "isRestDay": false,
- *       "attendanceRecord": "67f8f0000000000000000201"
+ *       "attendanceRecord": "55555555-5555-4555-8555-555555555555"
  *     },
  *     {
  *       "day": 16,
@@ -52,7 +59,7 @@ import { requestShow } from '../utils'
  *   ],
  *   "status": 1,
  *   "remark": "三月排班",
- *   "creator": "67f8f0000000000000000003",
+ *   "creator": "66666666-6666-4666-8666-666666666666",
  *   "createdAt": "2026-03-01T00:00:00.000Z",
  *   "updatedAt": "2026-03-20T00:00:00.000Z"
  * }
@@ -65,7 +72,8 @@ import { requestShow } from '../utils'
  * @param {number} [query.limit] - 每页数量
  * @param {string} [query.label] - 模糊查询字段
  * @param {string} [query.search] - 模糊查询值
- * @param {string} [query.user] - 用户id
+ * @param {string} [query.user] - 用户 UUID
+ * @param {string} [query.space] - 空间 UUID
  * @param {number} [query.year] - 年份
  * @param {number} [query.month] - 月份
  * @param {number} [query.shiftType] - 默认班次类型
@@ -86,7 +94,9 @@ export function list(query) {
 /**
  * 新增排班表
  * @param {Object} data - 请求体
- * @param {string} data.user - 用户id
+ * @param {string|Object} data.user - 用户 UUID，支持传入 UUID 字符串或包含 id/_id 的对象
+ * @param {Array<string|Object>} [data.users] - 用户 UUID 数组，支持传入 UUID 字符串或包含 id/_id 的对象数组
+ * @param {string|Object|null} [data.space] - 空间 UUID，引用外部配置服务空间，支持传入 UUID 字符串或包含 id/_id 的对象
  * @param {number} data.year - 年份
  * @param {number} data.month - 月份，1-12
  * @param {number} data.shiftType - 默认班次类型，1 早班，2 中班，3 晚班（当天结束后跨到次日 00:00-08:00）
@@ -120,8 +130,10 @@ export function getOne(id) {
 /**
  * 编辑排班表
  * @param {Object} data - 修改数据对象
- * @param {string} data._id - 排班表id
- * @param {string} [data.user] - 用户id
+ * @param {string} data._id - 排班表 UUID
+ * @param {string|Object} [data.user] - 用户 UUID，支持传入 UUID 字符串或包含 id/_id 的对象
+ * @param {Array<string|Object>} [data.users] - 用户 UUID 数组，支持传入 UUID 字符串或包含 id/_id 的对象数组
+ * @param {string|Object|null} [data.space] - 空间 UUID，引用外部配置服务空间，支持传入 UUID 字符串或包含 id/_id 的对象
  * @param {number} [data.year] - 年份
  * @param {number} [data.month] - 月份，1-12
  * @param {number} [data.shiftType] - 默认班次类型，1 早班，2 中班，3 晚班（当天结束后跨到次日 00:00-08:00）

package/package.json

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