From bde043c8fd1a076f44c402dd56c62d401afbfb16 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 27 三月 2025 17:29:48 +0800
Subject: [PATCH] 1. 新增卫星遥测网格热力图计算逻辑
---
src/main/kotlin/com/flightfeather/uav/model/BaseModel.kt | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/model/BaseModel.kt b/src/main/kotlin/com/flightfeather/uav/model/BaseModel.kt
index 7d472a4..7e0c3ea 100644
--- a/src/main/kotlin/com/flightfeather/uav/model/BaseModel.kt
+++ b/src/main/kotlin/com/flightfeather/uav/model/BaseModel.kt
@@ -3,7 +3,7 @@
import com.flightfeather.uav.common.utils.DateUtil
import com.flightfeather.uav.common.utils.ExcelUtil
import com.flightfeather.uav.socket.eunm.FactorType
-import org.apache.poi.hssf.usermodel.HSSFWorkbook
+import org.apache.poi.xssf.streaming.SXSSFWorkbook
import java.io.File
import java.io.FileOutputStream
import java.util.*
@@ -13,7 +13,7 @@
* 姹℃煋婧愬奖鍝嶇▼搴︽潈閲嶅垎鏋愭ā鍨�
* 鍩虹被
*/
-abstract class BaseModel<M : BaseMData, S : BaseSOP> {
+abstract class BaseModel<M : BaseMData, S: BaseSOP> {
data class ResultCell(
var total: Double = 0.0,
@@ -45,7 +45,7 @@
* @param mDataList 鐩戞祴鏁版嵁闆嗗悎
* @param sopList 姹℃煋婧愰泦鍚�
*/
- fun execute(mDataList: List<M>, sopList: List<S>, hasNext: Boolean = false) {
+ open fun execute(mDataList: List<M>, sopList: List<S>, hasNext: Boolean = false) {
if (!hasNext) rMap.clear()
//1. 鏁版嵁棰勫鐞�
@@ -88,14 +88,14 @@
fun outputToExcel(
fName: String? = null,
- _workbook: HSSFWorkbook? = null,
+ _workbook: SXSSFWorkbook? = null,
_out: FileOutputStream? = null,
sheetName: String = "sheet1",
done: Boolean = true
- ): Pair<HSSFWorkbook, FileOutputStream>? {
+ ): Pair<SXSSFWorkbook, FileOutputStream>? {
// val rMap = formatConversion()
- val workbook = _workbook ?: HSSFWorkbook()
+ val workbook = _workbook ?: SXSSFWorkbook()
val fileName = fName ?: "姹℃煋婧簮鏉冮噸妯″瀷${DateUtil.instance.dateToString(Date(), "yyyy-MM-ddHHmmss")}.xls"
// val filePath = "E:\\work\\export\\$fileName"
// val filePath = "E:\\宸ヤ綔\\寮�鍙慭\璧拌埅鐩戞祴\\绠楁硶鐩稿叧\\鑷姩杈撳嚭\\$fileName"
@@ -131,7 +131,7 @@
val lKey = "$se($factorType)"
if (lMap.containsKey(lKey)) {
val resultCell = lMap[lKey] ?: return@type
- val size = resultCell.count
+// val size = resultCell.count
// 娣诲姞璇ュ垎绫讳綔涓鸿〃澶�
val h = lKey
// val h = "$lKey($size)"
@@ -198,6 +198,12 @@
return rMap
}
+ /**
+ * 灏嗚绠楃粨鏋滄牸寮忓寲涓哄灞傜骇鐨勯敭瀵瑰�肩粨鏋�
+ * 绗竴灞傛寜鐓т笉鍚屾薄鏌撴簮鐨勭储寮曞�艰繘琛屽垎绫�
+ * 绗簩灞傛寜鐓х洃娴嬪洜瀛愮被鍨嬭繘琛屽垎绫�
+ * 绗笁灞傛寜鐓ц嚜瀹氫箟鐨勬爣绛捐繘琛屽垎绫�
+ */
private fun formatConversion2(e: BaseEffect) {
val rKey = "${e.sourceName};${e.index}"
if (!rMap.containsKey(rKey)) {
--
Gitblit v1.9.3