From 327267727c36cef76ee554e1ad97099180cd4f13 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 13 Jul 2021 09:08:37 +0800
Subject: [PATCH] screen-manage 单位转换信息添加缓存
---
screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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 63edfa1..49ac907 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
@@ -3,6 +3,7 @@
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 org.apache.kafka.clients.consumer.Consumer;
import org.apache.kafka.clients.consumer.ConsumerRecord;
@@ -10,6 +11,7 @@
import org.springframework.kafka.annotation.KafkaListener;
import org.springframework.kafka.listener.ConsumerSeekAware;
import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
import java.util.HashMap;
import java.util.List;
@@ -30,7 +32,6 @@
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);
- //System.out.println(message);
CopyOnWriteArraySet<SingleDeviceServer> sockets = SingleDeviceServer.sockets;
for (SingleDeviceServer socket : sockets) {
//���������������������������socket
@@ -44,9 +45,21 @@
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();
+ //������������
//������������
+ if(!unitKey.equals(showUnitKey)){
+ String formula = sensor.getFormula();
+ if(ObjectUtils.isEmpty(formula)){
+ List<UnitConversion> unitConversions = socket.getUnitConversions();
+ System.out.println(unitConversions);
+ }else{
+
+ }
+ }
//������������
+ String showUnit = sensor.getShowUnit();
String value = message.get(code);
value+=showUnit;
resultMessgae.put(sensor.getCode(),value);
@@ -72,3 +85,4 @@
}
}
+
--
Gitblit v1.8.0