add

设备历史数据、报警数据、修改数据改为批量存储

nb-core/src/main/java/com/nb/core/service/MqttMessageForwardService.java

@@ -1,95 +0,0 @@
-package com.nb.core.service;
-
-import com.nb.core.entity.MqttMessage;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
-
-/**
- * MQTT消息转发服务
- * 将MQTT消息通过HTTP转发给其他服务
- *
- * @author YourName
- * @version 1.0.0
- */
-@Service
-public class MqttMessageForwardService {
-    
-    @Autowired
-    private RestTemplate restTemplate;
-    
-    /**
-     * 转发单个MQTT消息
-     *
-     * @param message MQTT消息
-     * @param targetUrl 目标服务URL
-     * @return 转发结果
-     */
-    public boolean forwardMessage(MqttMessage message, String targetUrl) {
-        try {
-            HttpHeaders headers = new HttpHeaders();
-            headers.setContentType(MediaType.APPLICATION_JSON);
-            
-            HttpEntity<MqttMessage> request = new HttpEntity<>(message, headers);
-            ResponseEntity<String> response = restTemplate.postForEntity(targetUrl, request, String.class);
-            
-            return response.getStatusCode().is2xxSuccessful();
-        } catch (Exception e) {
-            // 记录日志或处理异常
-            e.printStackTrace();
-            return false;
-        }
-    }
-    
-    /**
-     * 批量转发MQTT消息
-     *
-     * @param messages MQTT消息数组
-     * @param targetUrl 目标服务URL
-     * @return 转发结果
-     */
-    public boolean forwardMessages(MqttMessage[] messages, String targetUrl) {
-        try {
-            HttpHeaders headers = new HttpHeaders();
-            headers.setContentType(MediaType.APPLICATION_JSON);
-            
-            HttpEntity<MqttMessage[]> request = new HttpEntity<>(messages, headers);
-            ResponseEntity<String> response = restTemplate.postForEntity(targetUrl, request, String.class);
-            
-            return response.getStatusCode().is2xxSuccessful();
-        } catch (Exception e) {
-            // 记录日志或处理异常
-            e.printStackTrace();
-            return false;
-        }
-    }
-    
-    /**
-     * 转发MQTT消息（带自定义头信息）
-     *
-     * @param message MQTT消息
-     * @param targetUrl 目标服务URL
-     * @param customHeaders 自定义头信息
-     * @return 转发结果
-     */
-    public boolean forwardMessageWithHeaders(MqttMessage message, String targetUrl, HttpHeaders customHeaders) {
-        try {
-            if (customHeaders.getContentType() == null) {
-                customHeaders.setContentType(MediaType.APPLICATION_JSON);
-            }
-            
-            HttpEntity<MqttMessage> request = new HttpEntity<>(message, customHeaders);
-            ResponseEntity<String> response = restTemplate.postForEntity(targetUrl, request, String.class);
-            
-            return response.getStatusCode().is2xxSuccessful();
-        } catch (Exception e) {
-            // 记录日志或处理异常
-            e.printStackTrace();
-            return false;
-        }
-    }
-}

nb-core/src/main/java/com/nb/core/utils/MqttClientUtil.java

@@ -2,7 +2,6 @@ package com.nb.core.utils;
 
 import cn.hutool.json.JSONUtil;
 import com.nb.core.entity.MqttMessage;
-import com.nb.core.service.MqttMessageForwardService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.integration.channel.DirectChannel;
 import org.springframework.integration.mqtt.core.MqttPahoClientFactory;
@@ -33,10 +32,7 @@ import java.util.function.Consumer;
 public class MqttClientUtil implements ApplicationContextAware {
 
     private ApplicationContext applicationContext;
-    
-    @Autowired(required = false)
-    private MqttMessageForwardService mqttMessageForwardService;
-    
+
     private final Map<String, MqttPahoMessageDrivenChannelAdapter> subscribers = new ConcurrentHashMap<>();
     
     private MqttPahoClientFactory mqttClientFactory;
@@ -135,11 +131,6 @@ public class MqttClientUtil implements ApplicationContextAware {
             MqttMessage message = new MqttMessage(topic, payload);
             message.setClientId(clientId + "-pub-" + System.currentTimeMillis());
             
-            // 如果配置了转发服务，则转发消息
-            if (mqttMessageForwardService != null) {
-                // 这里可以配置转发到其他服务的URL
-                // mqttMessageForwardService.forwardMessage(message, "http://other-service/api/mqtt/receive");
-            }
             if (mqttClientFactory == null) {
                 return;
             }