From 21427a082fc07bed414dbfe0473678d8aeb37006 Mon Sep 17 00:00:00 2001
From: zmc <zmc_li@foxmail.com>
Date: 星期四, 02 十一月 2023 11:56:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/flightfeather/monitor/domain/ds1/repository/DustStatisticsValueRep.kt | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/flightfeather/monitor/domain/ds1/repository/DustStatisticsValueRep.kt b/src/main/java/com/flightfeather/monitor/domain/ds1/repository/DustStatisticsValueRep.kt
index 2dfcdf3..fbd89ea 100644
--- a/src/main/java/com/flightfeather/monitor/domain/ds1/repository/DustStatisticsValueRep.kt
+++ b/src/main/java/com/flightfeather/monitor/domain/ds1/repository/DustStatisticsValueRep.kt
@@ -1,9 +1,8 @@
package com.flightfeather.monitor.domain.ds1.repository
-import com.flightfeather.monitor.domain.ds1.entity.DustExceptionData
-import com.flightfeather.monitor.domain.ds1.entity.DustSiteData
import com.flightfeather.monitor.domain.ds1.entity.DustStatisticsValue
import com.flightfeather.monitor.domain.ds1.mapper.DustStatisticsValueMapper
+import com.github.pagehelper.PageHelper
import org.springframework.stereotype.Repository
import tk.mybatis.mapper.entity.Example
import java.time.Duration
@@ -13,10 +12,16 @@
class DustStatisticsValueRep(private val dustStatisticsValueMapper: DustStatisticsValueMapper) {
fun findLatestData(type: String): DustStatisticsValue? {
- return dustStatisticsValueMapper.selectOneByExample(Example(DustStatisticsValue::class.java).apply {
+ val p = PageHelper.startPage<DustStatisticsValue>(1, 1)
+ dustStatisticsValueMapper.selectByExample(Example(DustStatisticsValue::class.java).apply {
createCriteria().andEqualTo("type", type)
orderBy("lst").desc()
})
+ return if (p.isNotEmpty()) {
+ p[0]
+ } else {
+ null
+ }
}
@@ -46,4 +51,6 @@
val dataCount = d * 96
dustStatisticsValueMapper.monthlyStatics(s, e, dataCount.toInt())
}
+
+
}
\ No newline at end of file
--
Gitblit v1.9.3