From 8a0a8adfbe53db564df7aaaf561a60be7d4d8dd0 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 26 九月 2024 17:52:24 +0800
Subject: [PATCH] 1. 新增监管系统中用户模糊搜索功能 2. 新增监测设备和用户的匹配关系搜索功能
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DeviceServiceImpl.kt | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DeviceServiceImpl.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DeviceServiceImpl.kt
index eac25dd..9dea773 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DeviceServiceImpl.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DeviceServiceImpl.kt
@@ -8,6 +8,9 @@
import cn.flightfeather.supervision.domain.ds1.entity.*
import cn.flightfeather.supervision.domain.ds1.repository.DeviceRep
import cn.flightfeather.supervision.lightshare.service.DeviceService
+import cn.flightfeather.supervision.lightshare.vo.AreaVo
+import cn.flightfeather.supervision.lightshare.vo.DataHead
+import cn.flightfeather.supervision.lightshare.vo.MonitorDeviceInfoVo
import com.google.gson.Gson
import org.springframework.beans.factory.annotation.Value
import org.springframework.stereotype.Service
@@ -34,17 +37,14 @@
return when (deviceType) {
Constant.DeviceType.MONITOR_DEVICE -> {
val info = Gson().fromJson(deviceInfo, MonitorDeviceInfo::class.java)
- info.diCreateTime = Date()
deviceRep.insertDevice(info)
}
Constant.DeviceType.TREATMENT_DEVICE -> {
val info = Gson().fromJson(deviceInfo, TreatmentDeviceInfo::class.java)
- info.piCreateTime = Date()
deviceRep.insertDevice(info)
}
Constant.DeviceType.PRODUCTION_DEVICE -> {
val info = Gson().fromJson(deviceInfo, ProductionDeviceInfo::class.java)
- info.wiCreateTime = Date()
deviceRep.insertDevice(info)
}
}
@@ -72,13 +72,17 @@
deviceId: Int,
deviceType: Constant.DeviceType,
): List<DeviceStatus> {
- return emptyList()
+ return deviceRep.findStatuses(DeviceStatus().apply {
+ dlDeviceId = deviceId
+ dlDeviceType = deviceType.value
+ dlSceneGuid = sceneId
+ })
}
override fun insertDeviceLocation(deviceLocation: String, files: Array<MultipartFile>): Int {
val obj = JsonUtil.gson.fromJson(deviceLocation, DeviceStatus::class.java)
val time = DateUtil.DateToString(obj.dlCreateTime, DateUtil.DateStyle.YYYY_MM_DD)
- val picPath = FileUtil.saveFiles(files, imgPath, "device/${obj.dlId}/${time}")
+ val picPath = FileUtil.saveFiles(files, imgPath, "device/${obj.dlSceneGuid}/${obj.dlDeviceId}/${time}")
obj.dlPicUrl = picPath.joinToString(";")
obj.dlCreateTime = Date()
return deviceRep.insertStatus(obj)
@@ -111,4 +115,10 @@
obj.dlPicUrl = oldImg.joinToString(";")
return deviceRep.updateStatus(obj)
}
+
+ override fun searchExternalDevice(
+ areaVo: AreaVo, keyword: String, page: Int?, perPage: Int?,
+ ): Pair<DataHead, MonitorDeviceInfoVo> {
+ TODO("Not yet implemented")
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3