From 532e6ccc42a1958f8bfc9ffe93eb79382303458d Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期五, 27 十二月 2024 11:32:21 +0800
Subject: [PATCH] 1. 新增aod数据索引，aod详细数据实体类，mapper，service 2. 新增卫星遥测数据网格数据pm2.5、aod数据导入，模板下载 3. FileExchange.kt 新增转换pm2.5和aod数据方法
---
src/test/kotlin/com/flightfeather/uav/model/epw/EPWModelTest.kt | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/test/kotlin/com/flightfeather/uav/model/epw/EPWModelTest.kt b/src/test/kotlin/com/flightfeather/uav/model/epw/EPWModelTest.kt
index 9dccf11..b76ffff 100644
--- a/src/test/kotlin/com/flightfeather/uav/model/epw/EPWModelTest.kt
+++ b/src/test/kotlin/com/flightfeather/uav/model/epw/EPWModelTest.kt
@@ -6,6 +6,7 @@
import com.flightfeather.uav.lightshare.bean.DataVo
import com.flightfeather.uav.lightshare.service.RealTimeDataService
import org.apache.poi.hssf.usermodel.HSSFWorkbook
+import org.apache.poi.xssf.streaming.SXSSFWorkbook
import org.junit.Test
import org.junit.runner.RunWith
import org.springframework.beans.BeanUtils
@@ -86,7 +87,7 @@
val deviceCode = "0d0000000001"
val epwModel = EPWModel()
- var workbook: HSSFWorkbook? = null
+ var workbook: SXSSFWorkbook? = null
var out: FileOutputStream? = null
for (i in timeSet.indices) {
@@ -95,12 +96,12 @@
var page = 1
var totalPage = -1
while (totalPage == -1 || page <= totalPage) {
- realTimeDataService.getSecondData(deviceCode, it.first, it.second, page, 10000).apply {
+ realTimeDataService.getSecondData(null, deviceCode, it.first, it.second, page, 0, 10000).apply {
if (totalPage == -1) {
totalPage = head?.totalPage ?: 0
}
- val dataList = data?: emptyList()
+ val dataList = data ?: emptyList()
dataList.forEach {
if (it.lng == 0.0 && it.lat == 0.0) {
--
Gitblit v1.9.3