From 15925907ba4b16d6fe3a5210186e0ce3cd19efa5 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期一, 22 十一月 2021 13:30:17 +0800
Subject: [PATCH] 1. 新增临时网格化秒级值表，用于数据校准处理
---
src/main/kotlin/com/flightfeather/uav/domain/mapper/RealTimeDataGridOptMapper.kt | 2 +-
src/main/kotlin/com/flightfeather/uav/domain/entity/BaseRealTimeData.kt | 2 +-
src/main/kotlin/com/flightfeather/uav/lightshare/service/impl/RealTimeDataServiceImpl.kt | 8 +++++---
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/domain/entity/BaseRealTimeData.kt b/src/main/kotlin/com/flightfeather/uav/domain/entity/BaseRealTimeData.kt
index 6b4b939..2c6cc71 100644
--- a/src/main/kotlin/com/flightfeather/uav/domain/entity/BaseRealTimeData.kt
+++ b/src/main/kotlin/com/flightfeather/uav/domain/entity/BaseRealTimeData.kt
@@ -110,7 +110,7 @@
}
}
-fun List<RealTimeDataGrid>.avg(): RealTimeDataGridMin {
+fun List<BaseRealTimeData>.avg(): RealTimeDataGridMin {
//椋庡悜閲囩敤鍗曚綅鐭㈤噺娉曟眰鍙栧潎鍊�
var u = .0//涓滆タ鏂逛綅鍒嗛噺鎬诲拰
var v = .0//鍗楀寳鏂逛綅鍒嗛噺鎬诲拰
diff --git a/src/main/kotlin/com/flightfeather/uav/domain/mapper/RealTimeDataGridOptMapper.kt b/src/main/kotlin/com/flightfeather/uav/domain/mapper/RealTimeDataGridOptMapper.kt
index 1e640ba..60cde48 100644
--- a/src/main/kotlin/com/flightfeather/uav/domain/mapper/RealTimeDataGridOptMapper.kt
+++ b/src/main/kotlin/com/flightfeather/uav/domain/mapper/RealTimeDataGridOptMapper.kt
@@ -5,4 +5,4 @@
import org.apache.ibatis.annotations.Mapper
@Mapper
-interface RealTimeDataGridOptMapper : MyMapper<RealTimeDataGridOpt?>
\ No newline at end of file
+interface RealTimeDataGridOptMapper : MyMapper<RealTimeDataGridOpt>
\ No newline at end of file
diff --git a/src/main/kotlin/com/flightfeather/uav/lightshare/service/impl/RealTimeDataServiceImpl.kt b/src/main/kotlin/com/flightfeather/uav/lightshare/service/impl/RealTimeDataServiceImpl.kt
index c2fd883..5264b8e 100644
--- a/src/main/kotlin/com/flightfeather/uav/lightshare/service/impl/RealTimeDataServiceImpl.kt
+++ b/src/main/kotlin/com/flightfeather/uav/lightshare/service/impl/RealTimeDataServiceImpl.kt
@@ -28,6 +28,7 @@
import java.util.*
import javax.servlet.http.HttpServletResponse
import javax.swing.text.DateFormatter
+import kotlin.math.sqrt
@Service
class RealTimeDataServiceImpl(
@@ -291,7 +292,7 @@
var count = 0
val minFormatter = SimpleDateFormat("yyyy-MM-dd HH:mm")
- val averageUtil = AverageUtil<RealTimeDataGrid, RealTimeDataGridMin>({d ->
+ val averageUtil = AverageUtil<RealTimeDataGridOpt, RealTimeDataGridMin>({d ->
minFormatter.format(d.dataTime)
},{list ->
list.avg()
@@ -300,8 +301,8 @@
while (total == -1 || page <= total) {
println("------鍧囧�艰绠梥tart------")
- val p = PageHelper.startPage<RealTimeDataGrid>(page, 50000)
- val res = realTimeDataGridMapper.selectByExample(Example(RealTimeDataGrid::class.java).apply {
+ val p = PageHelper.startPage<RealTimeDataGridOpt>(page, 50000)
+ val res = realTimeDataGridOptMapper.selectByExample(Example(RealTimeDataGridOpt::class.java).apply {
createCriteria().andBetween("dataTime", "2021-06-01 00:00:00", "2021-11-05 00:00:00")
})
@@ -364,6 +365,7 @@
// 鍗曠嫭鎶婂師濮嬬殑H2S涔樹互绯绘暟
h2s = d2.values?.get(2)?.factorData?.toFloat()?.times(scaleList[2])
+ h2s = h2s?.let { sqrt(it) * 2 }
}
// 鏇存柊绉掔骇鍊�
--
Gitblit v1.9.3