From d9a6f3c2503795f074ac602c24467f804417ad76 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期三, 01 十二月 2021 19:41:34 +0800
Subject: [PATCH] 1. 新增用电量日分析功能
---
src/test/kotlin/com/flightfeather/uav/model/epw/EPWDataPrepTest.kt | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/test/kotlin/com/flightfeather/uav/model/epw/EPWDataPrepTest.kt b/src/test/kotlin/com/flightfeather/uav/model/epw/EPWDataPrepTest.kt
index 5b8301e..69db2a2 100644
--- a/src/test/kotlin/com/flightfeather/uav/model/epw/EPWDataPrepTest.kt
+++ b/src/test/kotlin/com/flightfeather/uav/model/epw/EPWDataPrepTest.kt
@@ -70,12 +70,12 @@
var totalPage = -1
val dataList = mutableListOf<DataVo>()
while (totalPage == -1 || page <= totalPage) {
- realTimeDataService.getSecondData(deviceCode, it.first, it.second, page, 50000).apply {
+ realTimeDataService.getSecondData(deviceCode, it.first, it.second, 0, page, 50000).apply {
if (totalPage == -1) {
totalPage = head?.totalPage ?: 0
}
- val list = data?: emptyList()
+ val list = data ?: emptyList()
val prepList = prep.mDataPrep(list)
@@ -128,7 +128,7 @@
val dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")
val s = sTime.format(dateFormatter)
val e = eTime.format(dateFormatter)
- val data = realTimeDataService.getSecondData(deviceCode, s, e, 1, 30000).data
+ val data = realTimeDataService.getSecondData(deviceCode, s, e, 0, 1, 30000).data
data?.let {
val dataList = ePWDataPrep.mDataPrep(it)
--
Gitblit v1.9.3