From 1a529c3f8a623eb3e10ff6c7dcb99e79bbd451f0 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Wed, 01 Sep 2021 09:52:11 +0800
Subject: [PATCH] 修改因子更新特殊设备警报信息
---
screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java b/screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java
index c105c2f..aa5bcc7 100644
--- a/screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java
+++ b/screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java
@@ -17,6 +17,7 @@
import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;
+import java.math.BigDecimal;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -36,17 +37,16 @@
public void listen(ConsumerRecord<String, String> record, Consumer consumer) throws Exception {
String messageStr = record.value();
Map<String, Object> message = (Map<String, Object>) JSON.parse(messageStr);
- long serverStartTime = System.currentTimeMillis();
+ //long serverStartTime = System.currentTimeMillis();
CopyOnWriteArraySet<SingleDeviceServer> sockets = SingleDeviceServer.sockets;
for (SingleDeviceServer socket : sockets) {
- //���������������������������socket
+ //���������������������������socket
String messageMac = (String) message.get("mac");
String mac = socket.getMac();
if (!mac.equalsIgnoreCase(messageMac))
continue;
//������������������
- Map<String, Device> devicesInfo = socket.getDevicesInfo();
- Device device = devicesInfo.get(mac);
+ Device device = socket.getDeviceAlarmInfo();
//������������������������
Map<String, Object> resultMessgae = new HashMap<>();
//������������
@@ -57,7 +57,11 @@
String showUnitKey = sensor.getShowUnitKey();
String unitKey = sensor.getUnitKey();
String unit = sensor.getUnit();
- String sourceData = String.valueOf(message.get(code));
+ //������������������������������������������������
+ Double sourceDataD = Double.valueOf(String.valueOf(message.get(code)));
+ BigDecimal bg = new BigDecimal(sourceDataD);
+ bg = bg.setScale(2,BigDecimal.ROUND_FLOOR);
+ String sourceData = bg.toString();
//������������
//������������
if (!unitKey.equals(showUnitKey)) {//������������������������������������������������������������
@@ -84,11 +88,12 @@
resultMessgae.put(sensor.getCode(), sourceData);
}
}
- resultMessgae.put("DataTime", message.get("DataTime"));
- resultMessgae.put("time", message.get("time"));
- resultMessgae.put("time1", message.get("time1"));
- resultMessgae.put("serverTime", System.currentTimeMillis());
- resultMessgae.put("serverStartTime", serverStartTime);
+ //���������������������������������
+ //resultMessgae.put("DataTime", message.get("DataTime"));
+ //resultMessgae.put("time", message.get("time"));
+ //resultMessgae.put("time1", message.get("time1"));
+ //resultMessgae.put("serverTime", System.currentTimeMillis());
+ //resultMessgae.put("serverStartTime", serverStartTime);
socket.sendMessage(JSON.toJSONString(resultMessgae));
}
}
--
Gitblit v1.8.0