From fcefe41e05439f548a58c7e5b6aa6e58f7b80ada Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期一, 23 十二月 2024 11:57:46 +0800
Subject: [PATCH] 1. 新增接口网格数据excel模板、网格数据excel导入 2. 接口解析网格数据抛出相关excel报错信息 3. FileExchange.kt新增excel转换到GridDataDetail列表方法 4. 新增导入excel的单元测试代码
---
src/main/kotlin/com/flightfeather/uav/lightshare/service/impl/CompanyServiceImpl.kt | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/lightshare/service/impl/CompanyServiceImpl.kt b/src/main/kotlin/com/flightfeather/uav/lightshare/service/impl/CompanyServiceImpl.kt
index 5e5da20..2c3e172 100644
--- a/src/main/kotlin/com/flightfeather/uav/lightshare/service/impl/CompanyServiceImpl.kt
+++ b/src/main/kotlin/com/flightfeather/uav/lightshare/service/impl/CompanyServiceImpl.kt
@@ -64,11 +64,11 @@
var page = 1
var totalPage = -1
while (totalPage == -1 || page <= totalPage) {
- realTimeDataService.getSecondData(deviceCode, startTime, endTime, page, 5000).apply {
+ realTimeDataService.getSecondData(null, deviceCode, startTime, endTime, 0, page, 5000).apply {
if (totalPage == -1) {
totalPage = head?.totalPage ?: 0
}
- val dataList = data?: emptyList()
+ val dataList = data ?: emptyList()
// FIXME: 2021/7/13 姝ゅ涓轰簡娴嬭瘯鏆傛椂灏嗙珯鐐圭粡绾害鍐欐锛屽悗缁�氳繃鏁版嵁搴撻厤缃幏鍙�
dataList.forEach {
@@ -77,7 +77,7 @@
it.lat = 30.835898
}
}
-
+
epwModel.execute(dataList, companySOPList, true)
page++
}
--
Gitblit v1.9.3