From 1fa0e57df26dcbf9f7c936806b5f4f0744e1d543 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期一, 15 十一月 2021 17:42:01 +0800
Subject: [PATCH] 1. 网格化数据查询添加秒级值和分钟值的选择
---
src/main/kotlin/com/flightfeather/uav/lightshare/service/impl/RealTimeDataServiceImpl.kt | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 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 0336692..48aff07 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
@@ -40,7 +40,7 @@
private var dateFormatter2 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")
private val fileExchange = FileExchange()
- override fun getSecondData(deviceCode: String?, startTime: String?, endTime: String?, page: Int?, perPage: Int?): BaseResponse<List<DataVo>> {
+ override fun getSecondData(deviceCode: String?, startTime: String?, endTime: String?, type: Int?, page: Int?, perPage: Int?): BaseResponse<List<DataVo>> {
val _perPage = perPage ?: 60
val _page = page ?: 1
val sTime = startTime?.let { dateFormatter.parse(it) }
@@ -68,12 +68,24 @@
pages = pageInfo.pages
}
UWDeviceType.GRID -> {
- val pageInfo = PageHelper.startPage<RealTimeDataGrid>(_page, _perPage)
- realTimeDataGridMapper.selectByExample(Example(RealTimeDataGrid::class.java).apply {
- getSecondDataExample(this, deviceCode, sTime, eTime)
- }).forEach { result.add(it.toDataVo()) }
- pageNum = pageInfo.pageNum
- pages = pageInfo.pages
+ // 缃戞牸鍖栫洃娴嬬绾у��
+ if (type == null || type == 0) {
+ val pageInfo = PageHelper.startPage<RealTimeDataGrid>(_page, _perPage)
+ realTimeDataGridMapper.selectByExample(Example(RealTimeDataGrid::class.java).apply {
+ getSecondDataExample(this, deviceCode, sTime, eTime)
+ }).forEach { result.add(it.toDataVo()) }
+ pageNum = pageInfo.pageNum
+ pages = pageInfo.pages
+ }
+ // 缃戞牸鍖栫洃娴嬪垎閽熷��
+ else if (type == 1) {
+ val pageInfo = PageHelper.startPage<RealTimeDataGridMin>(_page, _perPage)
+ realTimeDataGridMinMapper.selectByExample(Example(RealTimeDataGridMin::class.java).apply {
+ getSecondDataExample(this, deviceCode, sTime, eTime)
+ }).forEach { result.add(it.toDataVo()) }
+ pageNum = pageInfo.pageNum
+ pages = pageInfo.pages
+ }
}
else -> {
// 浠庡師濮嬫暟鎹〃涓幏鍙栨暟鎹�
--
Gitblit v1.9.3