From 879378a9a2e73278dc822c97f8d1dda589919b6d Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 21 五月 2021 17:36:44 +0800
Subject: [PATCH] 1. 根据新的协议，扩展了设备编号的位数从1位至6位； 2. 新增监测因子无人机高度；
---
src/main/kotlin/com/flightfeather/uav/lightshare/service/impl/RealTimeDataServiceImpl.kt | 42 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 38 insertions(+), 4 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..a22bee6 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,64 @@
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()
+ orderBy("dataTime").apply {
+ // 褰撹姹傛帴鍙ｄ笉浼犻�掕捣濮嬫椂闂达紝榛樿鑾峰彇鏈�鏂扮殑鏁版嵁
+ if (startTime == null && endTime == null) {
+ 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()
+ if (startTime == null && endTime == null) {
+ result.reverse()
+ }
+ return BaseResponse(true, head = DataHead(pageInfo.pageNum, pageInfo.pages), data = result)
+ }
+
+ override fun getNextData(deviceCode: String, updateTime: String, page: Int?, perPage: Int?): BaseResponse<List<DataVo>> {
+ val _perPage = perPage ?: 60
+ val _page = page ?: 1
+ val pageInfo = PageHelper.startPage<RealTimeData>(_page, _perPage)
+ val result = mutableListOf<DataVo>()
+ realTimeDataMapper.selectByExample(Example(RealTimeData::class.java).apply {
+ createCriteria().andEqualTo("deviceCode", deviceCode)
+ .andGreaterThan("dataTime", updateTime)
+ orderBy("dataTime")
+ }).forEach {
+ result.add(DataVo(
+ dateFormatter.format(it.dataTime),
+ it.deviceCode,
+ GsonUtils.parserJsonToArrayBeans(it.factors, AirData::class.java),
+ it.longitude.toDouble(), it.latitude.toDouble()
+ ))
+ }
return BaseResponse(true, head = DataHead(pageInfo.pageNum, pageInfo.pages), data = result)
}
}
\ No newline at end of file
--
Gitblit v1.9.3