From 0c59552dc14c9023d4c0a9d57509cce1d5a6d6da Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 31 十二月 2024 10:07:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'supervision/hc-socket-1129'
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/UserMapService.kt | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/UserMapService.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/UserMapService.kt
index a1c810c..1d418bb 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/UserMapService.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/UserMapService.kt
@@ -1,5 +1,7 @@
package cn.flightfeather.supervision.lightshare.service
+import cn.flightfeather.supervision.domain.ds1.entity.Scense
+import cn.flightfeather.supervision.domain.ds1.entity.Userinfo
import cn.flightfeather.supervision.domain.ds2.entity.UserMap
import cn.flightfeather.supervision.lightshare.vo.AreaVo
import cn.flightfeather.supervision.lightshare.vo.DeviceMapVo
@@ -11,7 +13,12 @@
*/
fun getTZIdBySceneId(sceneId: String): UserMap
- fun autoCreateMap()
+ /**
+ * 鏍规嵁椋炵窘鐜绯荤粺涓殑鍦烘櫙id锛岃幏鍙栦笌椋炵窘鐩戠绯荤粺涓殑鍏宠仈鐢ㄦ埛
+ */
+ fun getSceneByTZId(tzUserId: String): Scense?
- fun fetchDeviceMap(areaVo: AreaVo): List<DeviceMapVo?>
+ fun autoCreateMap(userList: List<Userinfo?>)
+
+ fun fetchDeviceMap(page: Int?, perPage: Int?, areaVo: AreaVo): List<DeviceMapVo?>
}
\ No newline at end of file
--
Gitblit v1.9.3