From 4a64c0801f147536ed0a9d09977941f313a286ae Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 18 Aug 2023 16:19:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into wb
---
screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 45 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 37 insertions(+), 8 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 f2a4445..1540f3d 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,5 +1,7 @@
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;
@@ -9,14 +11,7 @@
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;
@@ -877,4 +872,38 @@
// return historyHourlyMapper.getDataByMac(mac,time,yearAndMonth);
// }
+
+ @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");
+ 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",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);
+ 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