1. 添加网格化数据分钟均值计算逻辑

feiyu02

2021-11-10 db7243622e8b5f4cc23de5594b2d973562f0b2a3

 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"