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 +++++++++++
screen-api/src/main/java/com/moral/api/service/impl/ServicesScopeServiceImpl.java | 9 ++++++---
screen-api/src/main/java/com/moral/api/service/HistoryHourlyService.java | 7 +++++++
3 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/HistoryHourlyService.java b/screen-api/src/main/java/com/moral/api/service/HistoryHourlyService.java
index b6aec9d..0c87a8c 100644
--- a/screen-api/src/main/java/com/moral/api/service/HistoryHourlyService.java
+++ b/screen-api/src/main/java/com/moral/api/service/HistoryHourlyService.java
@@ -99,6 +99,13 @@
List<HistoryHourly> getValueByMacs(List<String> macs, String time);
/**
+ * @param macs List<String>
+ * @param time String ������2021-12-23
+ * @description: ���������������������������������������
+ */
+ List<HistoryHourly> getHourlyDataByMacs(List<String> macs, String time);
+
+ /**
* @param list ������
* @param sensorCode ������code
* @param type ���������������������������������max���������������min���������������sum���������������avg���
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()
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/ServicesScopeServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/ServicesScopeServiceImpl.java
index 5e35790..e9539ae 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/ServicesScopeServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/ServicesScopeServiceImpl.java
@@ -53,6 +53,9 @@
@Autowired
private HistoryHourlyMapper historyHourlyMapper;
+ @Autowired
+ private HistoryHourlyService historyHourlyService;
+
@Override
public List<Map<String, Object>> getDateByOrgIdAndCondition(Map map) {
int orgId = Integer.parseInt(map.get("organization_id").toString());
@@ -157,11 +160,11 @@
}
}
if (type.equals("hourly")){
- Date houtly_time = DateUtils.getDate(time+":00:00",DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
+ Date hourly_time = DateUtils.getDate(time+":00:00",DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
QueryWrapper<HistoryHourly> wrapper = new QueryWrapper<>();
wrapper.in("mac", deviceMacs);
- wrapper.eq("time", houtly_time);
- List<HistoryHourly> historyHourlies = historyHourlyMapper.selectList(wrapper);
+ wrapper.eq("time", hourly_time);
+ List<HistoryHourly> historyHourlies = historyHourlyService.getHourlyDataByMacs(deviceMacs,time);
for (HistoryHourly historyHourly : historyHourlies) {
historyDataMap.put(historyHourly.getMac(), JSON.parseObject(JSON.toJSONString(historyHourly), Map.class));
}
--
Gitblit v1.8.0