From 55bddeb7f2bb55498e9ac179b3c9d513d558b7c7 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 01 Sep 2021 11:02:43 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java | 79 ++++++++++++++++++++++++++++++++++++---
1 files changed, 73 insertions(+), 6 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 6865acf..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
@@ -1,14 +1,25 @@
package com.moral.api.kafka.consumer;
import com.alibaba.fastjson.JSON;
+import com.moral.api.entity.Device;
+import com.moral.api.entity.Sensor;
+import com.moral.api.entity.UnitConversion;
import com.moral.api.websocket.SingleDeviceServer;
+import com.moral.util.UnitConvertUtils;
+import lombok.AllArgsConstructor;
import org.apache.kafka.clients.consumer.Consumer;
import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.apache.kafka.common.TopicPartition;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.kafka.annotation.KafkaListener;
import org.springframework.kafka.listener.ConsumerSeekAware;
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;
import java.util.concurrent.CopyOnWriteArraySet;
@@ -19,18 +30,72 @@
* @Date 2021/6/15 14:49
* @Version TODO
**/
-//@Component
+@Component
public class SecondDataConsumer implements ConsumerSeekAware {
- @KafkaListener(topics = "second_data",groupId = "SecondsDataGroup3")
- public void listen(ConsumerRecord<String, String> record , Consumer consumer) throws Exception {
+ @KafkaListener(containerFactory = "secondDataListenerFactory",topics = "second_data")
+ public void listen(ConsumerRecord<String, String> record, Consumer consumer) throws Exception {
String messageStr = record.value();
- Map<String,String> message = (Map<String,String>)JSON.parse(messageStr);
+ Map<String, Object> message = (Map<String, Object>) JSON.parse(messageStr);
+ //long serverStartTime = System.currentTimeMillis();
CopyOnWriteArraySet<SingleDeviceServer> sockets = SingleDeviceServer.sockets;
for (SingleDeviceServer socket : sockets) {
- socket.sendMessage(message.toString());
+ //���������������������������socket
+ String messageMac = (String) message.get("mac");
+ String mac = socket.getMac();
+ if (!mac.equalsIgnoreCase(messageMac))
+ continue;
+ //������������������
+ Device device = socket.getDeviceAlarmInfo();
+ //������������������������
+ Map<String, Object> resultMessgae = new HashMap<>();
+ //������������
+ List<Sensor> sensors = device.getVersion().getSensors();//������������������������������
+ for (Sensor sensor : sensors) {
+ String code = sensor.getCode();
+ String showUnit = sensor.getShowUnit();
+ String showUnitKey = sensor.getShowUnitKey();
+ String unitKey = sensor.getUnitKey();
+ String unit = sensor.getUnit();
+ //������������������������������������������������
+ 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)) {//������������������������������������������������������������
+ String formula = sensor.getFormula();
+ //������sensor���������������������������������������������
+ if (ObjectUtils.isEmpty(formula)) {
+ List<UnitConversion> unitConversions = socket.getUnitConversions();
+ for (UnitConversion unitConversion : unitConversions) {
+ if (unitConversion.getOriginalUnitKey().equals(unitKey) && unitConversion.getTargetUnitKey().equals(showUnitKey))
+ formula = unitConversion.getFormula();
+ }
+ }
+ //������������
+ String resultData = UnitConvertUtils.calculate(sourceData, formula);
+ if (resultData != null) {
+ resultData += showUnit;
+ } else {//���������������������������null���������������������������������������������������������������
+ resultData = sourceData + unit;
+ }
+ resultMessgae.put(sensor.getCode(), resultData);
+ } else {
+ //������������
+ 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);
+ socket.sendMessage(JSON.toJSONString(resultMessgae));
}
- System.out.println(message);
}
@Override
@@ -48,4 +113,6 @@
public void onIdleContainer(Map<TopicPartition, Long> map, ConsumerSeekCallback consumerSeekCallback) {
}
+
}
+
--
Gitblit v1.8.0