From b8cc591541b88dd2bb93f111f8e8075842dce7ca Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期二, 13 八月 2024 17:21:06 +0800 Subject: [PATCH] 1. 新增设备信息相关功能 2. 修正自评估中数据自动评分的部分逻辑 --- src/main/kotlin/cn/flightfeather/supervision/lightshare/service/DeviceService.kt | 22 ++++++++++++++++------ 1 files changed, 16 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..fceaf90 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,34 @@ 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 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> /** *鏂板璁惧浣嶇疆鍙樻洿淇℃伅 -- Gitblit v1.9.3