From 83455446544f89b0663a3f520744331ad8259289 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期五, 02 二月 2024 17:49:43 +0800
Subject: [PATCH] 1. 新增导入静安监测数据功能模块
---
src/main/kotlin/com/flightfeather/uav/model/BaseModel.kt | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 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..0f5ea52 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.*
@@ -13,7 +14,7 @@
* 姹℃煋婧愬奖鍝嶇▼搴︽潈閲嶅垎鏋愭ā鍨�
* 鍩虹被
*/
-abstract class BaseModel<M : BaseMData, S : BaseSOP> {
+abstract class BaseModel<M : BaseMData> {
data class ResultCell(
var total: Double = 0.0,
@@ -26,26 +27,26 @@
}
}
- abstract var dataPrep: BaseDataPrep<M, S>
+ abstract var dataPrep: BaseDataPrep<M, BaseSOP>
// 鏉冮噸鍥犲瓙锛屽湪杩涜璁＄畻鍒嗘瀽鏃朵娇鐢ㄧ殑鐩戞祴鍥犲瓙
abstract var factorTypes: List<FactorType>
// 鏉冮噸鍊硷紝澶氱鏉冮噸杩涜涔樼Н璁＄畻
- abstract var weights: List<BaseWeight<M, S>>
+ abstract var weights: List<BaseWeight<M, BaseSOP>>
// 璁＄畻缁撴灉
private val rMap = mutableMapOf<String, MutableMap<String, MutableMap<String, ResultCell>>>()
// 缁撴灉绛涢�夋柟寮�
- abstract var sections: List<BaseSection<M, S>>
+ abstract var sections: List<BaseSection<M, BaseSOP>>
/**
* 姹℃煋婧愬奖鍝嶇▼搴﹁绠�
* @param mDataList 鐩戞祴鏁版嵁闆嗗悎
* @param sopList 姹℃煋婧愰泦鍚�
*/
- fun execute(mDataList: List<M>, sopList: List<S>, hasNext: Boolean = false) {
+ fun execute(mDataList: List<M>, sopList: List<BaseSOP>, hasNext: Boolean = false) {
if (!hasNext) rMap.clear()
//1. 鏁版嵁棰勫鐞�
@@ -67,7 +68,7 @@
* @param mData 鐩戞祴鏁版嵁
* @param sop 姹℃煋婧�
*/
- private fun weightCompute(mData: M, sop: S) {
+ private fun weightCompute(mData: M, sop: BaseSOP) {
val effect = BaseEffect(sop.sourceId, sop.sourceName, sop.index)
// 灏嗗師鐩戞祴鏁版嵁鎸夌収鏉冮噸璁＄畻鍑虹粨鏋滃��
@@ -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"
@@ -233,5 +234,5 @@
/**
* 姹℃煋婧愭暟鎹悎娉曟�ф鏌�
*/
- abstract fun sopCheck(s: S): Boolean
+ abstract fun sopCheck(s: BaseSOP): Boolean
}
\ No newline at end of file
--
Gitblit v1.9.3