From dc4f12f66685260ac357997680e5f3fe723c3c4a Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期五, 12 九月 2025 17:22:40 +0800
Subject: [PATCH] 2025.9.12 1. 新增监测设备和巡查场景信息的匹配功能
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/UserMapService.kt | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 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 41d0c3d..7fd2799 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/UserMapService.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/UserMapService.kt
@@ -4,7 +4,9 @@
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.DataHead
import cn.flightfeather.supervision.lightshare.vo.DeviceMapVo
+import cn.flightfeather.supervision.lightshare.vo.DeviceSiteVo
interface UserMapService {
@@ -18,7 +20,23 @@
*/
fun getSceneByTZId(tzUserId: String): Scense?
+ /**
+ * 鑷姩鍒涘缓椋炵窘鐩戠鍜岄缇界幆澧冪殑璐︽埛鍖归厤璁板綍
+ */
fun autoCreateMap(userList: List<Userinfo?>)
- fun fetchDeviceMap(areaVo: AreaVo): List<DeviceMapVo?>
+ /**
+ * 鑾峰彇鐩戞祴璁惧鍜岀洃绠¤处鎴风殑鍖归厤璁板綍
+ */
+ fun fetchDeviceMap(page: Int?, perPage: Int?, areaVo: AreaVo): List<DeviceMapVo?>
+
+ /**
+ * 鏂板鎴栨洿鏂�
+ */
+ fun insertOrUpdate(param: Pair<AreaVo, DeviceMapVo>): Int
+
+ /**
+ * 鎼滅储绗笁鏂硅澶�
+ */
+ fun searchThirdPartyDevice(areaVo: AreaVo, keyword: String, page: Int?, perPage: Int?): Pair<DataHead, List<DeviceSiteVo>>
}
\ No newline at end of file
--
Gitblit v1.9.3