From 6c1e7c5ac983301c34f003415cda2ef7c7e176a6 Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期四, 09 一月 2025 17:34:11 +0800 Subject: [PATCH] 1. 新增卫星遥测网格4个顶点坐标计算逻辑 --- src/main/kotlin/com/flightfeather/uav/lightshare/service/impl/RealTimeDataServiceImpl.kt | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/main/kotlin/com/flightfeather/uav/lightshare/service/impl/RealTimeDataServiceImpl.kt b/src/main/kotlin/com/flightfeather/uav/lightshare/service/impl/RealTimeDataServiceImpl.kt index 057472d..4bf03aa 100644 --- a/src/main/kotlin/com/flightfeather/uav/lightshare/service/impl/RealTimeDataServiceImpl.kt +++ b/src/main/kotlin/com/flightfeather/uav/lightshare/service/impl/RealTimeDataServiceImpl.kt @@ -57,6 +57,7 @@ private val fileExchange = FileExchange() override fun getSecondData( + deviceType: String?, deviceCode: String?, startTime: String?, endTime: String?, @@ -73,7 +74,12 @@ var pages = 0 val result = mutableListOf<DataVo>() - when (UWDeviceType.getType(deviceCode)) { + val _deviceType = if (deviceType != null) { + UWDeviceType.fromValue(deviceType) + } else { + UWDeviceType.getType(deviceCode) + } + when (_deviceType) { UWDeviceType.VEHICLE -> { val pageInfo = PageHelper.startPage<RealTimeDataVehicle>(_page, _perPage) realTimeDataVehicleMapper.selectByExample(Example(RealTimeDataVehicle::class.java).apply { -- Gitblit v1.9.3