From dc6b3a883a677e227f844a91c2d7c2a8f5f48333 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Sun, 20 Aug 2023 14:06:48 +0800
Subject: [PATCH] fix:部分配置修改
---
screen-job/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 82 ++++++++++++++++++++++------------------
1 files changed, 45 insertions(+), 37 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 4f95534..97432ce 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
@@ -4,6 +4,7 @@
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;
@@ -22,13 +23,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;
@@ -49,6 +54,8 @@
@Slf4j
public class HistoryHourlyServiceImpl implements HistoryHourlyService {
+ @Value("${result.date.changshu}")
+ private String dateChangShu;
@Autowired
private HistoryHourlyMapper historyHourlyMapper;
@@ -430,32 +437,28 @@
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()));
- }
- // 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);
+ 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);
+ }
+ for(String s : list){
+ sendSocket("222.92.166.238",15031,s);
+ }
+ log.info("������������");
}
private String strList(String startTime,String mn,String msg){
@@ -469,32 +472,37 @@
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("&&");
- return qn+stringBuffer.toString();
+ //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+"\r\n";
}
- 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;
@@ -503,14 +511,14 @@
BufferedReader bufferedReader = null;
try {
socket = new Socket(host, port);
- socket.setSoTimeout(20000);
+ socket.setSoTimeout(3000);
// ������������������������������
outputStream = socket.getOutputStream();
- outputStream.write(message.getBytes(StandardCharsets.UTF_8));
+ outputStream.write(message.getBytes());
outputStream.flush();
-
+ socket.shutdownOutput();
inputStream = socket.getInputStream();
- bufferedReader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
+ bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
String readLen=bufferedReader.readLine();
log.debug("���������������{}", readLen);
return readLen;
@@ -518,7 +526,7 @@
log.error("socket���������������{}", e.toString());
} finally {
try {
- if(bufferedReader != null){
+ if(bufferedReader != null){
bufferedReader.close();
}
if (inputStream != null) {
--
Gitblit v1.8.0