From 6d766eed50f34b102e607ea471f2ee565a8b9d30 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期五, 17 一月 2025 16:15:43 +0800
Subject: [PATCH] 1. 修改融合数据逻辑中，融合数据id数组为先排序后转换为字符串，修复同一批原始数据因为id排序不一样被判定为不同的融合数据的问题；
---
src/test/kotlin/com/flightfeather/uav/model/epw/EPWDataPrepTest.kt | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/test/kotlin/com/flightfeather/uav/model/epw/EPWDataPrepTest.kt b/src/test/kotlin/com/flightfeather/uav/model/epw/EPWDataPrepTest.kt
index 69db2a2..7e0b6f7 100644
--- a/src/test/kotlin/com/flightfeather/uav/model/epw/EPWDataPrepTest.kt
+++ b/src/test/kotlin/com/flightfeather/uav/model/epw/EPWDataPrepTest.kt
@@ -70,7 +70,7 @@
var totalPage = -1
val dataList = mutableListOf<DataVo>()
while (totalPage == -1 || page <= totalPage) {
- realTimeDataService.getSecondData(deviceCode, it.first, it.second, 0, page, 50000).apply {
+ realTimeDataService.getSecondData(null, deviceCode, it.first, it.second, 0, page, 50000).apply {
if (totalPage == -1) {
totalPage = head?.totalPage ?: 0
}
@@ -128,7 +128,7 @@
val dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")
val s = sTime.format(dateFormatter)
val e = eTime.format(dateFormatter)
- val data = realTimeDataService.getSecondData(deviceCode, s, e, 0, 1, 30000).data
+ val data = realTimeDataService.getSecondData(null, deviceCode, s, e, 0, 1, 30000).data
data?.let {
val dataList = ePWDataPrep.mDataPrep(it)
@@ -173,4 +173,9 @@
eTime = eTime.plusDays(1)
}
}
+
+ @Test
+ fun foo3() {
+
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3