From 3d685203e77cd8deb2982856ee70f4d51d7ce8db Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Fri, 20 May 2022 11:33:42 +0800
Subject: [PATCH] 千灯转发数据添加恶臭两台微站数据
---
src/main/java/com/moral/task/RabbitMQInsertTask.java | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/moral/task/RabbitMQInsertTask.java b/src/main/java/com/moral/task/RabbitMQInsertTask.java
index e34b589..d0d0bcd 100644
--- a/src/main/java/com/moral/task/RabbitMQInsertTask.java
+++ b/src/main/java/com/moral/task/RabbitMQInsertTask.java
@@ -1,5 +1,6 @@
package com.moral.task;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
@@ -256,7 +257,7 @@
minutelyData.put("timeType", "minutely");
for (String key : deviceData.keySet()) {
if (!key.equals("mac") && !key.startsWith("M")) {
- String date = deviceData.get(key).toString() + "," + deviceData.get("MIN" + key).toString() + "," + deviceData.get("MAX" + key).toString();
+ String date = deviceData.get(key).toString() + "," + new BigDecimal(new String((byte[]) (deviceData.get("MIN" + key)))) + "," + new BigDecimal(new String((byte[]) (deviceData.get("MAX" + key))));
minutelyData.put(key, date);
}
}
@@ -306,9 +307,6 @@
XxlJobLogger.log("RabbitMQHourlyData:" + hourlyDataList.size());
if (!CollectionUtils.isEmpty(hourlyDataList)) {
if(!(hourlyDataList.size()==macList.size())){
- System.out.println(hourlyDataList.size()+" "+macList.size());
- System.out.println(hourlyDataList);
- System.out.println(macList);
List<String> macList_copy = macList;
if (hourlyDataList.size()<macList.size()){
for (Map hourData: hourlyDataList) {
@@ -319,13 +317,23 @@
}
}
}
- List<Map<String, Object>> deviceList = deviceService.getAllByMacList(macList_copy);
- System.out.println(deviceList);
- List<String> de = new ArrayList<>();
- for (Map deviceMap:deviceList) {
- de.add(deviceMap.get("name").toString());
+ List<String> ignoreMacList = new ArrayList();
+ ignoreMacList.add("p5dnd7a0392130");
+ for (String ignoreMac:ignoreMacList) {
+ for (int d=0;d<macList_copy.size();d++){
+ if (macList_copy.get(d).equals(ignoreMac)){
+ macList_copy.remove(d);
+ }
+ }
}
- AlarmUtils_2.sendMail("276999030@qq.com,245285408@qq.com","������������",de.toString()+"���������������������");
+ if (macList_copy.size()!=0){
+ List<Map<String, Object>> deviceList = deviceService.getAllByMacList(macList_copy);
+ List<String> de = new ArrayList<>();
+ for (Map deviceMap:deviceList) {
+ de.add(deviceMap.get("name").toString());
+ }
+ AlarmUtils_2.sendMail("chenxi18913261648@163.com,1vv_zkk6ji3kln@dingtalk.com,liumiao_love@126.com","������������",de.toString()+"���������������������");
+ }
}
for (Map<String, Object> deviceData : hourlyDataList) {
if (!ObjectUtils.isEmpty(deviceData)) {
--
Gitblit v1.8.0