From d620e65b30db7bc43db71d26fbce36548819eebc Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Tue, 28 Dec 2021 09:42:19 +0800
Subject: [PATCH] 修改特殊设备更新接口
---
screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 44 ++++++++++++++++++++++++++++----------------
1 files changed, 28 insertions(+), 16 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 287aba6..e842633 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
@@ -528,30 +528,42 @@
}
/**
- * @Description: ���������������������������mac���������
- * @Param: [mac, startDate, endDate]
- * @return: java.util.List<com.moral.api.entity.HistoryHourly>
- * @Author: ���������
- * @Date: 2021/9/23
- */
+ * @Description: ���������������������������mac���������
+ * @Param: [mac, startDate, endDate]
+ * @return: java.util.List<com.moral.api.entity.HistoryHourly>
+ * @Author: ���������
+ * @Date: 2021/9/23
+ */
@Override
- public List<HistoryHourly> getValueByMacAndTime(String mac,Date startDate,Date endDate){
+ public List<HistoryHourly> getValueByMacAndTime(String mac, Date startDate, Date endDate) {
QueryWrapper<HistoryHourly> wrapper = new QueryWrapper<>();
- wrapper.eq("mac",mac);
- wrapper.between("time",startDate,endDate);
+ wrapper.eq("mac", mac);
+ wrapper.between("time", startDate, endDate);
List<String> tableNames = MybatisPLUSUtils.getTableNamesByWrapper(startDate, endDate, SeparateTableType.MONTH);
List<HistoryHourly> datas = multiTableQuery(wrapper, tableNames);
return datas;
}
+ @Override
+ public Double getSensorSumByMacs(String sensorCode, List macs, String time) {
+ String timeUnits = time.substring(0, 7).replace("-", "");
+ return historyHourlyMapper.getSensorSumByMacs(sensorCode, macs, time, timeUnits);
+ }
+
+ @Override
+ public Double getSensorAvgByMacs(String sensorCode, List macs, String time) {
+ String timeUnits = time.substring(0, 7).replace("-", "");
+ return historyHourlyMapper.getSensorAvgByMacs(sensorCode, macs, time, timeUnits);
+ }
+
/**
- * @Description: ������������������������������������������������wrapper���������������
- * @Param: [wrapper, tableNames]
- * @return: java.util.List<com.moral.api.entity.HistoryHourly>
- * @Author: ���������
- * @Date: 2021/9/23
- */
- private List<HistoryHourly> multiTableQuery(QueryWrapper<HistoryHourly> wrapper,List<String> tableNames){
+ * @Description: ������������������������������������������������wrapper���������������
+ * @Param: [wrapper, tableNames]
+ * @return: java.util.List<com.moral.api.entity.HistoryHourly>
+ * @Author: ���������
+ * @Date: 2021/9/23
+ */
+ private List<HistoryHourly> multiTableQuery(QueryWrapper<HistoryHourly> wrapper, List<String> tableNames) {
List<HistoryHourly> result = new ArrayList<>();
for (String tableName : tableNames) {
MybatisPlusConfig.tableName.set(tableName);
--
Gitblit v1.8.0