From 247e9203e92423930bee311af18c355400a9b57b Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Mon, 01 Apr 2024 10:01:55 +0800
Subject: [PATCH] fix：和风数据修复
---
screen-job/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 338 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 326 insertions(+), 12 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
index f89f726..fb88eaf 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
@@ -5,8 +5,10 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.config.mybatis.MybatisPlusConfig;
import com.moral.api.config.rest.Crc16Utils;
+import com.moral.api.entity.Device;
import com.moral.api.entity.HistoryHourly;
import com.moral.api.entity.Sensor;
+import com.moral.api.mapper.DeviceMapper;
import com.moral.api.mapper.HistoryHourlyMapper;
import com.moral.api.mapper.HistoryMinutelyMapper;
import com.moral.api.service.HistoryHourlyService;
@@ -16,24 +18,16 @@
import com.moral.constant.SeparateTableType;
import com.moral.util.AmendUtils;
import com.moral.util.DateUtils;
-
import com.moral.util.MybatisPLUSUtils;
-
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.methods.PostMethod;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
-
import java.io.*;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
+import java.math.BigDecimal;
import java.net.Socket;
-import java.net.SocketAddress;
-import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Supplier;
@@ -57,6 +51,9 @@
private String dateChangShu;
@Autowired
private HistoryHourlyMapper historyHourlyMapper;
+
+ @Autowired
+ private DeviceMapper deviceMapper;
@Autowired
private RedisTemplate redisTemplate;
@@ -238,6 +235,7 @@
//���������������
historyHourlyMapper.insertHistoryHourly(insertData);
+
}
@Override
@@ -447,16 +445,323 @@
List<Map<String, Object>> dailyData = this.selectDailyData(prop);
String startTimeStr = DateUtils.dateToDateString(DateUtils.addHours(end,-1),"yyyyMMddHH")+"0000";
List<String> list = new ArrayList<>();
+
for(Map<String, Object> m : dailyData){
String result = strList(startTimeStr,m.get("mac").toString(),m.get("value").toString());
list.add(result);
+ redisTemplate.opsForHash().delete(RedisConstants.DATE_CHANG_SHU,m.get("mac").toString());
redisTemplate.opsForHash().put(RedisConstants.DATE_CHANG_SHU,m.get("mac").toString(),result);
}
- // httpResult(list.get(0));
for(String s : list){
sendSocket("222.92.166.238",15031,s);
}
log.info("������������");
+ }
+
+ /**
+ * ������������������������������
+ */
+ @Override
+ public void dateInsertHistoryHourlyAvg() {
+ QueryWrapper<Device> wrapper = new QueryWrapper<>();
+ wrapper.select("mac");
+ wrapper.eq("organization_id",71);
+ wrapper.eq("is_delete",Constants.NOT_DELETE);
+ List<Device> devices = deviceMapper.selectList(wrapper);
+ ArrayList<String> macs = new ArrayList<>();
+ for (Device device : devices) {
+ macs.add(device.getMac());
+ }
+ //������������������yyyy-MM-dd HH:mm
+ String format = DateUtils.yyyy_MM_dd_HH_EN;
+ Date now = new Date();
+
+ //������������������������������
+ Map<String, Object> params = new HashMap<>();
+ //������������
+ Date start = DateUtils.dataToTimeStampTime(DateUtils.addHours(now, -1), format);
+ //������������
+ Date end = DateUtils.dataToTimeStampTime(now, format);
+// String start1= "2023-08-18 03:00:00";
+// String end1 = "2023-08-18 04:00:00";
+// Date date1 = DateUtils.getDate(start1, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
+// Date date2 = DateUtils.getDate(end1, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
+
+ params.put("start", start);
+ params.put("end", end);
+ params.put("macs",macs);
+ //������������������������������
+ String timeUnits = DateUtils.dateToDateString(start, DateUtils.yyyyMM_EN);
+ params.put("timeUnits", timeUnits);
+
+ //������
+ QueryWrapper<Sensor> sensorQueryWrapper = new QueryWrapper<>();
+ sensorQueryWrapper.select("code", "lower", "upper").eq("is_delete", Constants.NOT_DELETE);
+ List<Sensor> sensors = sensorService.list(sensorQueryWrapper);
+ // ������������������������������������������������
+ List<Map<String, Object>> hourlyData = historyMinutelyMapper.getHistoryMinutelyData(params);
+ if (ObjectUtils.isEmpty(hourlyData)) {
+ return;
+ }
+ //���mac������
+ Map<String, List<Map<String, Object>>> data = hourlyData.parallelStream()
+ .collect(Collectors.groupingBy(o -> (String) o.get("mac")));
+ //���������������������������
+ List<Map<String, Object>> insertData = new ArrayList<>();
+ data.forEach((key, value) -> {
+ Map<String, Object> historyHourly = new HashMap<>();
+ historyHourly.put("mac", key);
+ historyHourly.put("time",start);
+
+ Map<String, Object> jsonMap = new HashMap<>();
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", value);
+ map.put("type", "hour");
+
+ for (Sensor sensor : sensors) {
+ String sensorCode = sensor.getCode();
+
+ //���������������
+ if (sensorCode.equals(Constants.SENSOR_CODE_WIND_DIR)) {
+ if (sensor.getUpper() != null) {
+ map.put("windDirUpper", sensor.getUpper());
+ }
+ if (sensor.getLower() != null) {
+ map.put("windDirLower", sensor.getLower());
+ }
+ }
+
+ //���������������
+ if (sensorCode.equals(Constants.SENSOR_CODE_WIND_SPEED)) {
+ if (sensor.getUpper() != null) {
+ map.put("windSpeedUpper", sensor.getUpper());
+ }
+ if (sensor.getLower() != null) {
+ map.put("windSpeedLower", sensor.getLower());
+ }
+ }
+ }
+
+ //���������������������������
+ Map<String, Object> windDirAvg = AmendUtils.getWindDirAvg(map);
+ if (!ObjectUtils.isEmpty(windDirAvg)) {
+ jsonMap.putAll(windDirAvg);
+ }
+
+ //������������������������������������
+ sensors.forEach(sensor -> {
+ String sensorCode = sensor.getCode();
+ Double upper = sensor.getUpper();
+ Double lower = sensor.getLower();
+ AtomicInteger size = new AtomicInteger();
+ DoubleStream optionalDouble = value.parallelStream()
+ .flatMapToDouble(v -> {
+ Map<String, Object> dataValue = JSONObject.parseObject((String) v.get("value"), Map.class);
+ Object sensorValue = dataValue.get(sensorCode);
+ //������������������������
+ Object flag = dataValue.get(sensorCode + "-" + Constants.MARKER_BIT_KEY);
+ if (!Constants.MARKER_BIT_TRUE.equals(flag)) {
+ return null;
+ }
+
+ if (ObjectUtils.isEmpty(sensorValue)) {
+ return null;
+ }
+
+ //������������������
+ if (Constants.SENSOR_CODE_WIND_DIR.equals(sensorCode)) {
+ return null;
+ }
+
+ //������������������������������������
+ double aDouble = Double.parseDouble(sensorValue.toString());
+ if (!ObjectUtils.isEmpty(upper)) {
+ if (aDouble < upper) {
+ return null;
+ }
+ }
+ if (!ObjectUtils.isEmpty(lower)) {
+ if (aDouble > lower) {
+ return null;
+ }
+ }
+ size.getAndIncrement();
+ return DoubleStream.of(aDouble);
+ });
+ OptionalDouble average = optionalDouble.average();
+ if (average.isPresent()) {
+ //���������������������
+ double sciCal = AmendUtils.sciCal(average.getAsDouble(), 4);
+ jsonMap.put(sensorCode, sciCal);
+ //���������
+ if (size.get() >= 45) {
+ jsonMap.put(sensorCode + "-" + Constants.MARKER_BIT_KEY, Constants.MARKER_BIT_TRUE);
+ } else {
+ jsonMap.put(sensorCode + "-" + Constants.MARKER_BIT_KEY, Constants.MARKER_BIT_FALSE);
+ }
+ }
+ });
+ historyHourly.put("version", value.get(0).get("version"));
+ historyHourly.put("value", JSONObject.toJSONString(jsonMap));
+ insertData.add(historyHourly);
+ });
+ //���������������
+ historyHourlyMapper.insertHistoryHourlyAvg(insertData,timeUnits);
+
+ }
+
+ /**
+ * ���������������������������������
+ */
+ @Override
+ public void dateInsertHistoryHourlyJKAvg(String start,String end) {
+ QueryWrapper<Device> wrapper = new QueryWrapper<>();
+ wrapper.select("mac");
+ wrapper.eq("organization_id",72);
+ wrapper.eq("is_delete",Constants.NOT_DELETE);
+ List<Device> devices = deviceMapper.selectList(wrapper);
+ ArrayList<String> macs = new ArrayList<>();
+ for (Device device : devices) {
+ macs.add(device.getMac());
+ }
+ //������������������������������
+ Map<String, Object> params = new HashMap<>();
+ Date startTime;
+ Date endTime;
+ if (!ObjectUtils.isEmpty(start) && !ObjectUtils.isEmpty(end)){
+ startTime = DateUtils.getDate(start, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
+ endTime = DateUtils.getDate(end, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
+ }else {
+ //������������������yyyy-MM-dd HH:mm
+ String format = DateUtils.yyyy_MM_dd_HH_EN;
+ Date now = new Date();
+ //������������
+ startTime = DateUtils.dataToTimeStampTime(DateUtils.addHours(now, -1), format);
+ //������������
+ endTime = DateUtils.dataToTimeStampTime(now, format);
+ }
+
+ params.put("start", startTime);
+ params.put("end", endTime);
+ params.put("macs",macs);
+ //������������������������������
+ String timeUnits = DateUtils.dateToDateString(startTime, DateUtils.yyyyMM_EN);
+ params.put("timeUnits", timeUnits);
+
+ //������
+ QueryWrapper<Sensor> sensorQueryWrapper = new QueryWrapper<>();
+ sensorQueryWrapper.select("code", "lower", "upper").eq("is_delete", Constants.NOT_DELETE);
+ List<Sensor> sensors = sensorService.list(sensorQueryWrapper);
+ // ������������������������������������������������������
+ List<Map<String, Object>> hourlyData = historyMinutelyMapper.getHistoryMinutelyData(params);
+ if (ObjectUtils.isEmpty(hourlyData)) {
+ return;
+ }
+ //���mac������
+ Map<String, List<Map<String, Object>>> data = hourlyData.parallelStream()
+ .collect(Collectors.groupingBy(o -> (String) o.get("mac")));
+ //���������������������������
+ List<Map<String, Object>> insertData = new ArrayList<>();
+ data.forEach((key, value) -> {
+ Map<String, Object> historyHourly = new HashMap<>();
+ historyHourly.put("mac", key);
+ historyHourly.put("time",startTime);
+
+ Map<String, Object> jsonMap = new HashMap<>();
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", value);
+ map.put("type", "hour");
+
+ for (Sensor sensor : sensors) {
+ String sensorCode = sensor.getCode();
+
+ //���������������
+ if (sensorCode.equals(Constants.SENSOR_CODE_WIND_DIR)) {
+ if (sensor.getUpper() != null) {
+ map.put("windDirUpper", sensor.getUpper());
+ }
+ if (sensor.getLower() != null) {
+ map.put("windDirLower", sensor.getLower());
+ }
+ }
+
+ //���������������
+ if (sensorCode.equals(Constants.SENSOR_CODE_WIND_SPEED)) {
+ if (sensor.getUpper() != null) {
+ map.put("windSpeedUpper", sensor.getUpper());
+ }
+ if (sensor.getLower() != null) {
+ map.put("windSpeedLower", sensor.getLower());
+ }
+ }
+ }
+
+ //���������������������������
+ Map<String, Object> windDirAvg = AmendUtils.getWindDirAvg(map);
+ if (!ObjectUtils.isEmpty(windDirAvg)) {
+ jsonMap.putAll(windDirAvg);
+ }
+
+ //������������������������������������
+ sensors.forEach(sensor -> {
+ String sensorCode = sensor.getCode();
+ Double upper = sensor.getUpper();
+ Double lower = sensor.getLower();
+ AtomicInteger size = new AtomicInteger();
+ DoubleStream optionalDouble = value.parallelStream()
+ .flatMapToDouble(v -> {
+ Map<String, Object> dataValue = JSONObject.parseObject((String) v.get("value"), Map.class);
+ Object sensorValue = dataValue.get(sensorCode);
+ //������������������������
+ Object flag = dataValue.get(sensorCode + "-" + Constants.MARKER_BIT_KEY);
+ if (!Constants.MARKER_BIT_TRUE.equals(flag)) {
+ return null;
+ }
+
+ if (ObjectUtils.isEmpty(sensorValue)) {
+ return null;
+ }
+
+ //������������������
+ if (Constants.SENSOR_CODE_WIND_DIR.equals(sensorCode)) {
+ return null;
+ }
+
+ //������������������������������������
+ double aDouble = Double.parseDouble(sensorValue.toString());
+ if (!ObjectUtils.isEmpty(upper)) {
+ if (aDouble < upper) {
+ return null;
+ }
+ }
+ if (!ObjectUtils.isEmpty(lower)) {
+ if (aDouble > lower) {
+ return null;
+ }
+ }
+ size.getAndIncrement();
+ return DoubleStream.of(aDouble);
+ });
+ OptionalDouble average = optionalDouble.average();
+ if (average.isPresent()) {
+ //���������������������
+ double sciCal = AmendUtils.sciCal(average.getAsDouble(), 4);
+ jsonMap.put(sensorCode, sciCal);
+ //���������
+ if (size.get() >= 45) {
+ jsonMap.put(sensorCode + "-" + Constants.MARKER_BIT_KEY, Constants.MARKER_BIT_TRUE);
+ } else {
+ jsonMap.put(sensorCode + "-" + Constants.MARKER_BIT_KEY, Constants.MARKER_BIT_FALSE);
+ }
+ }
+ });
+ historyHourly.put("version", value.get(0).get("version"));
+ historyHourly.put("value", JSONObject.toJSONString(jsonMap));
+ insertData.add(historyHourly);
+ });
+ //���������������
+ historyHourlyMapper.insertHistoryHourlyAvg(insertData,timeUnits);
+
}
private String strList(String startTime,String mn,String msg){
@@ -479,8 +784,8 @@
}
if(!mapKey.contains("-Flag")){
if(mapKey.contains("a34002")||mapKey.contains("a34004")||mapKey.contains("a21026")||mapKey.contains("a21004")||mapKey.contains("a05024")){
- Double d = Objects.nonNull(mapValue)?Double.valueOf(mapValue.toString())/1000:0d;
- mapValue = d;
+ BigDecimal d = Objects.nonNull(mapValue)? BigDecimal.valueOf(Double.valueOf(mapValue.toString())).divide(BigDecimal.valueOf(1000)):BigDecimal.ZERO;
+ mapValue = d.toString();
}
if(mapKey.contains("a00e13")){
mapKey = "a90085";
@@ -501,6 +806,15 @@
return "##"+s+result+s1+"\r\n";
}
+ public static void main(String[] args) {
+ String result = "QN=20231019000100001;ST=31;CN=2051;PW=123456;MN=P5DND7A0392082;Flag=4;CP=&&DataTime=20231019000100;a01001-Avg=25.0,a01001-Flag=N;a01002-Avg=61.0,a01002-Flag=N;a34004-Avg=19.3,a34004-Flag=N;a34002-Avg=38.5,a34002-Flag=N;a34001-Avg=41.2,a34001-Flag=N;a01007-Avg=0.00,a01007-Flag=N;a01008-Avg=137.53,a01008-Flag=N;a01006-Avg=4255.774,a01006-Flag=T;a00e13-Avg=39.2,a00e13-Flag=N&&";
+
+ String s = Crc16Utils.padLeftTest(String.valueOf(result.length()),4,null);
+ String s1 = Crc16Utils.crc16_2017(result, result.length());
+ System.out.println("##"+s+result+s1+"\r\n");
+ int i = 0;
+ }
+
private static String sendSocket(String host, Integer port, String message) {
log.debug("���������������{}������������{}������������{}", host, port, message);
Socket socket = null;
--
Gitblit v1.8.0