From f0837ee21f7650d4413830d4ee90da02bcdd6d36 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 10 Oct 2023 10:59:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 53 +++++++++++++++++++++++++++++++----------------------
1 files changed, 31 insertions(+), 22 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 837adeb..745c803 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
@@ -746,43 +746,44 @@
*/
@Override
public List<HistoryHourly> getValueByMacAndTime(String mac, Date startDate, Date endDate) {
- QueryWrapper<HistoryHourly> wrapper = new QueryWrapper<>();
- wrapper.eq("mac", mac);
- wrapper.between("time", startDate, endDate);
+ Map<String, Object> mapParams = new HashMap<>();
+ mapParams.put("startDate",startDate);
+ mapParams.put("endDate",endDate);
+ mapParams.put("mac",mac);
List<String> tableNames = MybatisPLUSUtils.getTableNamesByWrapper(startDate, endDate, SeparateTableType.MONTH);
- List<HistoryHourly> datas = multiTableQuery(wrapper, tableNames);
+ List<HistoryHourly> datas = multiTableQuery(mapParams, tableNames);
return datas;
}
@Override
public List<HistoryHourly> getValueByMacAndTime(List<String> mac, Date startDate, Date endDate) {
- QueryWrapper<HistoryHourly> wrapper = new QueryWrapper<>();
- wrapper.in("mac", mac);
- wrapper.between("time", startDate, endDate);
+
+ Map<String, Object> mapParams = new HashMap<>();
+ mapParams.put("startDate",startDate);
+ mapParams.put("endDate",endDate);
+ mapParams.put("macs",mac);
List<String> tableNames = MybatisPLUSUtils.getTableNamesByWrapper(startDate, endDate, SeparateTableType.MONTH);
- List<HistoryHourly> datas = multiTableQuery(wrapper, tableNames);
+ List<HistoryHourly> datas = multiTableQuery(mapParams, tableNames);
return datas;
}
@Override
public List<HistoryHourly> getValueByMacs(List<String> macs, String time) {
- QueryWrapper<HistoryHourly> queryWrapper = new QueryWrapper<>();
- queryWrapper.select("time", "value")
- .likeRight("time", time)
- .in("mac", macs);
+ Map<String, Object> mapParams = new HashMap<>();
+ mapParams.put("time",time);
+ mapParams.put("macs",macs);
Date date = DateUtils.getDate(time, DateUtils.yyyy_MM_dd_EN);
List<String> tableNames = MybatisPLUSUtils.getTableNamesByWrapper(date, date, SeparateTableType.MONTH);
- return multiTableQuery(queryWrapper, tableNames);
+ return multiTableQueryLike(mapParams, tableNames);
}
@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);
+ Map<String, Object> mapParams = new HashMap<>();
+ mapParams.put("time",time);
+ mapParams.put("macs",macs);
Date date = DateUtils.getDate(time, DateUtils.yyyy_MM_dd_EN);
List<String> tableNames = MybatisPLUSUtils.getTableNamesByWrapper(date, date, SeparateTableType.MONTH);
- return multiTableQuery(queryWrapper, tableNames);
+ return multiTableQueryLike(mapParams, tableNames);
}
@Override
@@ -848,14 +849,22 @@
* @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<HistoryHourly> multiTableQueryLike(Map<String, Object> params, List<String> tableNames) {
+ List<HistoryHourly> result = new ArrayList<>();
+ for (String tableName : tableNames) {
+ params.put("table",tableName);
+ List<HistoryHourly> datas = historyHourlyMapper.listLikeResult(params);
+ result.addAll(datas);
+ }
return result;
}
--
Gitblit v1.8.0