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/model/epw/TimeSection.kt | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/model/epw/TimeSection.kt b/src/main/kotlin/com/flightfeather/uav/model/epw/TimeSection.kt
index 2b5f476..c6d22ac 100644
--- a/src/main/kotlin/com/flightfeather/uav/model/epw/TimeSection.kt
+++ b/src/main/kotlin/com/flightfeather/uav/model/epw/TimeSection.kt
@@ -2,16 +2,13 @@
import com.flightfeather.uav.lightshare.bean.CompanySOP
import com.flightfeather.uav.lightshare.bean.DataVo
-import com.flightfeather.uav.model.BaseEffect
-import com.flightfeather.uav.model.BaseSection
-import com.flightfeather.uav.model.BaseTag
-import com.flightfeather.uav.model.TimeTag
+import com.flightfeather.uav.model.*
/**
* 鏃舵鍒嗙被缁熻
* [6,9,12,14,17,20]; [6,9)涓烘棭涓婏紝涔嬪悗渚濇涓轰笂鍗堬紝涓崍锛屼笅鍗堬紝鍌嶆櫄鍜屾櫄涓�
*/
-class TimeSection : BaseSection<DataVo, CompanySOP>() {
+class TimeSection : BaseSection<DataVo, BaseSOP>() {
override val sectionValues: List<Double> = listOf(6.0, 9.0, 12.0, 14.0, 17.0, 20.0)
@@ -21,7 +18,7 @@
override val constType: List<String> = listOf("缁煎悎")
- override fun onSectionValue(mData: DataVo, sop: CompanySOP, effect: BaseEffect): Double {
+ override fun onSectionValue(mData: DataVo, sop: BaseSOP, effect: BaseEffect): Double {
return getHour(mData.time!!)
}
--
Gitblit v1.9.3