From 316bb4380e276a0b9e2745ad126a5c6c0e4b221d Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期一, 22 十一月 2021 13:28:18 +0800
Subject: [PATCH] 2021.11.22
---
src/test/kotlin/com/flightfeather/uav/lightshare/service/impl/RealTimeDataServiceImplTest.kt | 39 +++++++++++++++++++++++++++++++++++++++
src/main/kotlin/com/flightfeather/uav/lightshare/service/RealTimeDataService.kt | 2 ++
src/main/kotlin/com/flightfeather/uav/repository/impl/AirDataRepositoryImpl.kt | 2 +-
src/main/kotlin/com/flightfeather/uav/lightshare/service/impl/RealTimeDataServiceImpl.kt | 2 +-
4 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/lightshare/service/RealTimeDataService.kt b/src/main/kotlin/com/flightfeather/uav/lightshare/service/RealTimeDataService.kt
index 3da6d86..07ab15e 100644
--- a/src/main/kotlin/com/flightfeather/uav/lightshare/service/RealTimeDataService.kt
+++ b/src/main/kotlin/com/flightfeather/uav/lightshare/service/RealTimeDataService.kt
@@ -20,6 +20,8 @@
fun outToExcel(deviceCode: String, startTime: String, endTime: String, response: HttpServletResponse): HttpServletResponse
+ fun getOriginData(deviceCode: String?, startTime: String?, endTime: String?, page: Int?, perPage: Int?): BaseResponse<List<DataVo>>
+
/**
* 鏁版嵁澶勭悊
* 鍘婚櫎鍘熷鏁版嵁涓殑寮傚父娉㈠姩鍊�
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 ae0a015..c2fd883 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
@@ -231,7 +231,7 @@
return contents
}
- private fun getOriginData(deviceCode: String?, startTime: String?, endTime: String?, page: Int?, perPage: Int?): BaseResponse<List<DataVo>> {
+ override fun getOriginData(deviceCode: String?, startTime: String?, endTime: String?, page: Int?, perPage: Int?): BaseResponse<List<DataVo>> {
val _perPage = perPage ?: 60
val _page = page ?: 1
val sTime = startTime?.let { dateFormatter.parse(it) }
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 b2193b0..fe05963 100644
--- a/src/main/kotlin/com/flightfeather/uav/repository/impl/AirDataRepositoryImpl.kt
+++ b/src/main/kotlin/com/flightfeather/uav/repository/impl/AirDataRepositoryImpl.kt
@@ -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()
diff --git a/src/test/kotlin/com/flightfeather/uav/lightshare/service/impl/RealTimeDataServiceImplTest.kt b/src/test/kotlin/com/flightfeather/uav/lightshare/service/impl/RealTimeDataServiceImplTest.kt
index e306742..d8b7e78 100644
--- a/src/test/kotlin/com/flightfeather/uav/lightshare/service/impl/RealTimeDataServiceImplTest.kt
+++ b/src/test/kotlin/com/flightfeather/uav/lightshare/service/impl/RealTimeDataServiceImplTest.kt
@@ -4,7 +4,13 @@
import com.flightfeather.uav.common.utils.ExcelUtil
import com.flightfeather.uav.dataprocess.DataProcess
import com.flightfeather.uav.domain.entity.RealTimeData
+import com.flightfeather.uav.domain.entity.RealTimeDataVehicle
+import com.flightfeather.uav.domain.mapper.RealTimeDataVehicleMapper
import com.flightfeather.uav.lightshare.service.RealTimeDataService
+import com.flightfeather.uav.model.epw.EPWDataPrep
+import com.flightfeather.uav.repository.AirDataRepository
+import com.flightfeather.uav.repository.impl.AirDataRepositoryImpl
+import com.flightfeather.uav.socket.eunm.UWDeviceType
import com.github.pagehelper.PageHelper
import org.apache.poi.xssf.streaming.SXSSFWorkbook
import org.junit.Test
@@ -28,6 +34,12 @@
@Autowired
lateinit var realTimeDataService: RealTimeDataService
+
+ @Autowired
+ lateinit var realTimeDataVehicleMapper: RealTimeDataVehicleMapper
+
+ @Autowired
+ lateinit var airDataRepository: AirDataRepositoryImpl
@Test
fun outToExcel() {
@@ -137,4 +149,31 @@
val r = realTimeDataService.dataCalibration()
println(r.data)
}
+
+ @Test
+ fun dataTransform() {
+
+ var page = 1
+ var total = -1
+ var count = 0
+
+ while (total == -1 || page <= total) {
+ println("------杞﹁浇鏁版嵁杞崲start------")
+ val res = realTimeDataService.getOriginData("0a0000000001", "2021-01-01 00:00:00", "2021-10-25 15:37:21", page, 50000)
+ res.head?.let {
+ total = it.totalPage
+ }
+ if (page == 1) {
+ println("鎬婚〉鏁帮細$total")
+ }
+ println("褰撳墠椤垫暟锛�$page")
+ res.data?.forEach {vo ->
+ val d = RealTimeDataVehicle()
+ airDataRepository.dataTransform(vo, d)
+ realTimeDataVehicleMapper.insert(d)
+ count++
+ }
+ page++
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3