From 3e2159e45e12b2b8af058b68eafeaf082cf3fe85 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 15 九月 2022 09:30:31 +0800
Subject: [PATCH] 2022.9.15 1. 根据微信小程序前端需求，添加各对应后台逻辑
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/DeviceServiceImpl.kt | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/DeviceServiceImpl.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/DeviceServiceImpl.kt
index 2750824..67a4645 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/DeviceServiceImpl.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/DeviceServiceImpl.kt
@@ -47,7 +47,7 @@
createCriteria().andEqualTo("mvStatCode", mn)
orderBy("mvDataTime").desc()
}).map {
- DataVo(DateUtil().DateToString(it.mvDataTime, DateUtil.DateStyle.YYYY_MM_DD_HH_MM), if (it.mvFumeConcentration<0) it.mvFumeConcentration2 else it.mvFumeConcentration)
+ DataVo(DateUtil.DateToString(it.mvDataTime, DateUtil.DateStyle.YYYY_MM_DD_HH_MM), if (it.mvFumeConcentration<0) it.mvFumeConcentration2 else it.mvFumeConcentration)
}.run {
asReversed()
}.also {
@@ -98,7 +98,7 @@
}
result.add(DataVo(
- DateUtil().DateToString(startTime, DateUtil.DateStyle.YYYY_MM_DD_HH_MM),
+ DateUtil.DateToString(startTime, DateUtil.DateStyle.YYYY_MM_DD_HH_MM),
DecimalFormat("#.00").format(hourValue).toDouble()
))
}
@@ -110,7 +110,7 @@
orderBy("vocDataTime").desc()
}).map {v ->
DataVo(
- DateUtil().DateToString(v?.vocDataTime, DateUtil.DateStyle.YYYY_MM_DD_HH_MM),
+ DateUtil.DateToString(v?.vocDataTime, DateUtil.DateStyle.YYYY_MM_DD_HH_MM),
DecimalFormat("#.00").format(v?.vocValue).toDouble()
)
}.run {
@@ -220,8 +220,8 @@
override fun getHistoryValue(userId: String, startTime: String, endTime: String, period: Byte): List<DataVo> {
val result = mutableListOf<DataVo>()
val baseInfo = baseInfoMapper.selectByPrimaryKey(userId)
- val sT = DateUtil().StringToDate(startTime)
- val eT = DateUtil().StringToDate(endTime)
+ val sT = DateUtil.StringToDate(startTime)
+ val eT = DateUtil.StringToDate(endTime)
if (baseInfo != null) {
val mn = baseInfo.biExtension2
if (!mn.isNullOrBlank()) {
@@ -230,7 +230,7 @@
.andBetween("mvDataTime", sT, eT)
orderBy("mvDataTime")
}).map {
- DataVo(DateUtil().DateToString(it.mvDataTime, DateUtil.DateStyle.YYYY_MM_DD_HH_MM), if (it.mvFumeConcentration < 0) it.mvFumeConcentration2 else it.mvFumeConcentration)
+ DataVo(DateUtil.DateToString(it.mvDataTime, DateUtil.DateStyle.YYYY_MM_DD_HH_MM), if (it.mvFumeConcentration < 0) it.mvFumeConcentration2 else it.mvFumeConcentration)
}.also {
result.addAll(it)
}
@@ -253,7 +253,7 @@
val p = PageHelper.startPage<FumeMinuteValue>(page, perPage)
fumeMinuteValueMapper.getRealTimeData().forEach {
resultList.add(DataVo(
- DateUtil().DateToString(it.mvDataTime, DateUtil.DateStyle.YYYY_MM_DD_HH_MM),
+ DateUtil.DateToString(it.mvDataTime, DateUtil.DateStyle.YYYY_MM_DD_HH_MM),
if (it.mvFumeConcentration < 0) it.mvFumeConcentration2 else it.mvFumeConcentration,
it.mvStatCode
))
--
Gitblit v1.9.3