From 3d665d84b1a4ffd6749ca9354247838ce0622f4b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 13 Dec 2022 13:47:53 +0800
Subject: [PATCH] 修改sql语句问题
---
screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java | 9 +--------
1 files changed, 1 insertions(+), 8 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 2544cad..0ae5b3f 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
@@ -37,7 +37,6 @@
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();
CopyOnWriteArraySet<SingleDeviceServer> sockets = SingleDeviceServer.sockets;
for (SingleDeviceServer socket : sockets) {
//���������������������������socket
@@ -50,7 +49,7 @@
Map<String, Object> adjustFormula = socket.getAdjustFormula();
Map<String, Object> regionAqi = socket.getRegionAqi();
//������������
- if(adjustFormula!=null&®ionAqi!=null)
+ if(adjustFormula!=null)
message = AdjustDataUtils.adjust(message,adjustFormula,regionAqi);
//������������������������
Map<String, Object> resultMessgae = new HashMap<>();
@@ -95,12 +94,6 @@
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));
}
}
--
Gitblit v1.8.0