From 6e1095e946997e406926c204ceeb5c820dbd07c1 Mon Sep 17 00:00:00 2001
From: Riku <risaku@163.com>
Date: 星期二, 13 八月 2024 23:51:47 +0800
Subject: [PATCH] 1. 修复文件扩展名获取错误问题 2. 调试完善设备信息相关接口
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DeviceServiceImpl.kt | 11 ++++++-----
1 files changed, 6 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..619c65d 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
@@ -34,17 +34,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 +69,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)
--
Gitblit v1.9.3