From 665a2e1098fb52800ac7624d4a32dfeb6ce15151 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期三, 10 十一月 2021 11:03:36 +0800
Subject: [PATCH] 1. 网格化均值计算逻辑完成
---
src/main/kotlin/com/flightfeather/uav/lightshare/service/impl/RealTimeDataServiceImpl.kt | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 insertions(+), 14 deletions(-)
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 718bc7a..0336692 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
@@ -4,11 +4,9 @@
import com.flightfeather.uav.common.utils.ExcelUtil
import com.flightfeather.uav.common.utils.FileExchange
import com.flightfeather.uav.common.utils.GsonUtils
+import com.flightfeather.uav.dataprocess.AverageUtil
import com.flightfeather.uav.domain.entity.*
-import com.flightfeather.uav.domain.mapper.RealTimeDataGridMapper
-import com.flightfeather.uav.domain.mapper.RealTimeDataMapper
-import com.flightfeather.uav.domain.mapper.RealTimeDataUavMapper
-import com.flightfeather.uav.domain.mapper.RealTimeDataVehicleMapper
+import com.flightfeather.uav.domain.mapper.*
import com.flightfeather.uav.lightshare.bean.*
import com.flightfeather.uav.lightshare.service.RealTimeDataService
import com.flightfeather.uav.model.epw.EPWDataPrep
@@ -34,7 +32,8 @@
private val airDataRepository: AirDataRepository,
private val realTimeDataVehicleMapper: RealTimeDataVehicleMapper,
private val realTimeDataUavMapper: RealTimeDataUavMapper,
- private val realTimeDataGridMapper: RealTimeDataGridMapper
+ private val realTimeDataGridMapper: RealTimeDataGridMapper,
+ private val realTimeDataGridMinMapper: RealTimeDataGridMinMapper
) : RealTimeDataService {
private var dateFormatter = SimpleDateFormat("yyyy-MM-dd HH:mm:ss")
@@ -252,7 +251,7 @@
var count = 0
while (total == -1 || page <= total) {
- println("------start------")
+ println("------鏁版嵁棰勫鐞唖tart------")
val res = getOriginData("0d0000000001", "2021-07-05 19:47:01", "2021-11-05 00:00:00", page, 50000)
res.head?.let {
total = it.totalPage
@@ -271,23 +270,34 @@
}
override fun averageData(): BaseResponse<String> {
- val epwDataPrep = EPWDataPrep()
var page = 1
var total = -1
var count = 0
+ val minFormatter = SimpleDateFormat("yyyy-MM-dd HH:mm")
+ val averageUtil = AverageUtil<RealTimeDataGrid, RealTimeDataGridMin>({d ->
+ minFormatter.format(d.dataTime)
+ },{list ->
+ list.avg()
+ })
+
while (total == -1 || page <= total) {
- println("------start------")
- val res = getOriginData("0d0000000001", "2021-07-05 19:47:01", "2021-11-05 00:00:00", page, 50000)
- res.head?.let {
- total = it.totalPage
- }
+ println("------鍧囧�艰绠梥tart------")
+
+ val p = PageHelper.startPage<RealTimeDataGrid>(page, 50000)
+ val res = realTimeDataGridMapper.selectByExample(Example(RealTimeDataGrid::class.java).apply {
+ createCriteria().andBetween("dataTime", "2021-06-01 00:00:00", "2021-11-05 00:00:00")
+ })
+
+ total = p.pages
+
if (page == 1) {
println("鎬婚〉鏁帮細$total")
}
println("褰撳墠椤垫暟锛�$page")
- res.data?.forEach {
-
+ averageUtil.avg(res).forEach {
+ realTimeDataGridMinMapper.insert(it)
+ count++
}
page++
--
Gitblit v1.9.3