From da431c25dfe5122e4ed70372da36ede3e4eaec4a Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期五, 31 五月 2024 17:43:41 +0800
Subject: [PATCH] 1. 新增自动报告生成功能
---
src/main/kotlin/com/flightfeather/uav/repository/impl/AirDataRepositoryImpl.kt | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/repository/impl/AirDataRepositoryImpl.kt b/src/main/kotlin/com/flightfeather/uav/repository/impl/AirDataRepositoryImpl.kt
index 7751fbc..0826636 100644
--- a/src/main/kotlin/com/flightfeather/uav/repository/impl/AirDataRepositoryImpl.kt
+++ b/src/main/kotlin/com/flightfeather/uav/repository/impl/AirDataRepositoryImpl.kt
@@ -136,7 +136,7 @@
val d = RealTimeDataVehicle()
dataTransform(vo, d)
/***************************************************************************************************/
- // FIXME: 2021/10/27 杞﹁浇鐩戞祴閮ㄥ垎鍥犲瓙閲忕骇璋冩暣锛歂O2*0.6锛孒2S*0.3, SO2*0.2, O3*0.5锛屽叾浠栬绱犱笉鍙�
+ // FIXME: 2021/10/27 杞﹁浇鐩戞祴閮ㄥ垎鍥犲瓙閲忕骇璋冩暣
calibration(d, UWDeviceType.VEHICLE)
/***************************************************************************************************/
realTimeDataVehicleMapper.insert(d)
@@ -172,29 +172,29 @@
dataTransform(vo, d)
/**************************************************************************/
// FIXME: 2021/11/8 閽堝鍘嗗彶缃戞牸鍖栧師濮嬫暟鎹紝杩涜涓存椂鏍″噯澶勭悊
- val dTime = LocalDateTime.ofInstant(d.dataTime?.toInstant(), ZoneId.systemDefault())
- // CO: 2021.8.28 17:27璧� *0.25
- val coTime = LocalDateTime.of(2021, 8, 28, 17, 27, 0)
- if (dTime.isAfter(coTime)) {
- d.co = d.co?.times(0.25f)
- }
-
- // NO2
- d.no2 = d.no2?.times(0.6f)
-
- // O3
- d.o3 = abs(d.o3?.minus(d.no2?.div(2) ?: 0f) ?: 0f) * 1.5f
-
- // SO2: *0.2, 2021.8.29 6:00璧� *0.08
- val so2Time = LocalDateTime.of(2021, 8, 29, 6, 0, 0)
- d.so2 = if (dTime.isAfter(so2Time)) {
- d.so2?.times(0.08f)
- } else {
- d.so2?.times(0.2f)
- }
-
- // H2S
- d.h2s = d.h2s?.let { sqrt(it) * 2 }
+// val dTime = LocalDateTime.ofInstant(d.dataTime?.toInstant(), ZoneId.systemDefault())
+// // CO: 2021.8.28 17:27璧� *0.25
+// val coTime = LocalDateTime.of(2021, 8, 28, 17, 27, 0)
+// if (dTime.isAfter(coTime)) {
+// d.co = d.co?.times(0.25f)
+// }
+//
+// // NO2
+// d.no2 = d.no2?.times(0.6f)
+//
+// // O3
+// d.o3 = abs(d.o3?.minus(d.no2?.div(2) ?: 0f) ?: 0f) * 1.5f
+//
+// // SO2: *0.2, 2021.8.29 6:00璧� *0.08
+// val so2Time = LocalDateTime.of(2021, 8, 29, 6, 0, 0)
+// d.so2 = if (dTime.isAfter(so2Time)) {
+// d.so2?.times(0.08f)
+// } else {
+// d.so2?.times(0.2f)
+// }
+//
+// // H2S
+// d.h2s = d.h2s?.let { sqrt(it) * 2 }
/**************************************************************************/
realTimeDataGridMapper.insert(d)
count++
@@ -270,7 +270,7 @@
}
}
- private fun dataTransform(vo: DataVo, bean: BaseRealTimeData) {
+ fun dataTransform(vo: DataVo, bean: BaseRealTimeData) {
bean.apply {
deviceCode = vo.deviceCode
latitude = vo.lat?.toBigDecimal()
--
Gitblit v1.9.3