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/vo/DeviceMapVo.kt | 43 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 43 insertions(+), 0 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/DeviceMapVo.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/DeviceMapVo.kt
index 888981f..7c04dde 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/DeviceMapVo.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/DeviceMapVo.kt
@@ -10,6 +10,7 @@
* 鐩戞祴璁惧鍜岄缇界洃绠＄郴缁熴�侀缇界幆澧冪郴缁熺敤鎴风殑鍖归厤鍏崇郴
*/
class DeviceMapVo {
+ var id: Int? = null
// 鐩戞祴璁惧id
var deviceCode:String?=null
// 鐩戞祴璁惧鎴栫珯鐐瑰悕绉�
@@ -31,6 +32,7 @@
list.forEach {
it ?: return@forEach
res.add(DeviceMapVo().apply {
+ id = it.id
deviceCode = it.jaMnCode
deviceName = it.jaSceneName
svUserId = it.svUserId
@@ -43,11 +45,25 @@
return res
}
+ fun toJADustSiteMap(deviceMapVo: DeviceMapVo?): DustSiteMap {
+ return DustSiteMap().apply {
+ id = deviceMapVo?.id
+ jaMnCode = deviceMapVo?.deviceCode
+ jaSceneName = deviceMapVo?.deviceName
+ svUserId = deviceMapVo?.svUserId
+ svUserName = deviceMapVo?.svUserName
+ tzUserId = deviceMapVo?.tzUserId
+ tzUserName = deviceMapVo?.tzUserName
+ createTime = deviceMapVo?.createTime
+ }
+ }
+
fun fromJSDustSiteMap(list: List<JSDustSiteMap?>): List<DeviceMapVo> {
val res = mutableListOf<DeviceMapVo>()
list.forEach {
it ?: return@forEach
res.add(DeviceMapVo().apply {
+ id = it.id
deviceCode = it.jsDeviceCode
deviceName = it.jsDeviceName
svUserId = it.svUserId
@@ -60,11 +76,25 @@
return res
}
+ fun toJSDustSiteMap(deviceMapVo: DeviceMapVo?): JSDustSiteMap {
+ return JSDustSiteMap().apply {
+ id = deviceMapVo?.id
+ jsDeviceCode = deviceMapVo?.deviceCode
+ jsDeviceName = deviceMapVo?.deviceName
+ svUserId = deviceMapVo?.svUserId
+ svUserName = deviceMapVo?.svUserName
+ tzUserId = deviceMapVo?.tzUserId
+ tzUserName = deviceMapVo?.tzUserName
+ createTime = deviceMapVo?.createTime
+ }
+ }
+
fun fromXHFumeSiteMap(list: List<FumeSiteMap?>): List<DeviceMapVo> {
val res = mutableListOf<DeviceMapVo>()
list.forEach {
it ?: return@forEach
res.add(DeviceMapVo().apply {
+ id = it.id
deviceCode = it.xhDeviceCode
deviceName = it.xhDeviceName
svUserId = it.svUserId
@@ -76,6 +106,19 @@
}
return res
}
+
+ fun toXHFumeSiteMap(deviceMapVo: DeviceMapVo?): FumeSiteMap {
+ return FumeSiteMap().apply {
+ id = deviceMapVo?.id
+ xhDeviceCode = deviceMapVo?.deviceCode
+ xhDeviceName = deviceMapVo?.deviceName
+ svUserId = deviceMapVo?.svUserId
+ svUserName = deviceMapVo?.svUserName
+ tzUserId = deviceMapVo?.tzUserId
+ tzUserName = deviceMapVo?.tzUserName
+ createTime = deviceMapVo?.createTime
+ }
+ }
}
}
--
Gitblit v1.9.3