From 58e6dec8c583778714bb1447755f9ffc46b0c5ec Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 20 Oct 2023 14:48:38 +0800
Subject: [PATCH] fix:补充提交
---
screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 104 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 78 insertions(+), 26 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 ebd124d..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
@@ -1,22 +1,20 @@
package com.moral.api.service.impl;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
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.ArrayList;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.OptionalDouble;
+import java.util.*;
import java.util.function.Supplier;
import java.util.stream.Collectors;
import java.util.stream.DoubleStream;
@@ -748,34 +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) {
+
+ 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(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
@@ -841,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;
}
@@ -868,4 +884,40 @@
// return historyHourlyMapper.getDataByMac(mac,time,yearAndMonth);
// }
+
+ @Override
+ 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();
+ Map<String, Object> data = JSON.parseObject(historyHourlyData.get("value").toString(), Map.class);
+ 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",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);
+ map.put("value",JSONObject.toJSONString(dataResult));
+ map.put("version","35");
+ map.put("mac",mac);
+ // historyHourlyMapper.insertHistoryHourly(map);
+ historyHourlyMapper.updateHistoryHourly(map);
+ }
+ return true;
+ }
}
--
Gitblit v1.8.0