From e6463e3aad65706d4540235e30941717532f9f18 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 13 Jul 2021 15:48:42 +0800
Subject: [PATCH] screen-manage 完成实时界面单位转换功能
---
screen-common/src/main/java/com/moral/util/UnitConvertUtils.java | 4 ++++
screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java | 29 +++++++++++++++++------------
2 files changed, 21 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 49ac907..c0660bb 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
@@ -5,6 +5,7 @@
import com.moral.api.entity.Sensor;
import com.moral.api.entity.UnitConversion;
import com.moral.api.websocket.SingleDeviceServer;
+import com.moral.util.UnitConvertUtils;
import org.apache.kafka.clients.consumer.Consumer;
import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.apache.kafka.common.TopicPartition;
@@ -28,10 +29,10 @@
@Component
public class SecondDataConsumer implements ConsumerSeekAware {
- @KafkaListener(topics = "second_data",groupId = "SecondsDataGroup3")
- public void listen(ConsumerRecord<String, String> record , Consumer consumer) throws Exception {
+ @KafkaListener(topics = "second_data", groupId = "SecondsDataGroup3")
+ 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, String> message = (Map<String, String>) JSON.parse(messageStr);
CopyOnWriteArraySet<SingleDeviceServer> sockets = SingleDeviceServer.sockets;
for (SingleDeviceServer socket : sockets) {
//���������������������������socket
@@ -40,7 +41,7 @@
Map<String, Device> devicesInfo = socket.getDevicesInfo();
Device device = devicesInfo.get(mac);
//������������������������
- Map<String,String> resultMessgae = new HashMap<>();
+ Map<String, String> resultMessgae = new HashMap<>();
//������������
List<Sensor> sensors = device.getVersion().getSensors();//������������������������������
for (Sensor sensor : sensors) {
@@ -49,22 +50,26 @@
String unitKey = sensor.getUnitKey();
//������������
//������������
- if(!unitKey.equals(showUnitKey)){
+ if (!unitKey.equals(showUnitKey)) {
String formula = sensor.getFormula();
- if(ObjectUtils.isEmpty(formula)){
+ //������sensor���������������������������������������������
+ if (ObjectUtils.isEmpty(formula)) {
List<UnitConversion> unitConversions = socket.getUnitConversions();
- System.out.println(unitConversions);
- }else{
-
+ for (UnitConversion unitConversion : unitConversions) {
+ if (unitConversion.getOriginalUnitKey().equals(unitKey) && unitConversion.getTargetUnitKey().equals(showUnitKey))
+ formula = unitConversion.getFormula();
+ }
}
+ //������������
+ UnitConvertUtils.calculate(message.get(code),formula);
}
//������������
String showUnit = sensor.getShowUnit();
String value = message.get(code);
- value+=showUnit;
- resultMessgae.put(sensor.getCode(),value);
+ value += showUnit;
+ resultMessgae.put(sensor.getCode(), value);
}
- resultMessgae.put("DataTime",message.get("DataTime"));
+ resultMessgae.put("DataTime", message.get("DataTime"));
socket.sendMessage(JSON.toJSONString(resultMessgae));
}
}
diff --git a/screen-common/src/main/java/com/moral/util/UnitConvertUtils.java b/screen-common/src/main/java/com/moral/util/UnitConvertUtils.java
index e86291d..5bdf91f 100644
--- a/screen-common/src/main/java/com/moral/util/UnitConvertUtils.java
+++ b/screen-common/src/main/java/com/moral/util/UnitConvertUtils.java
@@ -1,5 +1,7 @@
package com.moral.util;
+import org.springframework.util.ObjectUtils;
+
import javax.script.ScriptEngine;
import javax.script.ScriptEngineManager;
import javax.script.ScriptException;
@@ -28,6 +30,8 @@
* @Date: 2021/7/5
*/
public static String calculate(String value, String formula) {
+ if(ObjectUtils.isEmpty(formula))
+ return value;
ScriptEngine jse = new ScriptEngineManager().getEngineByName("JavaScript");
formula = formula.replaceAll("\\{0\\}", value);
Double result = null;
--
Gitblit v1.8.0