From 0ce061d9ed37a6c25fff70e4734fa8cc8747237c Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 26 Jul 2023 19:45:09 +0800
Subject: [PATCH] fix: 部分提交
---
screen-job/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 297 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 286 insertions(+), 11 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 7fe292a..4f95534 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
@@ -1,5 +1,6 @@
package com.moral.api.service.impl;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.config.mybatis.MybatisPlusConfig;
@@ -16,21 +17,25 @@
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.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.OptionalDouble;
-import java.util.Set;
+import java.io.*;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Supplier;
import java.util.stream.Collectors;
import java.util.stream.DoubleStream;
+import java.util.stream.Stream;
/**
* <p>
@@ -41,6 +46,7 @@
* @since 2021-06-28
*/
@Service
+@Slf4j
public class HistoryHourlyServiceImpl implements HistoryHourlyService {
@Autowired
@@ -58,6 +64,11 @@
@Override
public void createTable(String timeUnits) {
historyHourlyMapper.createTable(timeUnits);
+ }
+
+ @Override
+ public void createTableComplete(String timeUnits) {
+ historyHourlyMapper.createTableComplete(timeUnits);
}
@Override
@@ -236,13 +247,113 @@
* @Date: 2021/9/23
*/
@Override
- public List<HistoryHourly> getValueByMacAndTime(String mac, Date startDate, Date endDate){
+ public List<HistoryHourly> getValueByMacAndTime(String mac, Date startDate, Date endDate) {
QueryWrapper<HistoryHourly> wrapper = new QueryWrapper<>();
- wrapper.eq("mac",mac);
- wrapper.between("time",startDate,endDate);
+ wrapper.eq("mac", mac);
+ wrapper.between("time", startDate, endDate);
List<String> tableNames = MybatisPLUSUtils.getTableNamesByWrapper(startDate, endDate, SeparateTableType.MONTH);
List<HistoryHourly> datas = multiTableQuery(wrapper, tableNames);
return datas;
+ }
+
+ @Override
+ public void insertHistoryHourlyComplete() {
+ //������������������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);
+ params.put("start", start);
+ params.put("end", end);
+ //������������������������������
+ 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.getHourlyData(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> dataMap = new HashMap<>();
+ dataMap.put("mac", key);
+ dataMap.put("time", start);
+ Map<String, Object> jsonMap = new HashMap<>();
+
+
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", value);
+ map.put("type", "hourlyComplete");
+ 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());
+ }
+ }
+ }
+ Supplier<Stream<Map<String, Object>>> streamSupplier = () -> value.stream();
+ //������������������������������������
+ sensors.forEach(sensor -> {
+ Double avg = calculatedValue(streamSupplier, sensor, "avg");
+ if (Constants.SENSOR_CODE_WIND_DIR.equals(sensor.getCode())) {
+ //���������������������������
+ Map<String, Object> windDirAvg = AmendUtils.getWindDirAvg(map);
+ if (!ObjectUtils.isEmpty(windDirAvg)) {
+ avg = (Double) windDirAvg.get(Constants.SENSOR_CODE_WIND_DIR);
+ }
+ }
+ Double min = calculatedValue(streamSupplier, sensor, "min");
+ Double max = calculatedValue(streamSupplier, sensor, "max");
+ List<Double> doubles = new ArrayList<>(3);
+ if (avg != null && min != null && max != null) {
+ doubles.add(avg);
+ doubles.add(min);
+ doubles.add(max);
+ jsonMap.put(sensor.getCode(), doubles);
+ }
+ });
+ dataMap.put("value", JSONObject.toJSONString(jsonMap));
+ insertData.add(dataMap);
+ });
+
+ //������
+ String insertTimeUnits = DateUtils.dateToDateString(start, DateUtils.yyyyMM_EN);
+ //���������������
+ historyHourlyMapper.insertHistoryHourlyComplete(insertData, insertTimeUnits);
}
/**
@@ -252,7 +363,7 @@
* @Author: ���������
* @Date: 2021/9/23
*/
- private List<HistoryHourly> multiTableQuery(QueryWrapper<HistoryHourly> wrapper,List<String> tableNames){
+ private List<HistoryHourly> multiTableQuery(QueryWrapper<HistoryHourly> wrapper, List<String> tableNames) {
List<HistoryHourly> result = new ArrayList<>();
for (String tableName : tableNames) {
MybatisPlusConfig.tableName.set(tableName);
@@ -262,4 +373,168 @@
MybatisPlusConfig.tableName.remove();
return result;
}
+
+ //���������������������������������������
+ private Double calculatedValue(Supplier<Stream<Map<String, Object>>> supplier, Sensor sensor, String type) {
+ String sensorCode = sensor.getCode();
+ Double upper = sensor.getUpper();
+ Double lower = sensor.getLower();
+ DoubleStream doubleStream = supplier.get()
+ .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 ("avg".equals(type) && 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;
+ }
+ }
+ return DoubleStream.of(aDouble);
+ });
+ OptionalDouble average = null;
+ if ("avg".equals(type)) {
+ average = doubleStream.average();
+ } else if ("min".equals(type)) {
+ average = doubleStream.min();
+ } else if ("max".equals(type)) {
+ average = doubleStream.max();
+ }
+
+ if (average.isPresent()) {
+ //���������������������
+ return AmendUtils.sciCal(average.getAsDouble(), 4);
+ }
+ return null;
+ }
+
+ @Override
+ public void dateToChangShu(String time) {
+ //������������������������������
+ Date end = new Date();
+ 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"));
+ 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()));
+ }
+ // httpResult(list.get(0));
+ sendSocket("222.92.166.238",15031,list.get(0));
+ int i = 0;
+ }
+
+ 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();
+ historyHourlyService.strList(startTime,mac,value);
+ }
+
+ private String strList(String startTime,String mn,String msg){
+ String qn = "QN="+ startTime + "001;ST=22;CN=2061;PW=123456;MN="+mn.toUpperCase()+";CP=&&DataTime="+startTime+";";
+ Map<String, Object> data = JSON.parseObject(msg, Map.class);
+ StringBuffer stringBuffer = new StringBuffer();
+ if(data.size()>0){
+ data.remove("mac");
+ data.remove("time");
+ for(Map.Entry<String, Object> entry : data.entrySet()){
+ String mapKey = entry.getKey();
+ Object mapValue = entry.getValue();
+ if(mapKey.contains("e")){
+ continue;
+ }
+ if(!mapKey.contains("-Flag")){
+ stringBuffer.append(mapKey+"-Avg=").append(mapValue+",").append(mapKey+"-Flag=N;");
+ }
+ }
+ }
+ stringBuffer.deleteCharAt(stringBuffer.length()-1);
+ stringBuffer.append("&&");
+ return qn+stringBuffer.toString();
+ }
+
+ private void httpResult(String date){
+ try {
+ System.out.println(date);
+ Socket socket = new Socket(InetAddress.getByName("222.92.166.238"),15031);
+ OutputStream os = socket.getOutputStream();
+ //������������
+ os.write(date.getBytes());
+ os.close();
+ }catch (Exception e){
+ System.out.println("������"+e.getMessage());
+ }finally {
+ System.out.println("������������");
+ }
+ }
+ private static String sendSocket(String host, Integer port, String message) {
+ log.debug("���������������{}������������{}������������{}", host, port, message);
+ Socket socket = null;
+ OutputStream outputStream = null;
+ InputStream inputStream = null;
+ BufferedReader bufferedReader = null;
+ try {
+ socket = new Socket(host, port);
+ socket.setSoTimeout(20000);
+ // ������������������������������
+ outputStream = socket.getOutputStream();
+ outputStream.write(message.getBytes(StandardCharsets.UTF_8));
+ outputStream.flush();
+
+ inputStream = socket.getInputStream();
+ bufferedReader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
+ String readLen=bufferedReader.readLine();
+ log.debug("���������������{}", readLen);
+ return readLen;
+ } catch (IOException e) {
+ log.error("socket���������������{}", e.toString());
+ } finally {
+ try {
+ if(bufferedReader != null){
+ bufferedReader.close();
+ }
+ if (inputStream != null) {
+ inputStream.close();
+ }
+ if (outputStream != null) {
+ outputStream.close();
+ }
+ if (socket != null) {
+ socket.close();
+ }
+ } catch (IOException e) {
+ log.error("socket���������������{}", e.toString());
+ }
+ }
+ return null;
+ }
+
}
--
Gitblit v1.8.0