From dacae5af651baa6ae102c8dd4350a7b8b7d86fe6 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 28 Apr 2022 16:16:40 +0800
Subject: [PATCH] 通过时间和mac集合查询数据接口，修改蜂窝图小时数据接口
---
screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
index 63879e6..deeb591 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
@@ -779,6 +779,17 @@
}
@Override
+ public List<HistoryHourly> getHourlyDataByMacs(List<String> macs, String time) {
+ QueryWrapper<HistoryHourly> queryWrapper = new QueryWrapper<>();
+ queryWrapper.select("mac","time", "value")
+ .likeRight("time", time)
+ .in("mac", macs);
+ Date date = DateUtils.getDate(time, DateUtils.yyyy_MM_dd_EN);
+ List<String> tableNames = MybatisPLUSUtils.getTableNamesByWrapper(date, date, SeparateTableType.MONTH);
+ return multiTableQuery(queryWrapper, tableNames);
+ }
+
+ @Override
public Double calculatedValue(List<HistoryHourly> list, String sensorCode, String type, Double lower, Double upper) {
Supplier<Stream<HistoryHourly>> supplier = list::stream;
DoubleStream doubleStream = supplier.get()
--
Gitblit v1.8.0