From ab061be50b7653531cbe134416c3ebdd876e4791 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 19 Oct 2023 13:56:17 +0800
Subject: [PATCH] fix:风场数据范围提交
---
screen-job/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 249 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 199 insertions(+), 50 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 75d11e6..f0cb4d7 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;
@@ -23,13 +25,17 @@
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.math.BigDecimal;
import java.net.InetAddress;
+import java.net.InetSocketAddress;
import java.net.Socket;
+import java.net.SocketAddress;
import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
@@ -50,8 +56,13 @@
@Slf4j
public class HistoryHourlyServiceImpl implements HistoryHourlyService {
+ @Value("${result.date.changshu}")
+ private String dateChangShu;
@Autowired
private HistoryHourlyMapper historyHourlyMapper;
+
+ @Autowired
+ private DeviceMapper deviceMapper;
@Autowired
private RedisTemplate redisTemplate;
@@ -233,6 +244,7 @@
//���������������
historyHourlyMapper.insertHistoryHourly(insertData);
+
}
@Override
@@ -431,34 +443,180 @@
public void dateToChangShu(String time) {
//������������������������������
Date end = new Date();
+ List<String> stringList = Arrays.asList(dateChangShu.split(","));
String startTime = DateUtils.dateToDateString(DateUtils.addHours(end,-1),DateUtils.yyyy_MM_dd_HH_EN)+":00:00";
Map<String, Object> prop = new HashMap<>();
String timeUnits = DateUtils.dateToDateString(end, DateUtils.yyyyMM_EN);
prop.put("timeUnits", timeUnits);
prop.put("start", startTime);
prop.put("end", DateUtils.dateToDateString(end,DateUtils.yyyy_MM_dd_HH_EN)+":00:00");
- prop.put("list", Arrays.asList("p5dnd7a0245358"));
+ prop.put("list", stringList);
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){
- list.add(strList(startTimeStr,m.get("mac").toString(),m.get("value").toString()));
+ 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));
- sendSocket("222.92.166.238",15031,list.get(0));
- int i = 0;
+ for(String s : list){
+ sendSocket("222.92.166.238",15031,s);
+ }
+ log.info("������������");
}
- public static void main(String[] args) {
- Date end = new Date();
- String startTime = DateUtils.dateToDateString(DateUtils.addHours(end,-1),DateUtils.yyyyMMddHHmmss_EN);
- String value = "{\"mac\": \"p5dnd7a0391978\", \"time\": 1690354822594, \"a00e03\": 1280.64, \"a00e04\": 4.49, \"a00e12\": 7473.89, \"a00e13\": 60.04, \"a01001\": 35.74, \"a01002\": 62.91, \"a01006\": 803.2987, \"a01007\": 0.93, \"a01008\": 141.69, \"a05024\": 140.89, \"a21001\": 0.13132, \"a21004\": 31.67, \"a21005\": 0.03161, \"a21026\": 118.09, \"a21028\": 0.00832, \"a31001\": 0, \"a34002\": 7.91, \"a34004\": 6.92, \"a99054\": 0.02583, \"a00e03-Flag\": \"N\", \"a00e04-Flag\": \"N\", \"a00e12-Flag\": \"N\", \"a00e13-Flag\": \"N\", \"a01001-Flag\": \"N\", \"a01002-Flag\": \"N\", \"a01006-Flag\": \"N\", \"a01007-Flag\": \"N\", \"a01008-Flag\": \"N\", \"a05024-Flag\": \"N\", \"a21001-Flag\": \"N\", \"a21004-Flag\": \"N\", \"a21005-Flag\": \"N\", \"a21026-Flag\": \"N\", \"a21028-Flag\": \"N\", \"a31001-Flag\": \"N\", \"a34002-Flag\": \"N\", \"a34004-Flag\": \"N\", \"a99054-Flag\": \"N\"}";
- String time = "2023-07-26 14:00:00.0";
- String mac = "p5dnd7a0391978";
- HistoryHourlyServiceImpl historyHourlyService = new HistoryHourlyServiceImpl();
- String s = historyHourlyService.strList(startTime,mac,value);
- historyHourlyService.httpResult(s);
- int i = 0;
+ /**
+ * ������������������������������
+ */
+ @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);
+
}
private String strList(String startTime,String mn,String msg){
@@ -472,55 +630,46 @@
String mapKey = entry.getKey();
Object mapValue = entry.getValue();
if(mapKey.contains("e")){
- continue;
+ if(mapKey.contains("a00e12")||mapKey.contains("a00e13")){
+
+ }else {
+ continue;
+ }
+
}
if(!mapKey.contains("-Flag")){
+ if(mapKey.contains("a34002")||mapKey.contains("a34004")||mapKey.contains("a21026")||mapKey.contains("a21004")||mapKey.contains("a05024")){
+ 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";
+ }
stringBuffer.append(mapKey+"-Avg=").append(mapValue+",").append(mapKey+"-Flag=N;");
}
+
}
}
stringBuffer.deleteCharAt(stringBuffer.length()-1);
stringBuffer.append("&&");
- String result = "QN=20230726160000001;ST=22;CN=2061;PW=123456;MN=P5DND7A0391978;CP=&&DataTime=20230726160000;a21005-Avg=0.03072,a21005-Flag=N;a21004-Avg=20.6,a21004-Flag=N;a21026-Avg=140.43,a21026-Flag=N;a21028-Avg=0.00778,a21028-Flag=N;a21001-Avg=0.13132,a21001-Flag=N;a01001-Avg=38.68,a01001-Flag=N;a05024-Avg=116.27,a05024-Flag=N;a01002-Avg=57.47,a01002-Flag=N;a01007-Avg=0.864,a01007-Flag=N;a01006-Avg=811.918,a01006-Flag=N;a01008-Avg=156.66,a01008-Flag=N;a34002-Avg=9.18,a34002-Flag=N;a34004-Avg=8.1,a34004-Flag=N;a99054-Avg=0.02283,a99054-Flag=N;a31001-Avg=0,a31001-Flag=N&&";
+ //String result = "QN=20230726160000001;ST=22;CN=2061;PW=123456;MN=P5DND7A0391978;CP=&&DataTime=20230726160000;a21005-Avg=0.03072,a21005-Flag=N;a21004-Avg=20.6,a21004-Flag=N;a21026-Avg=140.43,a21026-Flag=N;a21028-Avg=0.00778,a21028-Flag=N;a21001-Avg=0.13132,a21001-Flag=N;a01001-Avg=38.68,a01001-Flag=N;a05024-Avg=116.27,a05024-Flag=N;a01002-Avg=57.47,a01002-Flag=N;a01007-Avg=0.864,a01007-Flag=N;a01006-Avg=811.918,a01006-Flag=N;a01008-Avg=156.66,a01008-Flag=N;a34002-Avg=9.18,a34002-Flag=N;a34004-Avg=8.1,a34004-Flag=N;a99054-Avg=0.02283,a99054-Flag=N;a31001-Avg=0,a31001-Flag=N&&";
- //String result = qn+stringBuffer.toString();
+ String result = qn+stringBuffer.toString();
String s = Crc16Utils.padLeftTest(String.valueOf(result.length()),4,null);
String s1 = Crc16Utils.crc16_2017(result, result.length());
- return "##"+s+result+s1;
+ return "##"+s+result+s1+"\r\n";
}
- private void httpResult(String date){
- try {
- System.out.println(date);
- Socket socket = new Socket(InetAddress.getByName("127.0.0.1"),5656);
- OutputStream os = socket.getOutputStream();
- //������������
- os.write(date.getBytes());
+ 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&&";
-
- // ��������������������������������������� Socket ���������
- InputStream in = socket.getInputStream();
- byte[] buf = new byte[1024];
-
- int len = in.read(buf);
-
- String text = new String(buf, 0, len);
-
- System.out.println(text);
-
- socket.close();
-
-
-
-
-
- }catch (Exception e){
- System.out.println("������"+e.getMessage());
- }finally {
- System.out.println("������������");
- }
+ 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;
@@ -529,12 +678,12 @@
BufferedReader bufferedReader = null;
try {
socket = new Socket(host, port);
- socket.setSoTimeout(20000);
+ socket.setSoTimeout(3000);
// ������������������������������
outputStream = socket.getOutputStream();
outputStream.write(message.getBytes());
outputStream.flush();
-
+ socket.shutdownOutput();
inputStream = socket.getInputStream();
bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
String readLen=bufferedReader.readLine();
--
Gitblit v1.8.0