From 11d10fc9ca90ec29159738c1eac5e2d9203d8bb6 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 28 Jul 2021 09:14:12 +0800
Subject: [PATCH] screen-api kafka消费者组id从配置文件获取 screen-manage 除admin角色外无法查看admin角色
---
screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 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 9439f3a..c105c2f 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
@@ -6,9 +6,12 @@
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;
@@ -29,7 +32,7 @@
@Component
public class SecondDataConsumer implements ConsumerSeekAware {
- @KafkaListener(topics = "second_data", groupId = "SecondsDataGroup996")
+ @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);
@@ -39,7 +42,7 @@
//���������������������������socket
String messageMac = (String) message.get("mac");
String mac = socket.getMac();
- if(!mac.equalsIgnoreCase(messageMac))
+ if (!mac.equalsIgnoreCase(messageMac))
continue;
//������������������
Map<String, Device> devicesInfo = socket.getDevicesInfo();
@@ -70,22 +73,22 @@
//������������
String resultData = UnitConvertUtils.calculate(sourceData, formula);
if (resultData != null) {
- resultData+=showUnit;
- }else{//���������������������������null���������������������������������������������������������������
- resultData = sourceData+unit;
+ resultData += showUnit;
+ } else {//���������������������������null���������������������������������������������������������������
+ resultData = sourceData + unit;
}
resultMessgae.put(sensor.getCode(), resultData);
} else {
//������������
- sourceData += showUnit;
+ 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