From eb3dd00b0b7fcda477229d518d250f9c842b790b Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 21 十月 2025 17:45:44 +0800
Subject: [PATCH] 2025.10.21 1. 走航季度报告相关数据计算逻辑调整
---
src/main/kotlin/com/flightfeather/uav/common/utils/FileExchange.kt | 193 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 192 insertions(+), 1 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/common/utils/FileExchange.kt b/src/main/kotlin/com/flightfeather/uav/common/utils/FileExchange.kt
index ea62b09..423644f 100644
--- a/src/main/kotlin/com/flightfeather/uav/common/utils/FileExchange.kt
+++ b/src/main/kotlin/com/flightfeather/uav/common/utils/FileExchange.kt
@@ -2,10 +2,15 @@
import com.alibaba.fastjson.JSONObject
import com.flightfeather.uav.common.exception.BizException
+import com.flightfeather.uav.domain.entity.GridAodDetail
+import com.flightfeather.uav.domain.entity.GridDataDetail
import com.flightfeather.uav.domain.entity.RealTimeData
import com.flightfeather.uav.domain.entity.RealTimeDataVehicle
import com.flightfeather.uav.socket.bean.AirData
import org.apache.poi.hssf.usermodel.HSSFWorkbook
+import org.apache.poi.ss.usermodel.Cell
+import org.apache.poi.ss.usermodel.CellType
+import org.apache.poi.ss.util.CellAddress
import org.apache.poi.xssf.streaming.SXSSFWorkbook
import java.io.File
import java.io.FileInputStream
@@ -53,7 +58,7 @@
if (cellIterator.hasNext()) {
val cellText = cellIterator.next().stringCellValue
if (!cellText.equals(head)) {
- throw BizException("鏂囦欢鏍煎紡閿欒, 琛ㄥご[${head}]搴旇涓篬${cellText}]")
+ throw BizException("鏂囦欢鏍煎紡閿欒, 琛ㄥご[${cellText}]搴旇涓篬${head}]")
}
} else {
throw BizException("鏂囦欢鏍煎紡閿欒, 琛ㄥご[${head}]缂哄け")
@@ -93,6 +98,192 @@
}
/**
+ * 杞崲PM2.5琛ㄦ牸鏁版嵁
+ */
+ fun exchangeGridData(file: InputStream, correctRangeGridCells: Set<Int>): List<GridDataDetail> {
+ // 妯′豢宸叉湁浠ｇ爜鍒ゆ柇琛ㄥご姝ｇ‘鎬� 骞跺湪閿欒鏃舵姏鍑哄紓甯�
+ val headers = listOf(
+ "pointid",
+ "PM2.5"
+ )
+ val result = mutableListOf<GridDataDetail>()
+ try {
+ ExcelUtil.readXLXS(file, headerCheck = {
+ val cellIterator = it.cellIterator()
+ val headIterator = headers.iterator()
+ while (headIterator.hasNext()) {
+ val head = headIterator.next()
+ if (cellIterator.hasNext()) {
+ val cellText = cellIterator.next().stringCellValue
+ if (!cellText.equals(head)) {
+ throw BizException("鏂囦欢鏍煎紡閿欒, 琛ㄥご[${cellText}]搴旇涓篬${head}]")
+ }
+ } else {
+ throw BizException("鏂囦欢鏍煎紡閿欒, 琛ㄥご[${head}]缂哄け")
+ }
+ }
+ true
+ },
+ // 鍒ゆ柇鍗曞厓鏍兼暟鎹纭�э紝骞跺湪鎶ラ敊鍚庢姏鍑哄紓甯�
+ onRow = {
+ val data = GridDataDetail().apply {
+ // 杞崲缃戞牸缁勫崟鍏冩牸id
+ // 寰楀埌褰撳墠鍗曞厓鏍肩殑瀹氫綅淇℃伅 锛坋g: B3,BA3...锛�
+ val cellIdCellPosStr = CellAddress(it.rowNum, 0).formatAsString()
+ // 寰楀埌褰撳墠鍗曞厓鏍兼暟鎹被鍨�
+ val cellIdCellType = it.getCell(0).cellType
+ when (cellIdCellType) {
+ CellType.NUMERIC -> {
+ // 褰撳�间负鏁板瓧绫诲瀷鏃惰浆鍖栦负缃戞牸鍗曞厓鏍糹d
+ this.cellId = it.getCell(0)?.numericCellValue?.toInt()
+ }
+ else -> {
+ throw BizException("鍗曞厓鏍糩${cellIdCellPosStr}]涓嶆槸鏁板瓧绫诲瀷")
+ }
+ }
+
+ // 杞崲PM2.5
+ // 寰楀埌褰撳墠鍗曞厓鏍肩殑瀹氫綅淇℃伅 锛坋g: B3,BA3...锛�
+ val pm25CellPosStr = CellAddress(it.rowNum, 1).formatAsString()
+ // 寰楀埌褰撳墠鍗曞厓鏍兼暟鎹被鍨�
+ val pm25CellType = it.getCell(1).cellType
+ when (pm25CellType) {
+ CellType.STRING -> {
+ // 褰撳�间负瀛楃涓叉椂鏈変袱绉嶆儏鍐�
+ // 绌虹櫧鎴栬�呮槸鈥�/鈥欏瓧绗� 杞寲涓虹┖鍊�
+ // 鍚﹀垯鎶ラ敊
+ val stringValue = it.getCell(1)?.stringCellValue?.trim()
+ if (stringValue != null) {
+ if (stringValue == "/" || stringValue.isBlank()) {
+ this.pm25 = null
+ }
+ }else {
+ throw BizException("鍗曞厓鏍糩${pm25CellPosStr}]涓嶆槸鏁板瓧绫诲瀷鎴栬�呮枃鏈被鍨�")
+ }
+ }
+ CellType.NUMERIC -> {
+ // 褰撳�间负鏁板瓧绫诲瀷鏃惰浆鍖栦负pm2.5鏁版嵁
+ this.pm25 = it.getCell(1)?.numericCellValue?.toFloat()
+ }
+ else -> {
+ throw BizException("鍗曞厓鏍糩${pm25CellPosStr}]涓嶆槸鏁板瓧绫诲瀷")
+ }
+ }
+ }
+ result.add(data)
+ })
+ } catch (e: BizException) {
+ throw e
+ }
+ // 鍒ゆ柇缃戞牸鍗曞厓鏍肩紪鍙锋槸鍚﹀湪姝ｇ‘鐨勮寖鍥村唴
+ val resultCellIdSet = result.asSequence().map { it.cellId ?: -1 }.toSet()
+ // 鐢ㄦ埛瀵煎叆涓己灏戠殑鐨勫崟鍏冩牸
+ val shortCells = correctRangeGridCells - resultCellIdSet
+ // excel 涓鍑虹殑鐨勫崟鍏冩牸
+ val outCells = resultCellIdSet - correctRangeGridCells
+ if (shortCells.isNotEmpty()) {
+ throw BizException("瀵煎叆鏁版嵁涓己灏戜互涓嬬綉鏍煎崟鍏冩牸锛�${shortCells.joinToString(",")}")
+ }
+ if (outCells.isNotEmpty()) {
+ throw BizException("瀵煎叆鏁版嵁涓湁澶氫綑缃戞牸鍗曞厓鏍硷細${outCells.joinToString(",")}")
+ }
+ return result
+ }
+
+ /**
+ * 杞崲AOD琛ㄦ牸鏁版嵁
+ */
+ fun exchangeGridAod(file: InputStream, correctRangeGridCells: Set<Int>): List<GridAodDetail> {
+ // 妯′豢宸叉湁浠ｇ爜鍒ゆ柇琛ㄥご姝ｇ‘鎬� 骞跺湪閿欒鏃舵姏鍑哄紓甯�
+ val headers = listOf(
+ "pointid",
+ "AOD"
+ )
+ val result = mutableListOf<GridAodDetail>()
+ try {
+ ExcelUtil.readXLXS(file, headerCheck = {
+ val cellIterator = it.cellIterator()
+ val headIterator = headers.iterator()
+ while (headIterator.hasNext()) {
+ val head = headIterator.next()
+ if (cellIterator.hasNext()) {
+ val cellText = cellIterator.next().stringCellValue
+ if (!cellText.equals(head)) {
+ throw BizException("鏂囦欢鏍煎紡閿欒, 琛ㄥご[${cellText}]搴旇涓篬${head}]")
+ }
+ } else {
+ throw BizException("鏂囦欢鏍煎紡閿欒, 琛ㄥご[${head}]缂哄け")
+ }
+ }
+ true
+ },
+ // 鍒ゆ柇鍗曞厓鏍兼暟鎹纭�э紝骞跺湪鎶ラ敊鍚庢姏鍑哄紓甯�
+ onRow = {
+ val data = GridAodDetail().apply {
+ // 杞崲缃戞牸缁勫崟鍏冩牸id
+ // 寰楀埌褰撳墠鍗曞厓鏍肩殑瀹氫綅淇℃伅 锛坋g: B3,BA3...锛�
+ val cellIdCellPosStr = CellAddress(it.rowNum, 0).formatAsString()
+ // 寰楀埌褰撳墠鍗曞厓鏍兼暟鎹被鍨�
+ val cellIdCellType = it.getCell(0).cellType
+ when (cellIdCellType) {
+ CellType.NUMERIC -> {
+ // 褰撳�间负鏁板瓧绫诲瀷鏃惰浆鍖栦负缃戞牸鍗曞厓鏍糹d
+ this.cellId = it.getCell(0)?.numericCellValue?.toInt()
+ }
+ else -> {
+ throw BizException("鍗曞厓鏍糩${cellIdCellPosStr}]涓嶆槸鏁板瓧绫诲瀷")
+ }
+ }
+
+ // 杞崲AOD
+ // 寰楀埌褰撳墠鍗曞厓鏍肩殑瀹氫綅淇℃伅 锛坋g: B3,BA3...锛�
+ val aodCellPosStr = CellAddress(it.rowNum, 1).formatAsString()
+ // 寰楀埌褰撳墠鍗曞厓鏍兼暟鎹被鍨�
+ val aodCellType = it.getCell(1).cellType
+ when (aodCellType) {
+ CellType.STRING -> {
+ // 褰撳�间负瀛楃涓叉椂鏈変袱绉嶆儏鍐�
+ // 绌虹櫧鎴栬�呮槸鈥�/鈥欏瓧绗� 杞寲涓虹┖鍊�
+ // 鍚﹀垯鎶ラ敊
+ val stringValue = it.getCell(1)?.stringCellValue?.trim()
+ if (stringValue != null) {
+ if (stringValue == "/" || stringValue.isBlank()) {
+ this.aod = null
+ }
+ }else {
+ throw BizException("鍗曞厓鏍糩${aodCellPosStr}]涓嶆槸鏁板瓧绫诲瀷鎴栬�呮枃鏈被鍨�")
+ }
+ }
+ CellType.NUMERIC -> {
+ // 褰撳�间负鏁板瓧绫诲瀷鏃惰浆鍖栦负pm2.5鏁版嵁
+ this.aod = it.getCell(1)?.numericCellValue?.toFloat()
+ }
+ else -> {
+ throw BizException("鍗曞厓鏍糩${aodCellPosStr}]涓嶆槸鏁板瓧绫诲瀷")
+ }
+ }
+ }
+ result.add(data)
+ })
+ } catch (e: BizException) {
+ throw e
+ }
+ // 鍒ゆ柇缃戞牸鍗曞厓鏍肩紪鍙锋槸鍚﹀湪姝ｇ‘鐨勮寖鍥村唴
+ val resultCellIdSet = result.asSequence().map { it.cellId ?: -1 }.toSet()
+ // 鐢ㄦ埛瀵煎叆涓己灏戠殑鐨勫崟鍏冩牸
+ val shortCells = correctRangeGridCells - resultCellIdSet
+ // excel 涓鍑虹殑鐨勫崟鍏冩牸
+ val outCells = resultCellIdSet - correctRangeGridCells
+ if (shortCells.isNotEmpty()) {
+ throw BizException("瀵煎叆鏁版嵁涓己灏戜互涓嬬綉鏍煎崟鍏冩牸锛�${shortCells.joinToString(",")}")
+ }
+ if (outCells.isNotEmpty()) {
+ throw BizException("瀵煎叆鏁版嵁涓湁澶氫綑缃戞牸鍗曞厓鏍硷細${outCells.joinToString(",")}")
+ }
+ return result
+ }
+
+ /**
* 杞崲杞﹁浇璧拌埅鏁版嵁
*/
fun exchangeVehicleData(deviceCode: String, file: InputStream): List<RealTimeDataVehicle> {
--
Gitblit v1.9.3