From baf2cc2ce3dfd1235c012a3750132769fcd9ad2f Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期四, 18 九月 2025 17:02:05 +0800 Subject: [PATCH] 2025.9.18 1. 联合前端调试数据产品接口(待完成) --- src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/DeviceMapVo.kt | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 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 23f9e6c..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,15 +32,30 @@ list.forEach { it ?: return@forEach res.add(DeviceMapVo().apply { + id = it.id deviceCode = it.jaMnCode deviceName = it.jaSceneName svUserId = it.svUserId svUserName = it.svUserName tzUserId = it.tzUserId tzUserName = it.tzUserName + createTime = it.createTime }) } 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> { @@ -47,15 +63,30 @@ list.forEach { it ?: return@forEach res.add(DeviceMapVo().apply { + id = it.id deviceCode = it.jsDeviceCode deviceName = it.jsDeviceName svUserId = it.svUserId svUserName = it.svUserName tzUserId = it.tzUserId tzUserName = it.tzUserName + createTime = it.createTime }) } 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> { @@ -63,16 +94,31 @@ list.forEach { it ?: return@forEach res.add(DeviceMapVo().apply { + id = it.id deviceCode = it.xhDeviceCode deviceName = it.xhDeviceName svUserId = it.svUserId svUserName = it.svUserName tzUserId = it.tzUserId tzUserName = it.tzUserName + createTime = it.createTime }) } 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