From ab8c0e45bc0de2a8aa882051e2fa29d016a6cdd4 Mon Sep 17 00:00:00 2001
From: cjl <chenjl@deyt.cn>
Date: Wed, 26 Jul 2023 21:33:33 +0800
Subject: [PATCH] chore:测试提交
---
screen-job/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 155 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 148 insertions(+), 7 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 b6f156f..75d11e6 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,8 +1,10 @@
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;
+import com.moral.api.config.rest.Crc16Utils;
import com.moral.api.entity.HistoryHourly;
import com.moral.api.entity.Sensor;
import com.moral.api.mapper.HistoryHourlyMapper;
@@ -17,18 +19,19 @@
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;
@@ -44,6 +47,7 @@
* @since 2021-06-28
*/
@Service
+@Slf4j
public class HistoryHourlyServiceImpl implements HistoryHourlyService {
@Autowired
@@ -422,4 +426,141 @@
}
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();
+ String s = historyHourlyService.strList(startTime,mac,value);
+ historyHourlyService.httpResult(s);
+ int i = 0;
+ }
+
+ 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("&&");
+ 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 s = Crc16Utils.padLeftTest(String.valueOf(result.length()),4,null);
+ String s1 = Crc16Utils.crc16_2017(result, result.length());
+ return "##"+s+result+s1;
+ }
+
+ 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());
+
+
+ // ��������������������������������������� 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("������������");
+ }
+ }
+ 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());
+ outputStream.flush();
+
+ inputStream = socket.getInputStream();
+ bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
+ 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