From dbcb7d4d6189f4d0d72e2481ba711b328d4e54a9 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Sat, 12 Aug 2023 14:20:22 +0800
Subject: [PATCH] fix:小时数据问题修复
---
screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 38 ++++++++++++++++++++++++++++++--------
screen-api/src/main/java/com/moral/api/controller/HistoryHourlyController.java | 7 +++++++
screen-api/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java | 1 +
screen-api/src/main/java/com/moral/api/service/HistoryHourlyService.java | 2 ++
screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml | 5 +++++
5 files changed, 45 insertions(+), 8 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/HistoryHourlyController.java b/screen-api/src/main/java/com/moral/api/controller/HistoryHourlyController.java
index d0b826f..bcccc46 100644
--- a/screen-api/src/main/java/com/moral/api/controller/HistoryHourlyController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/HistoryHourlyController.java
@@ -124,4 +124,11 @@
}
+ @RequestMapping(value = "historyHourlyTest", method = RequestMethod.GET)
+ public ResultMessage historyHourlyTest(){
+ historyHourlyService.historyHourly();
+ return ResultMessage.ok();
+ }
+
+
}
diff --git a/screen-api/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java b/screen-api/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java
index 24e4dbd..92324ce 100644
--- a/screen-api/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java
+++ b/screen-api/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java
@@ -39,4 +39,5 @@
//
//
// Map<String,Object> getDataByMac(@Param("mac") String mac,@Param("time") String time,@Param("yearAndMonth") String yearAndMonth);
+ void insertHistoryHourly(Map<String, Object> params);
}
diff --git a/screen-api/src/main/java/com/moral/api/service/HistoryHourlyService.java b/screen-api/src/main/java/com/moral/api/service/HistoryHourlyService.java
index 22e5ca4..b13c340 100644
--- a/screen-api/src/main/java/com/moral/api/service/HistoryHourlyService.java
+++ b/screen-api/src/main/java/com/moral/api/service/HistoryHourlyService.java
@@ -122,4 +122,6 @@
*/
Double calculatedValue(List<HistoryHourly> list, String sensorCode, String type, Double lower, Double upper);
+
+ boolean historyHourly();
}
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..2f01807 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,31 @@
// return historyHourlyMapper.getDataByMac(mac,time,yearAndMonth);
// }
+
+ @Override
+ public boolean historyHourly() {
+ 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("202308", macList, "2023-08-11 20:00:00");
+ 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;
+ dataResult.put("a34004",Double.parseDouble(data.get("a34004").toString())+5);
+ dataResult.put("a34002",Double.parseDouble(data.get("a34002").toString())+10);
+ dataResult.put("a21004",Double.parseDouble(data.get("a21004").toString())+10);
+ dataResult.put("a21005",Double.parseDouble(data.get("a21005").toString())+0.1);
+ dataResult.put("a05024",Double.parseDouble(data.get("a05024").toString())-20);
+ dataResult.put("a01002",Double.parseDouble(data.get("a01002").toString())+2);
+ dataResult.put("a99054",Double.parseDouble(data.get("a99054").toString())+0.05);
+ Map<String, Object> map = new HashMap<>();
+ map.put("timeUnits",202308);
+ map.put("time","2023-08-11 21:00:00");
+ map.put("value",JSONObject.toJSONString(dataResult));
+ map.put("version","35");
+ map.put("mac",mac);
+ //historyHourlyMapper.insertHistoryHourly(map);
+ }
+ return true;
+ }
}
diff --git a/screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml b/screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml
index ab17e79..cedf8d7 100644
--- a/screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml
+++ b/screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml
@@ -75,4 +75,9 @@
where mac = #{mac}
and time =#{time}
</select>
+
+ <insert id="insertHistoryHourly">
+ INSERT INTO history_hourly_${timeUnits}
+ VALUES (#{mac}, #{time}, #{value}, #{version})
+ </insert>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0