diff --git a/ebike-gather/src/main/java/org/cdzy/gather/kafka/KafkaConsumer.java b/ebike-gather/src/main/java/org/cdzy/gather/kafka/KafkaConsumer.java index 5fb2da5..074a47b 100644 --- a/ebike-gather/src/main/java/org/cdzy/gather/kafka/KafkaConsumer.java +++ b/ebike-gather/src/main/java/org/cdzy/gather/kafka/KafkaConsumer.java @@ -1,11 +1,7 @@ package org.cdzy.gather.kafka; -import com.cdzy.common.model.CMDMsg; import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import io.netty.handler.codec.mqtt.MqttQoS; import org.apache.kafka.clients.consumer.ConsumerRecord; -import org.cdzy.gather.mqtt.MqttPoolClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.kafka.annotation.KafkaListener; @@ -28,9 +24,9 @@ public class KafkaConsumer { */ @KafkaListener(topics = {"command"}) public void onMessage(ConsumerRecord record) throws JsonProcessingException { -// log.info("[KAFKA接收] 主题: {}, 内容: {}", record.topic(), record.value()); - ObjectMapper objectMapper = new ObjectMapper(); - CMDMsg cmdMsg = objectMapper.readValue(String.valueOf(record.value()), CMDMsg.class); - MqttPoolClient.sendMessage(cmdMsg.getPrefix()+"/"+cmdMsg.getGroup()+"/"+cmdMsg.getDeviceId(), MqttQoS.valueOf(cmdMsg.getQos()), cmdMsg.getCommand()); + log.info("[KAFKA接收] 主题: {}, 内容: {}", record.topic(), record.value()); +// ObjectMapper objectMapper = new ObjectMapper(); +// CMDMsg cmdMsg = objectMapper.readValue(String.valueOf(record.value()), CMDMsg.class); +// MqttPoolClient.sendMessage(cmdMsg.getPrefix()+"/"+cmdMsg.getGroup()+"/"+cmdMsg.getDeviceId(), MqttQoS.valueOf(cmdMsg.getQos()), cmdMsg.getCommand()); } } diff --git a/ebike-gather/src/main/resources/application-dev.yml b/ebike-gather/src/main/resources/application-dev.yml index 3519df6..d7df73f 100644 --- a/ebike-gather/src/main/resources/application-dev.yml +++ b/ebike-gather/src/main/resources/application-dev.yml @@ -13,7 +13,7 @@ spring: username: nacos password: nacos kafka: - bootstrap-servers: 192.168.2.226:9092 + bootstrap-servers: 192.168.101.40:9092 producer: retries: 0 key-serializer: org.apache.kafka.common.serialization.StringSerializer diff --git a/ebike-operations/src/main/java/com/cdzy/operations/component/KafkaConsumer.java b/ebike-operations/src/main/java/com/cdzy/operations/component/KafkaConsumer.java index eaad552..81f8213 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/component/KafkaConsumer.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/component/KafkaConsumer.java @@ -1,8 +1,10 @@ package com.cdzy.operations.component; +import com.cdzy.operations.service.CommandService; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.springframework.kafka.annotation.KafkaListener; @@ -17,6 +19,10 @@ import org.springframework.stereotype.Component; @Component public class KafkaConsumer { + @Resource + CommandService commandService; + + /** * 消费者监听消息 * @@ -27,6 +33,7 @@ public class KafkaConsumer { log.info("[KAFKA接收] 主题: {}, 内容: {}", record.topic(), record.value()); ObjectMapper objectMapper = new ObjectMapper(); JsonNode jsonNode = objectMapper.readValue(record.value().toString(), JsonNode.class); - //TODO：处理结果 + String tid = jsonNode.get("tid").asText(); + commandService.onComplete(tid,true); } } diff --git a/ebike-operations/src/main/java/com/cdzy/operations/enums/EcuBrand.java b/ebike-operations/src/main/java/com/cdzy/operations/enums/EcuBrand.java new file mode 100644 index 0000000..f87d4fe --- /dev/null +++ b/ebike-operations/src/main/java/com/cdzy/operations/enums/EcuBrand.java @@ -0,0 +1,9 @@ +package com.cdzy.operations.enums; + +/** + * @author attiya + * @since 2025-10-30 + */ +public interface EcuBrand { + int GUANG_HE_TONG = 1; +} diff --git a/ebike-operations/src/main/java/com/cdzy/operations/service/CommandService.java b/ebike-operations/src/main/java/com/cdzy/operations/service/CommandService.java new file mode 100644 index 0000000..4d7f865 --- /dev/null +++ b/ebike-operations/src/main/java/com/cdzy/operations/service/CommandService.java @@ -0,0 +1,26 @@ +package com.cdzy.operations.service; + +import com.cdzy.operations.model.entity.EbikeEcuInfo; + +/** + * MQTT命令 服务层。 + * + * @author attiya + * @since 2025-09-15 + */ +public interface CommandService{ + + /** + * 寻车铃 + * @param ebikeEcuInfo 中控信息 + * @return 执行结果 + */ + boolean findBike(EbikeEcuInfo ebikeEcuInfo); + + /** + * 回调事件 + * @param taskId 任务ID + * @param success 结果 + */ + void onComplete(String taskId, boolean success); +} diff --git a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/CommandServiceImpl.java b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/CommandServiceImpl.java new file mode 100644 index 0000000..cef60b1 --- /dev/null +++ b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/CommandServiceImpl.java @@ -0,0 +1,100 @@ +package com.cdzy.operations.service.impl; + +import com.cdzy.common.ex.EbikeException; +import com.cdzy.operations.component.KafkaProducer; +import com.cdzy.operations.enums.EcuBrand; +import com.cdzy.operations.model.entity.EbikeEcuInfo; +import com.cdzy.operations.service.CommandService; +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.UUID; +import java.util.concurrent.*; + +/** + * MQTT命令 服务层实现。 + * + * @author attiya + * @since 2025-09-15 + */ +@Slf4j +@Service +public class CommandServiceImpl implements CommandService { + + private final ExecutorService executor = Executors.newFixedThreadPool(10); + + private final ConcurrentHashMap> pendingRequests = new ConcurrentHashMap<>(); + + @Resource + KafkaProducer kafkaProducer; + + @Override + public boolean findBike(EbikeEcuInfo ebikeEcuInfo) { + boolean result = false; + switch (ebikeEcuInfo.getEcuBrand()){ + case EcuBrand.GUANG_HE_TONG -> result = submitTaskAndWait("command",createTaskId(),"测试"); + default -> throw new EbikeException("该品牌中控暂未接入"); + } + return result; + } + + @Override + public void onComplete(String taskId, boolean success) { + completeRequest(taskId,success); + } + + + /** + * 提交异步任务并等待布尔结果 + * + * @return true-成功, false-失败或超时 + */ + public boolean submitTaskAndWait(String topic, String taskId, String taskData) { + + // 创建异步任务 + CompletableFuture future = new CompletableFuture<>(); + pendingRequests.put(taskId, future); + + try { + // 发送消息到消息队列 + sendMessageToQueue(topic, taskData); + + // 等待结果，5秒超时 + return future.orTimeout(5, TimeUnit.SECONDS).join(); + + } catch (Exception e) { + pendingRequests.remove(taskId); + log.info("任务提交失败: {}", e.getMessage()); + return false; + } + } + + /** + * 发送消息到消息队列 + */ + private void sendMessageToQueue(String topic, String taskData) { + + executor.submit(() -> { + kafkaProducer.send(topic, taskData); + }); + } + + /** + * 完成请求（从消息回调） + */ + public void completeRequest(String taskId, boolean success) { + CompletableFuture future = pendingRequests.remove(taskId); + if (future != null) { + future.complete(success); + log.info("请求 {} 完成，结果: {}", taskId, success); + } else { + log.info("请求 {} 已超时", taskId); + } + } + + String createTaskId(){ + return UUID.randomUUID().toString().replaceAll("-", ""); + } + +} diff --git a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeEcuInfoServiceImpl.java b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeEcuInfoServiceImpl.java index a368189..c99bdce 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeEcuInfoServiceImpl.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeEcuInfoServiceImpl.java @@ -7,6 +7,7 @@ import com.cdzy.operations.model.dto.EbikeEcuInOverview; import com.cdzy.operations.model.entity.EbikeBikeInfo; import com.cdzy.operations.model.vo.EbikeEcuInfoBatchVo; import com.cdzy.operations.model.vo.EbikeEcuInfoVo; +import com.cdzy.operations.service.CommandService; import com.cdzy.operations.utils.EmqxApiClient; import com.mybatisflex.core.query.QueryMethods; import com.mybatisflex.core.query.QueryWrapper; @@ -40,6 +41,9 @@ public class EbikeEcuInfoServiceImpl extends ServiceImpl