From 01ac08186355e85cab4a7c6f4403180184894f23 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期六, 09 十月 2021 14:38:44 +0800
Subject: [PATCH] 1. 新增网格化数据统计功能

---
 src/main/kotlin/com/flightfeather/uav/model/BaseModel.kt |    7 ++++---
 1 files changed, 4 insertions(+), 3 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..42a5b09 100644
--- a/src/main/kotlin/com/flightfeather/uav/model/BaseModel.kt
+++ b/src/main/kotlin/com/flightfeather/uav/model/BaseModel.kt
@@ -4,6 +4,7 @@
 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.*
@@ -88,14 +89,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"

--
Gitblit v1.9.3