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/domain/ds1/repository/DeviceRep.kt | 119 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 90 insertions(+), 29 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/repository/DeviceRep.kt b/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/repository/DeviceRep.kt
index 46fdfe1..c43bd1a 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/repository/DeviceRep.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/repository/DeviceRep.kt
@@ -1,10 +1,13 @@
package cn.flightfeather.supervision.domain.ds1.repository
-import cn.flightfeather.supervision.domain.ds1.entity.DeviceInfo
-import cn.flightfeather.supervision.domain.ds1.entity.DeviceLocation
-import cn.flightfeather.supervision.domain.ds1.mapper.DeviceInfoMapper
-import cn.flightfeather.supervision.domain.ds1.mapper.DeviceLocationMapper
+import cn.flightfeather.supervision.common.utils.Constant
+import cn.flightfeather.supervision.domain.ds1.entity.*
+import cn.flightfeather.supervision.domain.ds1.mapper.DeviceStatusMapper
+import cn.flightfeather.supervision.domain.ds1.mapper.MonitorDeviceInfoMapper
+import cn.flightfeather.supervision.domain.ds1.mapper.TreatmentDeviceInfoMapper
+import cn.flightfeather.supervision.domain.ds1.mapper.ProductionDeviceInfoMapper
import org.springframework.stereotype.Repository
+import java.util.*
/**
*
@@ -13,48 +16,106 @@
*/
@Repository
class DeviceRep(
- private val deviceInfoMapper: DeviceInfoMapper,
- private val deviceLocationMapper: DeviceLocationMapper,
+ private val monitorDeviceInfoMapper: MonitorDeviceInfoMapper,
+ private val treatmentDeviceInfoMapper: TreatmentDeviceInfoMapper,
+ private val productionDeviceInfoMapper: ProductionDeviceInfoMapper,
+ private val deviceStatusMapper: DeviceStatusMapper,
) {
/***--DeviceInfo--***/
- fun findDevice(sceneId: String): DeviceInfo? {
- return deviceInfoMapper.selectByPrimaryKey(sceneId)
+
+ /**
+ * 鏌ヨ璁惧淇℃伅
+ * @param deviceId 璁惧涓婚敭id
+ * @param type 璁惧绫诲瀷
+ * @return 璁惧淇℃伅
+ */
+ fun findDevice(deviceId: Int, type: Constant.DeviceType): BaseDevice? {
+ return when (type) {
+ Constant.DeviceType.MONITOR_DEVICE -> monitorDeviceInfoMapper.selectByPrimaryKey(deviceId)
+ Constant.DeviceType.TREATMENT_DEVICE -> treatmentDeviceInfoMapper.selectByPrimaryKey(deviceId)
+ Constant.DeviceType.PRODUCTION_DEVICE -> productionDeviceInfoMapper.selectByPrimaryKey(deviceId)
+ }
}
- fun findDeviceList(sceneId: String): List<DeviceInfo> {
- return findDeviceList(DeviceInfo().apply { diSceneGuid = sceneId })
+ /**
+ * 鏌ヨ璁惧淇℃伅
+ * @param sceneId 鍦烘櫙涓婚敭id
+ * @param type 璁惧绫诲瀷
+ * @return 璁惧淇℃伅
+ */
+ fun findDeviceList(sceneId: String, type: Constant.DeviceType): List<BaseDevice> {
+ return when (type) {
+ Constant.DeviceType.MONITOR_DEVICE -> findDeviceList(MonitorDeviceInfo().apply { diSceneGuid = sceneId })
+ Constant.DeviceType.TREATMENT_DEVICE -> findDeviceList(TreatmentDeviceInfo()
+ .apply { piSceneGuid = sceneId })
+ Constant.DeviceType.PRODUCTION_DEVICE -> findDeviceList(ProductionDeviceInfo()
+ .apply { wiSceneGuid = sceneId })
+ }
+ }
+ fun findDeviceList(monitorDeviceInfo: MonitorDeviceInfo): List<MonitorDeviceInfo> {
+ return monitorDeviceInfoMapper.select(monitorDeviceInfo)
+ }
+ fun findDeviceList(treatmentDeviceInfo: TreatmentDeviceInfo): List<TreatmentDeviceInfo> {
+ return treatmentDeviceInfoMapper.select(treatmentDeviceInfo)
+ }
+ fun findDeviceList(productionDeviceInfo: ProductionDeviceInfo): List<ProductionDeviceInfo> {
+ return productionDeviceInfoMapper.select(productionDeviceInfo)
}
- fun findDeviceList(deviceInfo: DeviceInfo): List<DeviceInfo> {
- return deviceInfoMapper.select(deviceInfo)
+ /**
+ * 鎻掑叆璁惧淇℃伅
+ */
+ fun insertDevice(monitorDeviceInfo: MonitorDeviceInfo): Int {
+ monitorDeviceInfo.diCreateTime = Date()
+ monitorDeviceInfo.diUpdateTime = Date()
+ return monitorDeviceInfoMapper.insert(monitorDeviceInfo)
+ }
+ fun insertDevice(treatmentDeviceInfo: TreatmentDeviceInfo): Int {
+ treatmentDeviceInfo.piCreateTime = Date()
+ treatmentDeviceInfo.piUpdateTime = Date()
+ return treatmentDeviceInfoMapper.insert(treatmentDeviceInfo)
+ }
+ fun insertDevice(productionDeviceInfo: ProductionDeviceInfo): Int {
+ productionDeviceInfo.wiCreateTime = Date()
+ productionDeviceInfo.wiUpdateTime = Date()
+ return productionDeviceInfoMapper.insert(productionDeviceInfo)
}
- fun insertDevice(deviceInfo: DeviceInfo): Int {
- return deviceInfoMapper.insert(deviceInfo)
+ /**
+ * 鏇存柊璁惧淇℃伅
+ */
+ fun updateDevice(monitorDeviceInfo: MonitorDeviceInfo): Int {
+ monitorDeviceInfo.diUpdateTime = Date()
+ return monitorDeviceInfoMapper.updateByPrimaryKey(monitorDeviceInfo)
+ }
+ fun updateDevice(treatmentDeviceInfo: TreatmentDeviceInfo): Int {
+ treatmentDeviceInfo.piUpdateTime = Date()
+ return treatmentDeviceInfoMapper.updateByPrimaryKey(treatmentDeviceInfo)
+ }
+ fun updateDevice(productionDeviceInfo: ProductionDeviceInfo): Int {
+ productionDeviceInfo.wiUpdateTime = Date()
+ return productionDeviceInfoMapper.updateByPrimaryKey(productionDeviceInfo)
}
- fun updateDevice(deviceInfo: DeviceInfo): Int {
- return deviceInfoMapper.updateByPrimaryKey(deviceInfo)
+ /***--DeviceStatus--***/
+ fun findStatus(id: Int): DeviceStatus? {
+ return deviceStatusMapper.selectByPrimaryKey(id)
}
- /***--DeviceLocation--***/
- fun findLocation(id: Int): DeviceLocation? {
- return deviceLocationMapper.selectByPrimaryKey(id)
+ fun findStatuses(deviceId: Int): List<DeviceStatus> {
+ return findStatuses(DeviceStatus()
+ .apply { dlDeviceId = deviceId })
}
- fun findLocations(deviceId: Int): List<DeviceLocation> {
- return findLocations(DeviceLocation().apply { dlDeviceId = deviceId })
+ fun findStatuses(location: DeviceStatus): List<DeviceStatus> {
+ return deviceStatusMapper.select(location)
}
- fun findLocations(location: DeviceLocation): List<DeviceLocation> {
- return deviceLocationMapper.select(location)
+ fun insertStatus(location: DeviceStatus): Int {
+ return deviceStatusMapper.insert(location)
}
- fun insertLocation(location: DeviceLocation): Int {
- return deviceLocationMapper.insert(location)
- }
-
- fun updateLocation(location: DeviceLocation): Int {
- return deviceLocationMapper.updateByPrimaryKey(location)
+ fun updateStatus(location: DeviceStatus): Int {
+ return deviceStatusMapper.updateByPrimaryKey(location)
}
}
\ No newline at end of file
--
Gitblit v1.9.3