From a0fe2290b235be4460d2118bac76ef3d64980d47 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Sat, 07 Oct 2023 11:54:59 +0800
Subject: [PATCH] ci:补充提交
---
screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index bd62813..ea2d2a4 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -229,10 +229,11 @@
Date endDate = DateUtils.getDate(endTime,DateUtils.yyyy_MM_dd_HH_EN);
List<String> tableNames = MybatisPLUSUtils.getTableNamesByWrapper(startDate, endDate, SeparateTableType.MONTH);
for (String mac:macs) {
- QueryWrapper<HistoryHourly> wrapper = new QueryWrapper<>();
- wrapper.eq("mac", mac);
- wrapper.between("time", startDate, endDate);
- List<HistoryHourly> historyHourlies = multiTableQuery(wrapper, tableNames);
+ Map<String, Object> mapParams = new HashMap<>();
+ mapParams.put("startDate",startDate);
+ mapParams.put("endDate",endDate);
+ mapParams.put("mac",mac);
+ List<HistoryHourly> historyHourlies = multiTableQuery(mapParams, tableNames);
historyHourlies = historyHourlies.stream().distinct().collect(Collectors.toList());
List<HistoryHourly> distinctHistoryHourlies = new ArrayList<>();
Map<String, Object> disMap = new HashMap<>();
@@ -340,10 +341,11 @@
Date endDate = DateUtils.getDate(endTime,DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
List<String> tableNames = MybatisPLUSUtils.getTableNamesByWrapper(startDate, endDate, SeparateTableType.MONTH);
for (String mac:macs) {
- QueryWrapper<HistoryFiveMinutely> wrapper = new QueryWrapper<>();
- wrapper.eq("mac", mac);
- wrapper.between("time", startDate, endDate);
- List<HistoryFiveMinutely> HistoryFiveMinutelys = FiveMinuteTableQuery(wrapper, tableNames);
+ Map<String, Object> mapParams = new HashMap<>();
+ mapParams.put("startDate",startDate);
+ mapParams.put("endDate",endDate);
+ mapParams.put("mac",mac);
+ List<HistoryFiveMinutely> HistoryFiveMinutelys = FiveMinuteTableQuery(mapParams, tableNames);
HistoryFiveMinutelys = HistoryFiveMinutelys.stream().distinct().collect(Collectors.toList());
List<HistoryFiveMinutely> distinctHistoryHourlies = new ArrayList<>();
Map<String, Object> disMap = new HashMap<>();
@@ -539,25 +541,23 @@
* @Author: ���������
* @Date: 2021/9/23
*/
- private List<HistoryHourly> multiTableQuery(QueryWrapper<HistoryHourly> wrapper, List<String> tableNames) {
+ private List<HistoryHourly> multiTableQuery(Map<String, Object> params, List<String> tableNames) {
List<HistoryHourly> result = new ArrayList<>();
for (String tableName : tableNames) {
- MybatisPlusConfig.tableName.set(tableName);
- List<HistoryHourly> datas = historyHourlyMapper.selectList(wrapper);
+ params.put("table",tableName);
+ List<HistoryHourly> datas = historyHourlyMapper.listResult(params);
result.addAll(datas);
}
- MybatisPlusConfig.tableName.remove();
return result;
}
- private List<HistoryFiveMinutely> FiveMinuteTableQuery(QueryWrapper<HistoryFiveMinutely> wrapper, List<String> tableNames) {
+ private List<HistoryFiveMinutely> FiveMinuteTableQuery(Map<String, Object> params, List<String> tableNames) {
List<HistoryFiveMinutely> result = new ArrayList<>();
for (String tableName : tableNames) {
- MybatisPlusConfig.tableName.set(tableName);
- List<HistoryFiveMinutely> datas = historyFiveMinutelyMapper.selectList(wrapper);
+ params.put("table",tableName);
+ List<HistoryFiveMinutely> datas = historyFiveMinutelyMapper.listResult(params);
result.addAll(datas);
}
- MybatisPlusConfig.tableName.remove();
return result;
}
--
Gitblit v1.8.0