From 4107073950f459e051e5b9e828750ab57be3863b Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 15 Nov 2023 16:03:53 +0800
Subject: [PATCH] fix：补充提交
---
screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 86 +++++++++++++++++++++++++------------------
1 files changed, 50 insertions(+), 36 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 1540f3d..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
@@ -5,10 +5,13 @@
import com.moral.api.entity.*;
import com.moral.api.mapper.ServicesScopeDeviceMapper;
import com.moral.api.mapper.ServicesScopeMapper;
+import com.moral.api.vo.HistoryHourlyVo;
+import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
+import java.text.DecimalFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -743,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
@@ -845,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;
}
@@ -874,13 +886,15 @@
@Override
- public boolean historyHourly() {
-
- String time = "2023-08-17 09:00:00";
- String table = "202308";
- String timeEnd = "2023-08-17 14:00:00";
- String tableEnd = "202308";
- List<String> macList = Arrays.asList("p5dnd7a0245406","p5dnd7a0245427","p5dnd7a0245412","p5dnd7a0245400","p5dnd7a0245472","p5dnd7a0245384","p5dnd7a0245374","p5dnd7a0245401","p5dnd7a0245423","p5dnd7a0245438","p5dnd7a0245363","p5dnd7a0245375","p5dnd7a0245444","p5dnd7a0245437","p5dnd7a0245367","p5dnd7a0245392","p5dnd7a0245471","p5dnd7a0245433","p5dnd7a0245361","p5dnd7a0245362","p5dnd7a0245436","p5dnd7a0245373","p5dnd7a0245370","p5dnd7a0245357","p5dnd7a0245434","p5dnd7a0245353","p5dnd7a0245381","p5dnd7a0245421","p5dnd7a0245399","p5dnd7a0245409","p5dnd7a0245422","p5dnd7a0245470","p5dnd7a0245359","p5dnd7a0245393","p5dnd7a0245371","p5dnd7a0245382","p5dnd7a0245385","p5dnd7a0245443","p5dnd7a0245424","p5dnd7a0245369","p5dnd7a0245389","p5dnd7a0245391","p5dnd7a0245356","p5dnd7a0245396","p5dnd7a0243567","p5dnd7a0243568");
+ public boolean historyHourly(HistoryHourlyVo historyHourlyVo) {
+ String time = historyHourlyVo.getTime();
+ String table = historyHourlyVo.getTable();
+ String timeEnd = historyHourlyVo.getTimeEnd();
+ String tableEnd =historyHourlyVo.getTableEnd();
+ List<String> macList = deviceMapper.deviceMacs(historyHourlyVo.getOrganizationId());
+ if(CollectionUtils.isEmpty(macList)){
+ return false;
+ }
List<Map<String,Object>> listMap = historyHourlyMapper.selectDataByMacsAndTime(table, macList, time);
for (Map historyHourlyData : listMap) {
String mac = historyHourlyData.get("mac").toString();
@@ -888,13 +902,13 @@
Map<String, Object> dataResult = new HashMap<>();
dataResult = data;
//a34004:pm2.5 a34002:pm10 a05024:O3 a21005:CO a21026:So2 a21004:NO2 a99054:tovc
- dataResult.put("a34004",Double.parseDouble(data.get("a34004").toString())-10);
- dataResult.put("a34002",Double.parseDouble(data.get("a34002").toString())-10);
- dataResult.put("a05024",Double.parseDouble(data.get("a05024").toString())+20);
- //dataResult.put("a21005",Double.parseDouble(data.get("a21005").toString())-35);
- dataResult.put("a21026",Double.parseDouble(data.get("a21026").toString())-3);
- dataResult.put("a21004",Double.parseDouble(data.get("a21004").toString())-2);
- dataResult.put("a99054",Double.parseDouble(data.get("a99054").toString())+0.1);
+ dataResult.put("a34004",Objects.isNull(data.get("a34004"))||data.get("a34004").toString().equals("0")?0d:Double.parseDouble(String.format("%.4f",Double.parseDouble(data.get("a34004").toString())+historyHourlyVo.getA34004())));
+ dataResult.put("a34002",Objects.isNull(data.get("a34002"))||data.get("a34002").toString().equals("0")?0d:Double.parseDouble(String.format("%.4f",Double.parseDouble(data.get("a34002").toString())+historyHourlyVo.getA34002())));
+ dataResult.put("a05024",Objects.isNull(data.get("a05024"))||data.get("a05024").toString().equals("0")?0d:Double.parseDouble(String.format("%.4f",Double.parseDouble(data.get("a05024").toString())+historyHourlyVo.getA05024())));
+ dataResult.put("a21005",Objects.isNull(data.get("a21005"))||data.get("a21005").toString().equals("0")?0d:Double.parseDouble(String.format("%.4f",Double.parseDouble(data.get("a21005").toString())+historyHourlyVo.getA21005())));
+ dataResult.put("a21026",Objects.isNull(data.get("a21026"))||data.get("a21026").toString().equals("0")?0d:Double.parseDouble(String.format("%.4f",Double.parseDouble(data.get("a21026").toString())+historyHourlyVo.getA21026())));
+ dataResult.put("a21004",Objects.isNull(data.get("a21004"))||data.get("a21004").toString().equals("0")?0d:Double.parseDouble(String.format("%.4f",Double.parseDouble(data.get("a21004").toString())+historyHourlyVo.getA21004())));
+ dataResult.put("a99054",Objects.isNull(data.get("a99054"))||data.get("a99054").toString().equals("0")?0d:Double.parseDouble(String.format("%.4f",Double.parseDouble(data.get("a99054").toString())+historyHourlyVo.getA99054())));
Map<String, Object> map = new HashMap<>();
map.put("timeUnits",tableEnd);
map.put("time",timeEnd);
--
Gitblit v1.8.0