From 6a8b22c541448dbe15eb1b046dbf456131c2f325 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 12 Nov 2021 11:38:25 +0800
Subject: [PATCH] screen-api 添加获取今年天气污染情况饼状图接口
---
screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 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 8fe48a8..68fcd33 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
@@ -7,6 +7,7 @@
import com.moral.api.websocket.SingleDeviceServer;
import com.moral.util.UnitConvertUtils;
import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
import org.apache.kafka.clients.consumer.Consumer;
import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.apache.kafka.common.TopicPartition;
@@ -31,13 +32,14 @@
* @Version TODO
**/
@Component
+@Slf4j
public class SecondDataConsumer implements ConsumerSeekAware {
- @KafkaListener(containerFactory = "secondDataListenerFactory",topics = "second_data")
+ @KafkaListener(containerFactory = "secondDataListenerFactory", topics = "second_data")
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
@@ -46,8 +48,7 @@
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<>();
//������������
@@ -58,10 +59,22 @@
String showUnitKey = sensor.getShowUnitKey();
String unitKey = sensor.getUnitKey();
String unit = sensor.getUnit();
+ //���������������������������������������������
+ Object value = message.get(code);
//������������������������������������������������
- Double sourceDataD = Double.valueOf(String.valueOf(message.get(code)));
+ /*if(value==null) ���������
+ continue;
+ Double sourceDataD = Double.valueOf(String.valueOf(value));*/
+ //��������������������������������������������� start
+ Double sourceDataD = null;
+ if (value != null) {
+ sourceDataD = Double.valueOf(String.valueOf(value));
+ }else{
+ sourceDataD = 5.00d;
+ }
+ //��������������������������������������������� end
BigDecimal bg = new BigDecimal(sourceDataD);
- bg = bg.setScale(2,BigDecimal.ROUND_FLOOR);
+ bg = bg.setScale(2, BigDecimal.ROUND_FLOOR);
String sourceData = bg.toString();
//������������
//������������
@@ -85,15 +98,17 @@
resultMessgae.put(sensor.getCode(), resultData);
} else {
//������������
- sourceData = sourceData + " " + showUnit;
+ if(!showUnit.equals("���������"))
+ sourceData = sourceData + " " + showUnit;
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