From 52a0c16de9b0955a5f092560b73f16e41684f97b Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 31 十二月 2024 10:13:35 +0800
Subject: [PATCH] 1. 环信码生成时，如果在线场景当期没有评估（未巡查）结果，则延用历史最新一次的结果； 2. 新增跨时间跨月度的历史整改记录查询逻辑 3. 优化获取顶层任务和日任务的获取逻辑
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/DeviceService.kt | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/DeviceService.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/DeviceService.kt
index 39bfb91..096e42a 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/DeviceService.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/DeviceService.kt
@@ -1,24 +1,39 @@
package cn.flightfeather.supervision.lightshare.service
-import cn.flightfeather.supervision.domain.ds1.entity.DeviceInfo
-import cn.flightfeather.supervision.domain.ds1.entity.DeviceLocation
+import cn.flightfeather.supervision.common.utils.Constant
+import cn.flightfeather.supervision.domain.ds1.entity.BaseDevice
+import cn.flightfeather.supervision.domain.ds1.entity.DeviceStatus
+import cn.flightfeather.supervision.lightshare.vo.AreaVo
+import cn.flightfeather.supervision.lightshare.vo.DataHead
+import cn.flightfeather.supervision.lightshare.vo.MonitorDeviceInfoVo
+import io.swagger.annotations.ApiParam
+import org.springframework.web.bind.annotation.RequestParam
import org.springframework.web.multipart.MultipartFile
interface DeviceService {
- fun findDevices(sceneId: String): List<DeviceInfo>
+ /**
+ * 鏌ヨ鍦烘櫙璁惧
+ * @param sceneId 鍦烘櫙id
+ * @param deviceType 璁惧绫诲瀷
+ * @return 璁惧淇℃伅
+ */
+ fun findDevices(sceneId: String, deviceType: Constant.DeviceType): List<BaseDevice>
/**
* 鏂板璁惧淇℃伅
*/
- fun insertDevice(deviceInfo: DeviceInfo): Int
+ fun insertDevice(deviceInfo: String, deviceType: Constant.DeviceType): Int
/**
* 鏇存柊璁惧淇℃伅
*/
- fun updateDevice(deviceInfo: DeviceInfo): Int
+ fun updateDevice(deviceInfo: String, deviceType: Constant.DeviceType): Int
- fun findDeviceLocations(deviceId: Int): List<DeviceLocation>
+ /**
+ * 鏌ヨ璁惧鐘舵�佸彉鏇翠俊鎭�
+ */
+ fun findDeviceLocations(sceneId: String?, deviceId: Int, deviceType: Constant.DeviceType): List<DeviceStatus>
/**
*鏂板璁惧浣嶇疆鍙樻洿淇℃伅
@@ -29,4 +44,8 @@
*鏇存柊璁惧鍙婂浘鐗�
*/
fun updateDeviceLocation(deviceLocation: String, deleteImg: List<String>, files: Array<MultipartFile>): Int
+
+ fun searchExternalDevice(
+ areaVo: AreaVo, keyword: String, page: Int?, perPage: Int?,
+ ): Pair<DataHead, MonitorDeviceInfoVo>
}
\ No newline at end of file
--
Gitblit v1.9.3