From df881fabbfbde09b9ec53b53e500d43ac314d736 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期三, 03 二月 2021 10:38:12 +0800
Subject: [PATCH] 1. 调整获取数据的排序为按时间升序
---
src/main/kotlin/com/flightfeather/uav/lightshare/service/impl/RealTimeDataServiceImpl.kt | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 182ac66..0872846 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
@@ -11,30 +11,37 @@
import com.github.pagehelper.PageHelper
import org.springframework.stereotype.Service
import tk.mybatis.mapper.entity.Example
+import java.text.DateFormat
import java.text.SimpleDateFormat
@Service
class RealTimeDataServiceImpl(val realTimeDataMapper: RealTimeDataMapper) : RealTimeDataService {
- override fun getSecondData(deviceCode: String?, page: Int?, perPage: Int?): BaseResponse<List<DataVo>> {
+ private var dateFormatter = SimpleDateFormat("yyyy-MM-dd HH:mm:ss")
+
+ override fun getSecondData(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) }
+ val eTime = endTime?.let { dateFormatter.parse(it) }
val pageInfo = PageHelper.startPage<RealTimeData>(_page, _perPage)
val result = mutableListOf<DataVo>()
realTimeDataMapper.selectByExample(Example(RealTimeData::class.java).apply {
createCriteria().apply {
deviceCode?.let { andEqualTo("deviceCode", it) }
+ sTime?.let { andGreaterThanOrEqualTo("dataTime", it) }
+ eTime?.let { andLessThanOrEqualTo("dataTime", it) }
}
orderBy("dataTime").desc()
}).forEach {
result.add(DataVo(
- SimpleDateFormat.getDateTimeInstance().format(it.dataTime),
+ dateFormatter.format(it.dataTime),
it.deviceCode,
GsonUtils.parserJsonToArrayBeans(it.factors, AirData::class.java),
it.longitude.toDouble(), it.latitude.toDouble()
))
}
- result.reverse()
+// result.reverse()
return BaseResponse(true, head = DataHead(pageInfo.pageNum, pageInfo.pages), data = result)
}
}
\ No newline at end of file
--
Gitblit v1.9.3