Security:
- Remove hardcoded password fallbacks from application-druid.yml
- Add table name whitelist validation to SysFaultService & SysAlarmService
- Externalize VehicleSyncTask webhook URL to IotProperties config

Concurrency & Resource Management:
- Fix AbstractMqttConsumer reconnect/disconnect race (synchronized)
- Fix MqttClient resource leaks in disconnect() with separate try blocks
- Fix AbstractDynamicMqttConsumer broken-state MqttClient reuse
- Fix TDengineService stableColumnCache unbounded growth (MAX_CACHE_SIZE=1000)

Input Validation:
- Add null/empty checks to MqttGenericConsumer (controllerId, path, timestamp)
- Add null/empty checks to MqttFaultConsumer (controllerId, deviceId, type, desc)
- Guard against ArrayIndexOutOfBoundsException on topic path split

Tests:
- Update VehicleSyncTaskTest for new IotProperties constructor param
- All 79 tests pass, build succeeds

CLAUDE.md

@@ -90,7 +90,7 @@ DRUID_USERNAME=ruoyi
 DRUID_PASSWORD=...
 ```
 
-Spring Boot config uses `${ENV_NAME:default}` syntax for all sensitive values.
+Spring Boot config uses `${ENV_NAME:default}` syntax for non-sensitive defaults only. **MySQL and Druid passwords have no fallback defaults** — missing env vars will cause startup failures.
 
 ## IoT Data Flow
 
@@ -103,25 +103,34 @@ MqttGenericConsumer / MqttStatusConsumer / MqttFaultConsumer
     ├─→ MySQL (sys_controller, sys_device tables)
     └─→ TDengine (time-series telemetry tables)
 
-VehicleSyncTask (@Scheduled every 30s)
+VehicleSyncTask (@Scheduled every 30s, Redis distributed lock)
     ↓ reads Redis DSB:* keys
     ├─→ syncs to sysrealtime (MySQL)
     ├─→ updates vehicle GPS in sys_car (MySQL)
     ├─→ updates sys_indicators KPIs (MySQL)
-    └─→ triggers external webhook
+    └─→ triggers external webhook (URL from `iot.mqtt.vehicle-trigger-url` config)
 ```
 
 ## MQTT Consumers
 
-All MQTT consumers extend `AbstractMqttConsumer` which provides:
-- Connection management (reconnect, keepalive)
-- `checkServerAvailability()` with retry limits
+Two base classes handle MQTT connections:
+
+**`AbstractMqttConsumer`** (single-topic consumers):
+- Connection management with `synchronized` reconnect/disconnect
+- Broken-state MqttClient detection and recreation on reconnect
 - Graceful shutdown via `@PreDestroy`
 
+**`AbstractDynamicMqttConsumer`** (dynamic multi-topic consumers):
+- Incremental topic subscription refresh (add/remove only changed topics)
+- Batch subscribe with retry logic
+- Connection health checks before subscribe
+
 Implementations:
-- `MqttGenericConsumer` — General telemetry ingestion
-- `MqttStatusConsumer` — Device status messages
-- `MqttFaultConsumer` — Fault/alarm messages
+- `MqttGenericConsumer` — General telemetry ingestion (single-topic)
+- `MqttStatusConsumer` — Device status messages (single-topic)
+- `MqttFaultConsumer` — Fault/alarm messages (single-topic)
+- `MqttDynamicConsumer` — Dynamic topic subscription (extends AbstractDynamicMqttConsumer)
+- `MqttChargeStationConsumer` — Charge station telemetry (extends AbstractDynamicMqttConsumer)
 
 ## Deployment
 
@@ -148,7 +157,9 @@ See `deploy/README.md` for full deployment documentation.
 - Password max retry: 5 attempts, lock time: 10 minutes
 - XSS filtering enabled
 - SQL injection prevention: field whitelist + parameterized queries in TDengineService
-- Table name validation: regex `^[a-zA-Z_][a-zA-Z0-9_]*$` in SysrealtimeService
+- Table name validation: regex `^[a-zA-Z_][a-zA-Z0-9_]*$` in SysControllerService, SysFaultService, SysAlarmService
+- Input validation at MQTT consumer boundaries (null/empty checks on controllerId, path, timestamp, deviceId)
+- No hardcoded password fallbacks in config files — env vars required at startup
 
 ## API Response Format
 
@@ -184,5 +195,6 @@ curl http://localhost:8887/actuator/health
 - **MyBatis mappers are Java interfaces** with XML mapping files in `src/main/resources/mapper/`
 - **Service naming**: Custom IoT services often use concrete classes directly (no `I` prefix)
 - **TDengine SQL**: Built with string concatenation but protected by field whitelist (`ALLOWED_COLUMNS`) and `escapeValue()`
-- **No distributed locks**: `VehicleSyncTask` scheduled tasks may duplicate in clustered environments
+- **Distributed locks**: `VehicleSyncTask` uses Redis `SET NX` for per-method distributed locking (30s delay, 60s TTL)
+- **TDengine cache bounds**: `stableColumnCache` capped at 1000 entries to prevent unbounded growth
 - **Alibaba Maven mirror** (`https://maven.aliyun.com/repository/public`) configured in root `pom.xml`

bin/clean.bat

@@ -1,12 +0,0 @@
-@echo off
-echo.
-echo [信息] 清理工程target生成路径。
-echo.
-
-%~d0
-cd %~dp0
-
-cd ..
-call mvn clean
-
-pause

bin/package.bat

@@ -1,12 +0,0 @@
-@echo off
-echo.
-echo [信息] 打包Web工程，生成war/jar包文件。
-echo.
-
-%~d0
-cd %~dp0
-
-cd ..
-call mvn clean package -Dmaven.test.skip=true
-
-pause

bin/run.bat

@@ -1,14 +0,0 @@
-@echo off
-echo.
-echo [信息] 使用Jar命令运行Web工程。
-echo.
-
-cd %~dp0
-cd ../ruoyi-admin/target
-
-set JAVA_OPTS=-Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-java -jar %JAVA_OPTS% ruoyi-admin.jar
-
-cd bin
-pause

iot-platform/pom.xml

@@ -65,8 +65,9 @@
 
         <!-- Mysql驱动 -->
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+            <version>8.0.33</version>
         </dependency>
 
         <!-- TDengine JDBC -->
@@ -95,12 +96,6 @@
             <artifactId>jackson-databind</artifactId>
         </dependency>
 
-        <!-- FastJSON2 -->
-        <dependency>
-            <groupId>com.alibaba.fastjson2</groupId>
-            <artifactId>fastjson2</artifactId>
-        </dependency>
-
         <!-- Commons -->
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -112,12 +107,6 @@
             <artifactId>commons-io</artifactId>
         </dependency>
 
-        <!-- Excel工具 -->
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml</artifactId>
-        </dependency>
-
         <!-- DevTools -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -172,6 +161,35 @@
                             <goal>report</goal>
                         </goals>
                     </execution>
+                    <execution>
+                        <id>check</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <rule>
+                                    <element>BUNDLE</element>
+                                    <limits>
+                                        <limit>
+                                            <counter>LINE</counter>
+                                            <value>COVEREDRATIO</value>
+                                            <minimum>0.05</minimum>
+                                        </limit>
+                                    </limits>
+                                </rule>
+                            </rules>
+                            <excludes>
+                                <exclude>com/iot/platform/domain/**</exclude>
+                                <exclude>com/iot/platform/domain/vo/**</exclude>
+                                <exclude>com/iot/platform/mapper/**</exclude>
+                                <exclude>com/iot/platform/common/enums/**</exclude>
+                                <exclude>com/iot/platform/config/properties/**</exclude>
+                                <exclude>com/iot/platform/datasource/**</exclude>
+                            </excludes>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
         </plugins>

iot-platform/src/main/java/com/iot/platform/common/utils/NumericIdGenerator.java

@@ -16,7 +16,7 @@ public class NumericIdGenerator {
     private long sequence = 0L;
     private long lastTimestamp = -1L;
 
-    public String nextId() {
+    public synchronized String nextId() {
         long timestamp = timeGen();
         if (timestamp < lastTimestamp) {
             throw new RuntimeException("Clock moved backwards!");

iot-platform/src/main/java/com/iot/platform/config/ApplicationConfig.java

@@ -6,7 +6,6 @@ import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilde
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
-import org.springframework.web.client.RestTemplate;
 
 /**
  * 程序注解配置
@@ -24,13 +23,4 @@ public class ApplicationConfig
     {
         return jacksonObjectMapperBuilder -> jacksonObjectMapperBuilder.timeZone(TimeZone.getDefault());
     }
-
-    /**
-     * RestTemplate
-     */
-    @Bean
-    public RestTemplate restTemplate()
-    {
-        return new RestTemplate();
-    }
 }

iot-platform/src/main/java/com/iot/platform/config/DruidConfig.java

@@ -3,6 +3,8 @@ package com.iot.platform.config;
 import java.util.HashMap;
 import java.util.Map;
 import javax.sql.DataSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -21,6 +23,7 @@ import com.iot.platform.datasource.DynamicDataSource;
 @Configuration
 public class DruidConfig
 {
+    private static final Logger log = LoggerFactory.getLogger(DruidConfig.class);
     @Bean
     @ConfigurationProperties("spring.datasource.druid.master")
     public DataSource masterDataSource(DruidProperties druidProperties)
@@ -57,7 +60,7 @@ public class DruidConfig
         }
         catch (Exception e)
         {
-            // slave datasource may not be available
+            log.warn("从数据源 {} 不可用: {}", beanName, e.getMessage());
         }
     }
 }

iot-platform/src/main/java/com/iot/platform/config/ExecutorConfig.java

@@ -39,4 +39,36 @@ public class ExecutorConfig {
                 new ThreadPoolExecutor.CallerRunsPolicy()
         );
     }
+
+    @Bean(destroyMethod = "shutdown")
+    public ScheduledExecutorService mqttCoreExecutor() {
+        return Executors.newSingleThreadScheduledExecutor(r -> {
+            Thread t = new Thread(r, "mqtt-core-scheduler");
+            t.setDaemon(true);
+            return t;
+        });
+    }
+
+    @Bean(destroyMethod = "shutdown")
+    public ExecutorService mqttWriteExecutor() {
+        return new ThreadPoolExecutor(
+                4, 8, 60L, TimeUnit.SECONDS,
+                new LinkedBlockingQueue<>(5000),
+                r -> {
+                    Thread t = new Thread(r, "mqtt-write-" + UUID.randomUUID().toString().substring(0, 4));
+                    t.setDaemon(true);
+                    return t;
+                },
+                new ThreadPoolExecutor.CallerRunsPolicy()
+        );
+    }
+
+    @Bean(destroyMethod = "shutdown")
+    public ExecutorService abstractConsumerExecutor() {
+        return Executors.newSingleThreadExecutor(r -> {
+            Thread t = new Thread(r, "mqtt-abstract-consumer");
+            t.setDaemon(true);
+            return t;
+        });
+    }
 }

iot-platform/src/main/java/com/iot/platform/config/IotProperties.java

@@ -20,8 +20,10 @@ public class IotProperties {
     @PostConstruct
     public void validate() {
         List<String> errors = new ArrayList<>();
+        if (isBlank(mqtt.getBrokerUrl())) errors.add("iot.mqtt.broker-url 不能为空");
         if (isBlank(mqtt.getUsername())) errors.add("iot.mqtt.username 不能为空");
         if (isBlank(mqtt.getPassword())) errors.add("iot.mqtt.password 不能为空");
+        if (isBlank(tdengine.getUrl())) errors.add("iot.tdengine.url 不能为空");
         if (isBlank(tdengine.getUsername())) errors.add("iot.tdengine.username 不能为空");
         if (isBlank(tdengine.getPassword())) errors.add("iot.tdengine.password 不能为空");
         if (!errors.isEmpty()) {
@@ -56,6 +58,9 @@ public class IotProperties {
         private String brokerUrl = "tcp://47.104.204.180:1883";
         private String username = "";
         private String password = "";
+        private String chargeStationTopic = "station/ChargeStation/device/+/post/json";
+        private String alarmWebhookUrl = "https://esos-iot.com:9443/syscar/gaojing";
+        private String vehicleTriggerUrl = "https://esos-iot.com:9443/syscar/trigger";
 
         public String getBrokerUrl() {
             return brokerUrl;
@@ -80,6 +85,30 @@ public class IotProperties {
         public void setPassword(String password) {
             this.password = password;
         }
+
+        public String getChargeStationTopic() {
+            return chargeStationTopic;
+        }
+
+        public void setChargeStationTopic(String chargeStationTopic) {
+            this.chargeStationTopic = chargeStationTopic;
+        }
+
+        public String getAlarmWebhookUrl() {
+            return alarmWebhookUrl;
+        }
+
+        public void setAlarmWebhookUrl(String alarmWebhookUrl) {
+            this.alarmWebhookUrl = alarmWebhookUrl;
+        }
+
+        public String getVehicleTriggerUrl() {
+            return vehicleTriggerUrl;
+        }
+
+        public void setVehicleTriggerUrl(String vehicleTriggerUrl) {
+            this.vehicleTriggerUrl = vehicleTriggerUrl;
+        }
     }
 
     /**

iot-platform/src/main/java/com/iot/platform/mapper/SysControllerMapper.java

@@ -28,9 +28,9 @@ public interface SysControllerMapper {
                                     @Param("name")String name,
                                     @Param("path")String path);
 
-        Integer selectsyscontrollercount(@Param("path")String paht);
-        Integer selectsyscontrollercountcmd(@Param("path")String paht);
-        Integer selectsyscontrollercountfault(@Param("path")String paht);
+        Integer selectsyscontrollercount(@Param("path")String path);
+        Integer selectsyscontrollercountcmd(@Param("path")String path);
+        Integer selectsyscontrollercountfault(@Param("path")String path);
 
 
         void updatecontrollerAccept(@Param("controllerId")String controllerId,

iot-platform/src/main/java/com/iot/platform/mqtt/AbstractDynamicMqttConsumer.java

@@ -0,0 +1,449 @@
+package com.iot.platform.mqtt;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.iot.platform.config.IotProperties;
+import org.eclipse.paho.client.mqttv3.*;
+import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+/**
+ * 动态 Topic MQTT 消费者基类。
+ * 抽取 MqttDynamicConsumer 与 MqttChargeStationConsumer 的公共连接/订阅管理逻辑，
+ * 子类只需实现 {@link #fetchTopics()} 和 {@link #processMessage(String, String)}。
+ */
+public abstract class AbstractDynamicMqttConsumer {
+
+    protected final Logger log = LoggerFactory.getLogger(getClass());
+
+    protected final IotProperties iotProperties;
+    protected final ScheduledExecutorService coreExecutor;
+    protected final ExecutorService writeExecutor;
+
+    // MQTT 配置
+    protected String brokerUrl;
+    protected String brokerHost;
+    protected int brokerPort;
+    protected String mqttUsername;
+    protected String mqttPassword;
+
+    private static final int QOS = 1;
+    private static final int CONNECT_TIMEOUT = 3000;
+    private static final int RECONNECT_INTERVAL = 5000;
+    private static final int MAX_BATCH_SIZE = 50;
+
+    protected MqttClient mqttClient;
+    private MqttConnectOptions connOpts;
+    protected final Set<String> currentTopicSet = new CopyOnWriteArraySet<>();
+    protected final AtomicBoolean isConnected = new AtomicBoolean(false);
+    protected final Object lock = new Object();
+
+    protected AbstractDynamicMqttConsumer(IotProperties iotProperties,
+                                          ScheduledExecutorService coreExecutor,
+                                          ExecutorService writeExecutor) {
+        this.iotProperties = iotProperties;
+        this.coreExecutor = coreExecutor;
+        this.writeExecutor = writeExecutor;
+    }
+
+    /**
+     * 子类实现：获取当前需要订阅的 Topic 列表。
+     */
+    protected abstract List<String> fetchTopics();
+
+    /**
+     * 子类实现：处理收到的 MQTT 消息内容。
+     *
+     * @param content 消息原始字符串（JSON）
+     * @param topic   消息所属 Topic
+     */
+    protected abstract void processMessage(String content, String topic) throws Exception;
+
+    @PostConstruct
+    public void initMqttConnection() {
+        this.brokerUrl = iotProperties.getMqtt().getBrokerUrl();
+        String brokerAddr = this.brokerUrl.replace("tcp://", "");
+        int colonIdx = brokerAddr.lastIndexOf(':');
+        this.brokerHost = brokerAddr.substring(0, colonIdx);
+        this.brokerPort = Integer.parseInt(brokerAddr.substring(colonIdx + 1));
+        this.mqttUsername = iotProperties.getMqtt().getUsername();
+        this.mqttPassword = iotProperties.getMqtt().getPassword();
+
+        log.info("开始初始化 MQTT 动态订阅服务...");
+
+        CompletableFuture<Boolean> connectFuture = CompletableFuture.supplyAsync(() -> {
+            int initRetry = 0;
+            while (initRetry < 3 && !isConnected.get()) {
+                try {
+                    if (refreshMqttSubscription()) {
+                        log.info("MQTT 动态订阅初始化成功");
+                        return true;
+                    }
+                } catch (Exception e) {
+                    log.error("MQTT 启动初始化失败（第{}次）", initRetry + 1, e);
+                }
+                initRetry++;
+                try {
+                    Thread.sleep(RECONNECT_INTERVAL * initRetry);
+                } catch (InterruptedException ex) {
+                    Thread.currentThread().interrupt();
+                    break;
+                }
+            }
+            return false;
+        }, coreExecutor);
+
+        try {
+            Boolean connected = connectFuture.get(10, TimeUnit.SECONDS);
+            if (!connected) {
+                log.error("MQTT 启动失败（超时），触发后台重连机制");
+                triggerReconnect();
+            }
+        } catch (TimeoutException e) {
+            log.error("MQTT 初始化超时（10秒），触发后台重连机制");
+            triggerReconnect();
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            log.error("MQTT 初始化被中断");
+            triggerReconnect();
+        } catch (ExecutionException e) {
+            log.error("MQTT 初始化执行异常", e.getCause());
+            triggerReconnect();
+        }
+    }
+
+    private void initMqttConnectOptions() {
+        if (connOpts != null) return;
+        connOpts = new MqttConnectOptions();
+        connOpts.setCleanSession(false);
+        connOpts.setAutomaticReconnect(true);
+        connOpts.setConnectionTimeout(10);
+        connOpts.setKeepAliveInterval(60);
+        connOpts.setMaxInflight(10);
+        connOpts.setMaxReconnectDelay(30);
+        connOpts.setUserName(mqttUsername);
+        connOpts.setPassword(mqttPassword.toCharArray());
+    }
+
+    public boolean refreshMqttSubscription() {
+        synchronized (lock) {
+            try {
+                initMqttConnectOptions();
+                List<String> latestTopicList = fetchTopics();
+                log.info("查询到 Topic 列表: {}", latestTopicList);
+
+                if (latestTopicList == null || latestTopicList.isEmpty()) {
+                    log.error("未查询到 Topic，取消所有订阅");
+                    unsubscribeAll();
+                    currentTopicSet.clear();
+                    return false;
+                }
+
+                Set<String> latestTopicSet = new HashSet<>();
+                for (String topic : latestTopicList) {
+                    if (topic != null && !topic.trim().isEmpty()) {
+                        latestTopicSet.add(topic.trim());
+                    }
+                }
+
+                if (latestTopicSet.equals(currentTopicSet)) {
+                    log.info("Topic 列表无变化，无需刷新订阅关系");
+                    if (!isConnected.get() && !latestTopicSet.isEmpty()) {
+                        return connectAndSubscribe(latestTopicSet);
+                    }
+                    return true;
+                }
+
+                Set<String> topicsToAdd = new HashSet<>(latestTopicSet);
+                topicsToAdd.removeAll(currentTopicSet);
+                Set<String> topicsToRemove = new HashSet<>(currentTopicSet);
+                topicsToRemove.removeAll(latestTopicSet);
+
+                if (!isConnected.get()) {
+                    return connectAndSubscribe(latestTopicSet);
+                } else {
+                    if (!topicsToRemove.isEmpty()) unsubscribeTopics(topicsToRemove);
+                    if (!topicsToAdd.isEmpty()) subscribeTopics(topicsToAdd);
+                }
+
+                currentTopicSet.clear();
+                currentTopicSet.addAll(latestTopicSet);
+                log.info("MQTT 订阅刷新完成，当前数量：{}", currentTopicSet.size());
+                return true;
+
+            } catch (Exception e) {
+                log.error("MQTT 订阅刷新失败", e);
+                return false;
+            }
+        }
+    }
+
+    private boolean connectAndSubscribe(Set<String> topicSet) {
+        synchronized (lock) {
+            if (isConnected.get() && mqttClient != null && mqttClient.isConnected()) {
+                return true;
+            }
+            try {
+                if (!checkServerAvailability()) {
+                    log.error("Broker 不可达，连接失败");
+                    return false;
+                }
+
+                if (mqttClient == null || !mqttClient.isConnected()) {
+                    if (mqttClient != null) {
+                        try {
+                            mqttClient.close();
+                        } catch (MqttException ignored) {
+                        }
+                    }
+                    String clientId = generateUniqueClientId();
+                    MemoryPersistence persistence = new MemoryPersistence();
+                    mqttClient = new MqttClient(brokerUrl, clientId, persistence);
+                    setMqttCallback();
+                }
+
+                int connectRetry = 0;
+                while (connectRetry < 3 && !mqttClient.isConnected()) {
+                    try {
+                        mqttClient.connect(connOpts);
+                        if (mqttClient.isConnected()) {
+                            isConnected.set(true);
+                            log.info("MQTT 连接成功，客户端 ID：{}", mqttClient.getClientId());
+                            break;
+                        }
+                    } catch (MqttException e) {
+                        log.error("MQTT 连接失败（第{}次）：{}", connectRetry + 1, e.getMessage());
+                        connectRetry++;
+                        if (connectRetry < 3) Thread.sleep(RECONNECT_INTERVAL * (connectRetry + 1));
+                    }
+                }
+
+                if (!mqttClient.isConnected()) {
+                    isConnected.set(false);
+                    return false;
+                }
+
+                if (!topicSet.isEmpty()) {
+                    List<String> topicList = new ArrayList<>(topicSet);
+                    for (int i = 0; i < topicList.size(); i += MAX_BATCH_SIZE) {
+                        int end = Math.min(i + MAX_BATCH_SIZE, topicList.size());
+                        List<String> batch = topicList.subList(i, end);
+                        batchSubscribeTopics(new HashSet<>(batch));
+                        Thread.sleep(100);
+                    }
+                }
+                return true;
+
+            } catch (MqttException e) {
+                log.error("MQTT 连接 + 订阅失败", e);
+                isConnected.set(false);
+                triggerReconnect();
+                return false;
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                log.error("MQTT 连接 + 订阅被中断");
+                isConnected.set(false);
+                return false;
+            }
+        }
+    }
+
+    private void batchSubscribeTopics(Set<String> topicSet) {
+        if (topicSet.isEmpty() || !isConnected.get() || mqttClient == null) return;
+        try {
+            List<String> topicList = new ArrayList<>(topicSet);
+            String[] topics = topicList.toArray(new String[0]);
+            int[] qosArr = new int[topics.length];
+            Arrays.fill(qosArr, QOS);
+            mqttClient.subscribe(topics, qosArr);
+            log.info("订阅完成：{} 个 Topic", topicList.size());
+        } catch (MqttException e) {
+            log.error("批量订阅失败：{}", e.getMessage());
+            retrySubscribeBatch(new ArrayList<>(topicSet), 1);
+        }
+    }
+
+    private void retrySubscribeBatch(List<String> batchTopics, int retryTimes) {
+        for (int retry = 1; retry <= retryTimes; retry++) {
+            try {
+                Thread.sleep(1000 * retry);
+                if (!isConnected.get() || mqttClient == null) continue;
+                String[] topics = batchTopics.toArray(new String[0]);
+                int[] qosArr = new int[topics.length];
+                Arrays.fill(qosArr, QOS);
+                mqttClient.subscribe(topics, qosArr);
+                log.info("重试订阅成功（第{}次），数量：{}", retry, batchTopics.size());
+                return;
+            } catch (MqttException e) {
+                log.error("重试订阅失败（第{}次）：{}", retry, e.getMessage());
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                log.error("重试订阅被中断");
+                break;
+            }
+        }
+        log.error("批次订阅最终失败：{}", batchTopics);
+    }
+
+    private void subscribeTopics(Set<String> topicsToAdd) {
+        if (topicsToAdd.isEmpty() || !isConnected.get()) return;
+        batchSubscribeTopics(topicsToAdd);
+    }
+
+    private void unsubscribeTopics(Set<String> topicsToRemove) {
+        if (topicsToRemove.isEmpty() || !isConnected.get() || mqttClient == null) return;
+        try {
+            String[] topics = topicsToRemove.toArray(new String[0]);
+            mqttClient.unsubscribe(topics);
+            log.info("取消订阅完成，数量：{}", topicsToRemove.size());
+        } catch (MqttException e) {
+            log.error("取消订阅失败：{}", e.getMessage());
+        }
+    }
+
+    private void unsubscribeAll() {
+        if (currentTopicSet.isEmpty() || !isConnected.get() || mqttClient == null) return;
+        try {
+            String[] topics = currentTopicSet.toArray(new String[0]);
+            mqttClient.unsubscribe(topics);
+            log.info("取消所有订阅，数量：{}", currentTopicSet.size());
+        } catch (MqttException e) {
+            log.error("取消所有订阅失败：{}", e.getMessage());
+        }
+    }
+
+    private void triggerReconnect() {
+        coreExecutor.schedule(() -> {
+            int maxAttempts = 3;
+            int attempt = 1;
+            while (attempt <= maxAttempts && !isConnected.get()) {
+                try {
+                    log.info("MQTT 重连（第{}次）", attempt);
+                    if (connectAndSubscribe(currentTopicSet)) {
+                        log.info("MQTT 重连成功");
+                        break;
+                    }
+                    attempt++;
+                    if (attempt <= maxAttempts) Thread.sleep(RECONNECT_INTERVAL * 2 * attempt);
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                    break;
+                } catch (Exception e) {
+                    log.error("MQTT 重连失败（第{}次）：{}", attempt, e.getMessage());
+                    attempt++;
+                }
+            }
+            if (attempt > maxAttempts) {
+                log.error("MQTT 重连达最大次数，停止尝试");
+                isConnected.set(false);
+            }
+        }, 5, TimeUnit.SECONDS);
+    }
+
+    private boolean checkServerAvailability() {
+        try (Socket socket = new Socket()) {
+            socket.setSoTimeout(CONNECT_TIMEOUT);
+            socket.setTcpNoDelay(true);
+            socket.connect(new InetSocketAddress(brokerHost, brokerPort), CONNECT_TIMEOUT);
+            return true;
+        } catch (Exception e) {
+            log.error("MQTT Broker 不可达：{}", e.getMessage());
+            return false;
+        }
+    }
+
+    private String generateUniqueClientId() {
+        String osPrefix = System.getProperty("os.name").toLowerCase().contains("windows") ? "mqtt_win_" : "mqtt_linux_";
+        return osPrefix + System.currentTimeMillis() + "_" + UUID.randomUUID().toString().replace("-", "").substring(0, 8);
+    }
+
+    private void setMqttCallback() {
+        if (mqttClient == null) return;
+        mqttClient.setCallback(new MqttCallback() {
+            @Override
+            public void connectionLost(Throwable cause) {
+                log.error("MQTT 连接断开：{}", cause.getMessage());
+                isConnected.set(false);
+                coreExecutor.schedule(AbstractDynamicMqttConsumer.this::triggerReconnect, 5, TimeUnit.SECONDS);
+            }
+
+            @Override
+            public void messageArrived(String topic, MqttMessage message) {
+                writeExecutor.submit(() -> {
+                    try {
+                        String content = new String(message.getPayload(), java.nio.charset.StandardCharsets.UTF_8);
+                        if (content == null || content.trim().isEmpty()) return;
+                        processMessage(content, topic);
+                    } catch (Exception e) {
+                        log.error("MQTT 消息处理失败 (Topic: {}): {}", topic, e.getMessage(), e);
+                    }
+                });
+            }
+
+            @Override
+            public void deliveryComplete(IMqttDeliveryToken token) {
+                try {
+                    token.waitForCompletion(1000);
+                } catch (MqttException e) {
+                    log.warn("MQTT 消息投递确认等待超时: {}", e.getMessage());
+                }
+            }
+        });
+    }
+
+    protected Map<String, Object> deepCopyMap(Map<String, Object> original) {
+        if (original == null) return new HashMap<>();
+        try {
+            ObjectMapper mapper = new ObjectMapper();
+            String json = mapper.writeValueAsString(original);
+            return mapper.readValue(json, new TypeReference<Map<String, Object>>() {
+            });
+        } catch (Exception e) {
+            Map<String, Object> copy = new HashMap<>(original.size());
+            original.forEach((k, v) -> {
+                if (v instanceof Map) {
+                    copy.put(k, deepCopyMap((Map<String, Object>) v));
+                } else {
+                    copy.put(k, v);
+                }
+            });
+            return copy;
+        }
+    }
+
+    public void disconnect() {
+        synchronized (lock) {
+            if (mqttClient != null) {
+                try {
+                    if (mqttClient.isConnected()) {
+                        unsubscribeAll();
+                        mqttClient.disconnect(10000);
+                    }
+                    mqttClient.close();
+                    log.info("MQTT 连接已断开");
+                } catch (MqttException e) {
+                    log.error("断开 MQTT 连接失败：{}", e.getMessage());
+                } finally {
+                    isConnected.set(false);
+                    mqttClient = null;
+                }
+            }
+        }
+    }
+
+    @PreDestroy
+    public void destroy() {
+        log.info("服务正在关闭...");
+        disconnect();
+    }
+}

iot-platform/src/main/java/com/iot/platform/mqtt/AbstractMqttConsumer.java

@@ -12,14 +12,13 @@ import javax.annotation.PreDestroy;
 import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 
 public abstract class AbstractMqttConsumer {
 
     protected final Logger log = LoggerFactory.getLogger(getClass());
 
-    @Autowired
-    protected IotProperties iotProperties;
+    protected final IotProperties iotProperties;
+    protected final ExecutorService executorService;
 
     private String brokerUrl;
     private String brokerHost;
@@ -35,7 +34,11 @@ public abstract class AbstractMqttConsumer {
     protected MqttClient mqttClient;
     protected MqttConnectOptions connOpts;
     protected volatile boolean isMqttConnected = false;
-    protected final ExecutorService executorService = Executors.newSingleThreadExecutor();
+
+    protected AbstractMqttConsumer(ExecutorService executorService, IotProperties iotProperties) {
+        this.executorService = executorService;
+        this.iotProperties = iotProperties;
+    }
 
     protected abstract String getSubscribeTopic();
 
@@ -52,6 +55,9 @@ public abstract class AbstractMqttConsumer {
         this.brokerUrl = iotProperties.getMqtt().getBrokerUrl();
         String brokerAddr = this.brokerUrl.replace("tcp://", "");
         int colonIdx = brokerAddr.lastIndexOf(':');
+        if (colonIdx <= 0 || colonIdx == brokerAddr.length() - 1) {
+            throw new IllegalArgumentException("MQTT broker-url 格式无效，期望 tcp://host:port，实际: " + this.brokerUrl);
+        }
         this.brokerHost = brokerAddr.substring(0, colonIdx);
         this.brokerPort = Integer.parseInt(brokerAddr.substring(colonIdx + 1));
         this.mqttUsername = iotProperties.getMqtt().getUsername();
@@ -64,8 +70,11 @@ public abstract class AbstractMqttConsumer {
             initMqttConnectOptions();
             setMqttCallback();
             connectAndSubscribeTopic();
-        } catch (MqttException | InterruptedException e) {
-            log.error("MQTT客户端初始化失败：", e);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new IllegalStateException("MQTT初始化被中断", e);
+        } catch (MqttException e) {
+            throw new IllegalStateException("MQTT客户端初始化失败", e);
         }
     }
 
@@ -95,6 +104,9 @@ public abstract class AbstractMqttConsumer {
         connOpts.setAutomaticReconnect(true);
         connOpts.setConnectionTimeout(10);
         connOpts.setUserName(mqttUsername);
+        if (mqttPassword == null) {
+            mqttPassword = "";
+        }
         connOpts.setPassword(mqttPassword.toCharArray());
     }
 
@@ -102,7 +114,7 @@ public abstract class AbstractMqttConsumer {
         mqttClient.setCallback(new MqttCallback() {
             @Override
             public void connectionLost(Throwable cause) {
-                log.error("MQTT连接断开，开始重连：" + cause.getMessage());
+                log.error("MQTT连接断开，开始重连: {}", cause.getMessage(), cause);
                 isMqttConnected = false;
                 reconnect();
             }
@@ -134,25 +146,35 @@ public abstract class AbstractMqttConsumer {
             if (connectToken.isComplete()) {
                 mqttClient.subscribe(getSubscribeTopic(), QOS);
                 isMqttConnected = true;
-                log.info("MQTT连接成功，已订阅主题：" + getSubscribeTopic());
+                log.info("MQTT连接成功，已订阅主题: {}", getSubscribeTopic());
             }
         }
     }
 
-    public void reconnect() {
+    public synchronized void reconnect() {
         int maxReconnectAttempts = 3;
         for (int attempt = 1; attempt <= maxReconnectAttempts; attempt++) {
             try {
                 Thread.sleep(RECONNECT_INTERVAL);
-                if (mqttClient != null && !mqttClient.isConnected()) {
-                    mqttClient.connect(connOpts);
-                    mqttClient.subscribe(getSubscribeTopic(), QOS);
-                    isMqttConnected = true;
-                    log.info("MQTT重连成功（第" + attempt + "次尝试）");
-                    break;
+                if (mqttClient == null || !mqttClient.isConnected()) {
+                    if (mqttClient != null) {
+                        try {
+                            mqttClient.close();
+                        } catch (MqttException ignored) {
+                        }
+                    }
+                    String clientId = generateClientId();
+                    mqttClient = new MqttClient(brokerUrl, clientId, new MemoryPersistence());
+                    initMqttConnectOptions();
+                    setMqttCallback();
                 }
+                mqttClient.connect(connOpts);
+                mqttClient.subscribe(getSubscribeTopic(), QOS);
+                isMqttConnected = true;
+                log.info("MQTT重连成功（第{}次尝试）", attempt);
+                break;
             } catch (MqttException | InterruptedException e) {
-                log.error("MQTT重连失败（第" + attempt + "次尝试）：" + e.getMessage());
+                log.error("MQTT重连失败（第{}次尝试）: {}", attempt, e.getMessage());
                 if (attempt == maxReconnectAttempts) {
                     log.error("已达最大重连次数，停止重连");
                 }
@@ -161,17 +183,26 @@ public abstract class AbstractMqttConsumer {
     }
 
     @PreDestroy
-    public void disconnect() {
+    public synchronized void disconnect() {
         try {
-            if (mqttClient != null && mqttClient.isConnected()) {
-                mqttClient.disconnect();
-                mqttClient.close();
+            if (mqttClient != null) {
+                if (mqttClient.isConnected()) {
+                    try {
+                        mqttClient.disconnect();
+                    } catch (MqttException e) {
+                        log.error("MQTT断开连接失败: {}", e.getMessage());
+                    }
+                }
+                try {
+                    mqttClient.close();
+                } catch (MqttException e) {
+                    log.error("MQTT客户端关闭失败: {}", e.getMessage());
+                }
                 log.info("MQTT连接已断开");
             }
-            executorService.shutdown();
             onDestroy();
-        } catch (MqttException e) {
-            log.error("MQTT断开连接失败：", e);
+        } catch (Exception e) {
+            log.error("MQTT资源释放异常: {}", e.getMessage(), e);
         }
     }
 }

iot-platform/src/main/java/com/iot/platform/mqtt/MqttChargeStationConsumer.java

@@ -1,506 +1,73 @@
 package com.iot.platform.mqtt;
+
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.iot.platform.domain.SysController;
-import com.iot.platform.service.*;
-import org.eclipse.paho.client.mqttv3.*;
-import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
 import com.iot.platform.config.IotProperties;
+import com.iot.platform.service.TDengineService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.DependsOn;
-import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Component;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.nio.charset.StandardCharsets;
+
 import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicBoolean;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ScheduledExecutorService;
 
-/**
- * TDegine
- * 添加接驳庄数据到TDeinge
- */
+@SuppressWarnings("unchecked")
 @Component
-public class MqttChargeStationConsumer {
-
-    private static final Logger log = LoggerFactory.getLogger(MqttChargeStationConsumer.class);
+@DependsOn({"tdengineService"})
+public class MqttChargeStationConsumer extends AbstractDynamicMqttConsumer {
 
-    @Autowired
-    private TDengineService tdengineService;
+    private final TDengineService tdengineService;
     private final ObjectMapper objectMapper = new ObjectMapper();
-    @Autowired
-    private IotProperties iotProperties;
-
-    // MQTT 配置
-    private String brokerUrl;
-    private String brokerHost;
-    private int brokerPort;
-    private static final int QOS = 1;
-    private static final int CONNECT_TIMEOUT = 3000;
-    private static final int RECONNECT_INTERVAL = 5000;
-    private static final int MAX_BATCH_SIZE = 50;
-    private String mqttUsername;
-    private String mqttPassword;
-    private MqttClient mqttClient;
-    private MqttConnectOptions connOpts;
-    private final Set<String> currentTopicSet = new CopyOnWriteArraySet<>();
-    private final AtomicBoolean isConnected = new AtomicBoolean(false);
-    private final Object lock = new Object();
-
-    // 核心调度线程池
-    private final ScheduledExecutorService coreExecutor = Executors.newSingleThreadScheduledExecutor(r -> {
-        Thread t = new Thread(r);
-        t.setName("mqtt-core-scheduler");
-        t.setDaemon(false); // ← 改这里！
-        t.setPriority(Thread.NORM_PRIORITY - 1);
-        return t;
-    });
-
-    // TDengine 写入线程池
-    private final ExecutorService writeExecutor = new ThreadPoolExecutor(
-            4, 8, 60L, TimeUnit.SECONDS,
-            new LinkedBlockingQueue<>(5000),
-            r -> {
-                Thread t = new Thread(r);
-                t.setName("td-write-worker-" + UUID.randomUUID().toString().substring(0, 4));
-                t.setDaemon(false); // ← 改这里！
-                return t;
-            },
-            new ThreadPoolExecutor.CallerRunsPolicy()
-    );
-
-    @PostConstruct
-    @DependsOn({"sysControllerService", "tdengineService"})
-    public void initMqttConnection() {
-        this.brokerUrl = iotProperties.getMqtt().getBrokerUrl();
-        String brokerAddr = this.brokerUrl.replace("tcp://", "");
-        int colonIdx = brokerAddr.lastIndexOf(':');
-        this.brokerHost = brokerAddr.substring(0, colonIdx);
-        this.brokerPort = Integer.parseInt(brokerAddr.substring(colonIdx + 1));
-        this.mqttUsername = iotProperties.getMqtt().getUsername();
-        this.mqttPassword = iotProperties.getMqtt().getPassword();
-
-        log.info(">>> 开始初始化 MQTT 服务...");
-
-        CompletableFuture<Boolean> connectFuture = CompletableFuture.supplyAsync(() -> {
-            int initRetry = 0;
-            while (initRetry < 3 && !isConnected.get()) {
-                try {
-                    if (refreshMqttSubscription()) {
-                        log.info(">>> MQTT 初始化成功");
-                        return true;
-                    }
-                } catch (Exception e) {
-                    log.error("MQTT 启动初始化失败（第" + (initRetry + 1) + "次）：", e);
-                }
-                initRetry++;
-                try {
-                    Thread.sleep(RECONNECT_INTERVAL * initRetry);
-                } catch (InterruptedException ex) {
-                    Thread.currentThread().interrupt();
-                    break;
-                }
-            }
-            return false;
-        }, coreExecutor);
-
-        try {
-            Boolean connected = connectFuture.get(10, TimeUnit.SECONDS);
-            if (!connected) {
-                log.error("!!! MQTT 启动失败（超时），触发后台重连机制");
-                triggerReconnect();
-            }
-        } catch (TimeoutException e) {
-            log.error("MQTT 初始化超时（10秒），触发后台重连机制");
-            triggerReconnect();
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            log.error("MQTT 初始化被中断");
-            triggerReconnect();
-        } catch (ExecutionException e) {
-            log.error("MQTT 初始化执行异常: ", e.getCause());
-            triggerReconnect();
-        }
-    }
-
-    private void initMqttConnectOptions() {
-        if (connOpts != null) return;
-        try {
-            connOpts = new MqttConnectOptions();
-            connOpts.setCleanSession(false);
-            connOpts.setAutomaticReconnect(true);
-            connOpts.setConnectionTimeout(10);
-            connOpts.setKeepAliveInterval(60);
-            connOpts.setMaxInflight(10);
-            connOpts.setMaxReconnectDelay(30);
-            connOpts.setUserName(mqttUsername);
-            connOpts.setPassword(mqttPassword.toCharArray());
-        } catch (Exception e) {
-            log.error("初始化 MQTT 配置失败：" + e.getMessage());
-            throw new RuntimeException(e);
-        }
-    }
-
-    public boolean refreshMqttSubscription() {
-        synchronized (lock) {
-            try {
-                initMqttConnectOptions();
-                List<String> latestTopicList =new ArrayList<>();
-                latestTopicList.add("station/ChargeStation/device/+/post/json");
-                log.info("🔍 查询到 Topic 列表: " + latestTopicList);
-
-                if (latestTopicList == null || latestTopicList.isEmpty()) {
-                    log.error("未查询到 Topic，取消所有订阅");
-                    unsubscribeAll();
-                    currentTopicSet.clear();
-                    return false;
-                }
 
-                Set<String> latestTopicSet = new HashSet<>();
-                for (String topic : latestTopicList) {
-                    if (topic != null && !topic.trim().isEmpty()) {
-                        latestTopicSet.add(topic.trim());
-                    }
-                }
-
-                if (latestTopicSet.equals(currentTopicSet)) {
-                    log.info("Topic 列表无变化，无需刷新订阅关系");
-                    if (!isConnected.get() && !latestTopicSet.isEmpty()) {
-                        return connectAndSubscribe(latestTopicSet);
-                    }
-                    return true;
-                }
-
-                Set<String> topicsToAdd = new HashSet<>(latestTopicSet);
-                topicsToAdd.removeAll(currentTopicSet);
-                Set<String> topicsToRemove = new HashSet<>(currentTopicSet);
-                topicsToRemove.removeAll(latestTopicSet);
-
-                if (!isConnected.get()) {
-                    return connectAndSubscribe(latestTopicSet);
-                } else {
-                    if (!topicsToRemove.isEmpty()) unsubscribeTopics(topicsToRemove);
-                    if (!topicsToAdd.isEmpty()) subscribeTopics(topicsToAdd);
-                }
-
-                currentTopicSet.clear();
-                currentTopicSet.addAll(latestTopicSet);
-                log.info("MQTT 订阅刷新完成，当前数量：" + currentTopicSet.size());
-                return true;
-
-            } catch (Exception e) {
-                log.error("MQTT 订阅刷新失败：", e);
-                return false;
-            }
-        }
-    }
-
-    private boolean connectAndSubscribe(Set<String> topicSet) {
-        synchronized (lock) {
-            if (isConnected.get() && mqttClient != null && mqttClient.isConnected()) {
-                return true;
-            }
-            try {
-                if (!checkServerAvailability()) {
-                    log.error("Broker 不可达，连接失败");
-                    return false;
-                }
-
-                if (mqttClient == null) {
-                    String clientId = generateUniqueClientId();
-                    MemoryPersistence persistence = new MemoryPersistence();
-                    mqttClient = new MqttClient(brokerUrl, clientId, persistence);
-                    setMqttCallback();
-                }
-
-                int connectRetry = 0;
-                while (connectRetry < 3 && !mqttClient.isConnected()) {
-                    try {
-                        mqttClient.connect(connOpts);
-                        if (mqttClient.isConnected()) {
-                            isConnected.set(true);
-                            log.info("MQTT 连接成功，客户端 ID：" + mqttClient.getClientId());
-                            break;
-                        }
-                    } catch (MqttException e) {
-                        log.error("MQTT 连接失败（第" + (connectRetry + 1) + "次）：" + e.getMessage());
-                        connectRetry++;
-                        if (connectRetry < 3) Thread.sleep(RECONNECT_INTERVAL * (connectRetry + 1));
-                    }
-                }
-
-                if (!mqttClient.isConnected()) {
-                    isConnected.set(false);
-                    return false;
-                }
-
-                if (!topicSet.isEmpty()) {
-                    List<String> topicList = new ArrayList<>(topicSet);
-                    for (int i = 0; i < topicList.size(); i += MAX_BATCH_SIZE) {
-                        int end = Math.min(i + MAX_BATCH_SIZE, topicList.size());
-                        List<String> batch = topicList.subList(i, end);
-                        batchSubscribeTopics(new HashSet<>(batch));
-                        Thread.sleep(100);
-                    }
-                }
-                return true;
-
-            } catch (MqttException e) {
-                log.error("MQTT 连接 + 订阅失败：", e);
-                isConnected.set(false);
-                triggerReconnect();
-                return false;
-            } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
-                log.error("MQTT 连接 + 订阅被中断");
-                isConnected.set(false);
-                return false;
-            }
-        }
-    }
-
-    private void batchSubscribeTopics(Set<String> topicSet) {
-        if (topicSet.isEmpty() || !isConnected.get() || mqttClient == null) return;
-        try {
-            List<String> topicList = new ArrayList<>(topicSet);
-            String[] topics = topicList.toArray(new String[0]);
-            int[] qosArr = new int[topics.length];
-            Arrays.fill(qosArr, QOS);
-            mqttClient.subscribe(topics, qosArr);
-            log.info("订阅完成：" + topicList.size() + "个 Topic");
-        } catch (MqttException e) {
-            log.error("批量订阅失败：" + e.getMessage());
-            retrySubscribeBatch(new ArrayList<>(topicSet), 1);
-        }
-    }
-
-    private void retrySubscribeBatch(List<String> batchTopics, int retryTimes) {
-        for (int retry = 1; retry <= retryTimes; retry++) {
-            try {
-                Thread.sleep(1000 * retry);
-                if (!isConnected.get() || mqttClient == null) continue;
-                String[] topics = batchTopics.toArray(new String[0]);
-                int[] qosArr = new int[topics.length];
-                Arrays.fill(qosArr, QOS);
-                mqttClient.subscribe(topics, qosArr);
-                log.info("重试订阅成功（第" + retry + "次），数量：" + batchTopics.size());
-                return;
-            } catch (MqttException e) {
-                log.error("重试订阅失败（第" + retry + "次）：" + e.getMessage());
-            } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
-                log.error("重试订阅被中断");
-                break;
-            }
-        }
-        log.error("批次订阅最终失败：" + batchTopics);
-    }
-
-    private void subscribeTopics(Set<String> topicsToAdd) {
-        if (topicsToAdd.isEmpty() || !isConnected.get()) return;
-        batchSubscribeTopics(topicsToAdd);
-    }
-
-    private void unsubscribeTopics(Set<String> topicsToRemove) {
-        if (topicsToRemove.isEmpty() || !isConnected.get() || mqttClient == null) return;
-        try {
-            String[] topics = topicsToRemove.toArray(new String[0]);
-            mqttClient.unsubscribe(topics);
-            log.info("取消订阅完成，数量：" + topicsToRemove.size());
-        } catch (MqttException e) {
-            log.error("取消订阅失败：" + e.getMessage());
-        }
-    }
-
-    private void unsubscribeAll() {
-        if (currentTopicSet.isEmpty() || !isConnected.get() || mqttClient == null) return;
-        try {
-            String[] topics = currentTopicSet.toArray(new String[0]);
-            mqttClient.unsubscribe(topics);
-            log.info("取消所有订阅，数量：" + currentTopicSet.size());
-        } catch (MqttException e) {
-            log.error("取消所有订阅失败：" + e.getMessage());
-        }
-    }
-
-    private void triggerReconnect() {
-        coreExecutor.schedule(() -> {
-            int maxAttempts = 3;
-            int attempt = 1;
-            while (attempt <= maxAttempts && !isConnected.get()) {
-                try {
-                    log.info("MQTT 重连（第" + attempt + "次）");
-                    if (connectAndSubscribe(currentTopicSet)) {
-                        log.info("MQTT 重连成功");
-                        break;
-                    }
-                    attempt++;
-                    if (attempt <= maxAttempts) Thread.sleep(RECONNECT_INTERVAL * 2 * attempt);
-                } catch (InterruptedException e) {
-                    Thread.currentThread().interrupt();
-                    break;
-                } catch (Exception e) {
-                    log.error("MQTT 重连失败（第" + attempt + "次）：" + e.getMessage());
-                    attempt++;
-                }
-            }
-            if (attempt > maxAttempts) {
-                log.error("MQTT 重连达最大次数，停止尝试");
-                isConnected.set(false);
-            }
-        }, 5, TimeUnit.SECONDS);
-    }
-
-    private boolean checkServerAvailability() {
-        try (Socket socket = new Socket()) {
-            socket.setSoTimeout(CONNECT_TIMEOUT);
-            socket.setTcpNoDelay(true);
-            socket.connect(new InetSocketAddress(brokerHost, brokerPort), CONNECT_TIMEOUT);
-            return true;
-        } catch (Exception e) {
-            log.error("MQTT Broker 不可达：" + e.getMessage());
-            return false;
+    @Autowired
+    public MqttChargeStationConsumer(IotProperties iotProperties,
+                                     @Qualifier("mqttCoreExecutor") ScheduledExecutorService coreExecutor,
+                                     @Qualifier("mqttWriteExecutor") ExecutorService writeExecutor,
+                                     TDengineService tdengineService) {
+        super(iotProperties, coreExecutor, writeExecutor);
+        this.tdengineService = tdengineService;
+    }
+
+    @Override
+    protected List<String> fetchTopics() {
+        String topic = iotProperties.getMqtt().getChargeStationTopic();
+        if (topic == null || topic.trim().isEmpty()) {
+            log.warn("ChargeStation topic 未配置");
+            return Collections.emptyList();
         }
+        return Collections.singletonList(topic.trim());
     }
 
-    private String generateUniqueClientId() {
-        String osPrefix = System.getProperty("os.name").toLowerCase().contains("windows") ? "mqtt_win_" : "mqtt_linux_";
-        return osPrefix + System.currentTimeMillis() + "_" + UUID.randomUUID().toString().replace("-", "").substring(0, 8);
+    @Override
+    protected void processMessage(String content, String topic) throws Exception {
+        List<Map<String, Object>> messageList = objectMapper.readValue(content, new TypeReference<List<Map<String, Object>>>() {});
+        processMessageAndWriteToTDengine(messageList, topic);
     }
 
-    private void setMqttCallback() {
-        if (mqttClient == null) return;
-        mqttClient.setCallback(new MqttCallback() {
-            @Override
-            public void connectionLost(Throwable cause) {
-                log.error("MQTT 连接断开：" + cause.getMessage());
-                isConnected.set(false);
-                coreExecutor.schedule(() -> triggerReconnect(), 5, TimeUnit.SECONDS);
-            }
-
-            @Override
-            public void messageArrived(String topic, MqttMessage message) {
-                // 直接提交到写入线程池处理
-                writeExecutor.submit(() -> {
-                    try {
-                        String content = new String(message.getPayload(), StandardCharsets.UTF_8);
-                        if (content == null || content.trim().isEmpty()) return;
-                        List<Map<String, Object>> messageList = objectMapper.readValue(content, new TypeReference<List<Map<String, Object>>>() {});
-
-                        processMessageAndWriteToTDengine(messageList, topic);
-                    } catch (Exception e) {
-                        log.error("MQTT 消息处理失败（Topic：" + topic + "）：", e);
-                    }
-                });
-            }
-
-            @Override
-            public void deliveryComplete(IMqttDeliveryToken token) {
-                try { token.waitForCompletion(1000); } catch (MqttException ignored) {}
-            }
-        });
-    }
-
-    // 参数改为 List
     private void processMessageAndWriteToTDengine(List<Map<String, Object>> dataList, String topic) throws Exception {
         String[] topicParts = topic.split("/");
         if (topicParts.length < 2) {
             throw new IllegalArgumentException("无效的 Topic 格式：" + topic);
         }
-        // TDengine 批量插入通常需要一个列表
+
         List<Map<String, Object>> batchToInsert = new ArrayList<>();
         for (Map<String, Object> dataMap : dataList) {
-            // 检查数据是否为空
             if (dataMap == null || dataMap.isEmpty()) {
                 continue;
             }
-            // 深拷贝
             Map<String, Object> list = deepCopyMap(dataMap);
             batchToInsert.add(list);
         }
 
-        // 如果有数据，才写入数据库
         if (!batchToInsert.isEmpty()) {
             String dbName = topicParts[1];
             String superTable = topicParts[3];
             LocalDate date = LocalDate.now();
             String tableName = superTable + "_" + date.getYear() + date.getMonthValue();
-            // 调用写入方法（假设 insertBatch 接收 List）
             tdengineService.insertBatch(dbName, tableName, batchToInsert);
         }
     }
-
-    private Map<String, Object> deepCopyMap(Map<String, Object> original) {
-        if (original == null) return new HashMap<>();
-        try {
-            String json = objectMapper.writeValueAsString(original);
-            return objectMapper.readValue(json, new TypeReference<Map<String, Object>>() {});
-        } catch (Exception e) {
-            Map<String, Object> copy = new HashMap<>(original.size());
-            original.forEach((k, v) -> {
-                if (v instanceof Map) {
-                    copy.put(k, deepCopyMap((Map<String, Object>) v));
-                } else {
-                    copy.put(k, v);
-                }
-            });
-            return copy;
-        }
-    }
-
-    public void disconnect() {
-        synchronized (lock) {
-            shutdownExecutor(writeExecutor, "TDengine 写入");
-
-            if (mqttClient != null) {
-                try {
-                    if (mqttClient.isConnected()) {
-                        unsubscribeAll();
-                        mqttClient.disconnect(10000);
-                    }
-                    mqttClient.close();
-                    log.info("MQTT 连接已断开");
-                } catch (MqttException e) {
-                    log.error("断开 MQTT 连接失败：" + e.getMessage());
-                } finally {
-                    isConnected.set(false);
-                    mqttClient = null;
-                }
-            }
-            if (tdengineService != null) tdengineService.close();
-        }
-    }
-
-    private void shutdownExecutor(ExecutorService executor, String name) {
-        if (executor == null || executor.isShutdown()) return;
-        try {
-            executor.shutdown();
-            if (!executor.awaitTermination(20, TimeUnit.SECONDS)) {
-                List<Runnable> remaining = executor.shutdownNow();
-                log.error(name + " 线程池强制关闭，剩余任务数：" + remaining.size());
-            } else {
-                log.info(name + " 线程池已优雅关闭");
-            }
-        } catch (InterruptedException e) {
-            executor.shutdownNow();
-            Thread.currentThread().interrupt();
-            log.error(name + " 线程池关闭被中断");
-        }
-    }
-
-    @PreDestroy
-    public void destroy() {
-        log.info(">>> 服务正在关闭...");
-        disconnect();
-        shutdownExecutor(coreExecutor, "MQTT 核心");
-    }
-}
+}

iot-platform/src/main/java/com/iot/platform/mqtt/MqttDynamicConsumer.java

@@ -2,422 +2,58 @@ package com.iot.platform.mqtt;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.iot.platform.config.IotProperties;
 import com.iot.platform.domain.SysController;
 import com.iot.platform.service.SysControllerService;
 import com.iot.platform.service.TDengineService;
 import org.eclipse.paho.client.mqttv3.*;
-import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
-import com.iot.platform.config.IotProperties;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.DependsOn;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.nio.charset.StandardCharsets;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicBoolean;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 
-@Component
 @SuppressWarnings("unchecked")
-public class MqttDynamicConsumer {
-
-    private static final Logger log = LoggerFactory.getLogger(MqttDynamicConsumer.class);
-
-    @Autowired
-    private SysControllerService sysControllerService;
-
-    @Autowired
-    private TDengineService tdengineService;
+@Component
+@DependsOn({"sysControllerService", "tdengineService"})
+public class MqttDynamicConsumer extends AbstractDynamicMqttConsumer {
 
+    private final SysControllerService sysControllerService;
+    private final TDengineService tdengineService;
+    private final StringRedisTemplate stringRedisTemplate;
     private final ObjectMapper objectMapper = new ObjectMapper();
-    @Autowired
-    private StringRedisTemplate stringRedisTemplate;
 
     @Autowired
-    private IotProperties iotProperties;
-
-    // MQTT 配置
-    private String brokerUrl;
-    private String brokerHost;
-    private int brokerPort;
-    private static final int QOS = 1;
-    private static final int CONNECT_TIMEOUT = 3000;
-    private static final int RECONNECT_INTERVAL = 5000;
-    private static final int MAX_BATCH_SIZE = 50;
-
-    private String mqttUsername;
-    private String mqttPassword;
-
-    private MqttClient mqttClient;
-    private MqttConnectOptions connOpts;
-    private final Set<String> currentTopicSet = new CopyOnWriteArraySet<>();
-    private final AtomicBoolean isConnected = new AtomicBoolean(false);
-    private final Object lock = new Object();
-
-    // 核心调度线程池
-    private final ScheduledExecutorService coreExecutor = Executors.newSingleThreadScheduledExecutor(r -> {
-        Thread t = new Thread(r);
-        t.setName("mqtt-core-scheduler");
-        t.setDaemon(false); // ← 改这里！
-        t.setPriority(Thread.NORM_PRIORITY - 1);
-        return t;
-    });
-
-    // TDengine 写入线程池
-    private final ExecutorService writeExecutor = new ThreadPoolExecutor(
-            4, 8, 60L, TimeUnit.SECONDS,
-            new LinkedBlockingQueue<>(5000),
-            r -> {
-                Thread t = new Thread(r);
-                t.setName("td-write-worker-" + UUID.randomUUID().toString().substring(0, 4));
-                t.setDaemon(false); // ← 改这里！
-                return t;
-            },
-            new ThreadPoolExecutor.CallerRunsPolicy()
-    );
-
-    @PostConstruct
-    @DependsOn({"sysControllerService", "tdengineService"})
-    public void initMqttConnection() {
-        this.brokerUrl = iotProperties.getMqtt().getBrokerUrl();
-        String brokerAddr = this.brokerUrl.replace("tcp://", "");
-        int colonIdx = brokerAddr.lastIndexOf(':');
-        this.brokerHost = brokerAddr.substring(0, colonIdx);
-        this.brokerPort = Integer.parseInt(brokerAddr.substring(colonIdx + 1));
-        this.mqttUsername = iotProperties.getMqtt().getUsername();
-        this.mqttPassword = iotProperties.getMqtt().getPassword();
-
-        log.info(">>> 开始初始化 MQTT 服务...");
-
-        CompletableFuture<Boolean> connectFuture = CompletableFuture.supplyAsync(() -> {
-            int initRetry = 0;
-            while (initRetry < 3 && !isConnected.get()) {
-                try {
-                    if (refreshMqttSubscription()) {
-                        log.info(">>> MQTT 初始化成功");
-                        return true;
-                    }
-                } catch (Exception e) {
-                    log.error("MQTT 启动初始化失败（第" + (initRetry + 1) + "次）：", e);
-                }
-                initRetry++;
-                try {
-                    Thread.sleep(RECONNECT_INTERVAL * initRetry);
-                } catch (InterruptedException ex) {
-                    Thread.currentThread().interrupt();
-                    break;
-                }
-            }
-            return false;
-        }, coreExecutor);
-
-        try {
-            Boolean connected = connectFuture.get(10, TimeUnit.SECONDS);
-            if (!connected) {
-                log.error("!!! MQTT 启动失败（超时），触发后台重连机制");
-                triggerReconnect();
-            }
-        } catch (TimeoutException e) {
-            log.error("MQTT 初始化超时（10秒），触发后台重连机制");
-            triggerReconnect();
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            log.error("MQTT 初始化被中断");
-            triggerReconnect();
-        } catch (ExecutionException e) {
-            log.error("MQTT 初始化执行异常: ", e.getCause());
-            triggerReconnect();
-        }
-    }
-
-    private void initMqttConnectOptions() {
-        if (connOpts != null) return;
-        try {
-            connOpts = new MqttConnectOptions();
-            connOpts.setCleanSession(false);
-            connOpts.setAutomaticReconnect(true);
-            connOpts.setConnectionTimeout(10);
-            connOpts.setKeepAliveInterval(60);
-            connOpts.setMaxInflight(10);
-            connOpts.setMaxReconnectDelay(30);
-            connOpts.setUserName(mqttUsername);
-            connOpts.setPassword(mqttPassword.toCharArray());
-        } catch (Exception e) {
-            log.error("初始化 MQTT 配置失败：" + e.getMessage());
-            throw new RuntimeException(e);
-        }
-    }
-
-    public boolean refreshMqttSubscription() {
-        synchronized (lock) {
-            try {
-                initMqttConnectOptions();
-                List<String> latestTopicList = sysControllerService.selectall();
-                log.info("🔍 查询到 Topic 列表: " + latestTopicList);
-
-                if (latestTopicList == null || latestTopicList.isEmpty()) {
-                    log.error("未查询到 Topic，取消所有订阅");
-                    unsubscribeAll();
-                    currentTopicSet.clear();
-                    return false;
-                }
-
-                Set<String> latestTopicSet = new HashSet<>();
-                for (String topic : latestTopicList) {
-                    if (topic != null && !topic.trim().isEmpty()) {
-                        latestTopicSet.add(topic.trim());
-                    }
-                }
-
-                if (latestTopicSet.equals(currentTopicSet)) {
-                    log.info("Topic 列表无变化，无需刷新订阅关系");
-                    if (!isConnected.get() && !latestTopicSet.isEmpty()) {
-                        return connectAndSubscribe(latestTopicSet);
-                    }
-                    return true;
-                }
-
-                Set<String> topicsToAdd = new HashSet<>(latestTopicSet);
-                topicsToAdd.removeAll(currentTopicSet);
-                Set<String> topicsToRemove = new HashSet<>(currentTopicSet);
-                topicsToRemove.removeAll(latestTopicSet);
-
-                if (!isConnected.get()) {
-                    return connectAndSubscribe(latestTopicSet);
-                } else {
-                    if (!topicsToRemove.isEmpty()) unsubscribeTopics(topicsToRemove);
-                    if (!topicsToAdd.isEmpty()) subscribeTopics(topicsToAdd);
-                }
-
-                currentTopicSet.clear();
-                currentTopicSet.addAll(latestTopicSet);
-                log.info("MQTT 订阅刷新完成，当前数量：" + currentTopicSet.size());
-                return true;
-
-            } catch (Exception e) {
-                log.error("MQTT 订阅刷新失败：", e);
-                return false;
-            }
-        }
-    }
-
-    private boolean connectAndSubscribe(Set<String> topicSet) {
-        synchronized (lock) {
-            if (isConnected.get() && mqttClient != null && mqttClient.isConnected()) {
-                return true;
-            }
-            try {
-                if (!checkServerAvailability()) {
-                    log.error("Broker 不可达，连接失败");
-                    return false;
-                }
-
-                if (mqttClient == null) {
-                    String clientId = generateUniqueClientId();
-                    MemoryPersistence persistence = new MemoryPersistence();
-                    mqttClient = new MqttClient(brokerUrl, clientId, persistence);
-                    setMqttCallback();
-                }
-
-                int connectRetry = 0;
-                while (connectRetry < 3 && !mqttClient.isConnected()) {
-                    try {
-                        mqttClient.connect(connOpts);
-                        if (mqttClient.isConnected()) {
-                            isConnected.set(true);
-                            log.info("MQTT 连接成功，客户端 ID：" + mqttClient.getClientId());
-                            break;
-                        }
-                    } catch (MqttException e) {
-                        log.error("MQTT 连接失败（第" + (connectRetry + 1) + "次）：" + e.getMessage());
-                        connectRetry++;
-                        if (connectRetry < 3) Thread.sleep(RECONNECT_INTERVAL * (connectRetry + 1));
-                    }
-                }
-
-                if (!mqttClient.isConnected()) {
-                    isConnected.set(false);
-                    return false;
-                }
-
-                if (!topicSet.isEmpty()) {
-                    List<String> topicList = new ArrayList<>(topicSet);
-                    for (int i = 0; i < topicList.size(); i += MAX_BATCH_SIZE) {
-                        int end = Math.min(i + MAX_BATCH_SIZE, topicList.size());
-                        List<String> batch = topicList.subList(i, end);
-                        batchSubscribeTopics(new HashSet<>(batch));
-                        Thread.sleep(100);
-                    }
-                }
-                return true;
-
-            } catch (MqttException e) {
-                log.error("MQTT 连接 + 订阅失败：", e);
-                isConnected.set(false);
-                triggerReconnect();
-                return false;
-            } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
-                log.error("MQTT 连接 + 订阅被中断");
-                isConnected.set(false);
-                return false;
-            }
-        }
-    }
-
-
-
-
-    private void batchSubscribeTopics(Set<String> topicSet) {
-        if (topicSet.isEmpty() || !isConnected.get() || mqttClient == null) return;
-        try {
-            List<String> topicList = new ArrayList<>(topicSet);
-            String[] topics = topicList.toArray(new String[0]);
-            int[] qosArr = new int[topics.length];
-            Arrays.fill(qosArr, QOS);
-            mqttClient.subscribe(topics, qosArr);
-            log.info("订阅完成：" + topicList.size() + "个 Topic");
-        } catch (MqttException e) {
-            log.error("批量订阅失败：" + e.getMessage());
-            retrySubscribeBatch(new ArrayList<>(topicSet), 1);
-        }
-    }
-
-    private void retrySubscribeBatch(List<String> batchTopics, int retryTimes) {
-        for (int retry = 1; retry <= retryTimes; retry++) {
-            try {
-                Thread.sleep(1000 * retry);
-                if (!isConnected.get() || mqttClient == null) continue;
-                String[] topics = batchTopics.toArray(new String[0]);
-                int[] qosArr = new int[topics.length];
-                Arrays.fill(qosArr, QOS);
-                mqttClient.subscribe(topics, qosArr);
-                log.info("重试订阅成功（第" + retry + "次），数量：" + batchTopics.size());
-                return;
-            } catch (MqttException e) {
-                log.error("重试订阅失败（第" + retry + "次）：" + e.getMessage());
-            } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
-                log.error("重试订阅被中断");
-                break;
-            }
-        }
-        log.error("批次订阅最终失败：" + batchTopics);
-    }
-
-    private void subscribeTopics(Set<String> topicsToAdd) {
-        if (topicsToAdd.isEmpty() || !isConnected.get()) return;
-        batchSubscribeTopics(topicsToAdd);
-    }
-
-    private void unsubscribeTopics(Set<String> topicsToRemove) {
-        if (topicsToRemove.isEmpty() || !isConnected.get() || mqttClient == null) return;
-        try {
-            String[] topics = topicsToRemove.toArray(new String[0]);
-            mqttClient.unsubscribe(topics);
-            log.info("取消订阅完成，数量：" + topicsToRemove.size());
-        } catch (MqttException e) {
-            log.error("取消订阅失败：" + e.getMessage());
-        }
-    }
-
-    private void unsubscribeAll() {
-        if (currentTopicSet.isEmpty() || !isConnected.get() || mqttClient == null) return;
-        try {
-            String[] topics = currentTopicSet.toArray(new String[0]);
-            mqttClient.unsubscribe(topics);
-            log.info("取消所有订阅，数量：" + currentTopicSet.size());
-        } catch (MqttException e) {
-            log.error("取消所有订阅失败：" + e.getMessage());
-        }
-    }
-
-    private void triggerReconnect() {
-        coreExecutor.schedule(() -> {
-            int maxAttempts = 3;
-            int attempt = 1;
-            while (attempt <= maxAttempts && !isConnected.get()) {
-                try {
-                    log.info("MQTT 重连（第" + attempt + "次）");
-                    if (connectAndSubscribe(currentTopicSet)) {
-                        log.info("MQTT 重连成功");
-                        break;
-                    }
-                    attempt++;
-                    if (attempt <= maxAttempts) Thread.sleep(RECONNECT_INTERVAL * 2 * attempt);
-                } catch (InterruptedException e) {
-                    Thread.currentThread().interrupt();
-                    break;
-                } catch (Exception e) {
-                    log.error("MQTT 重连失败（第" + attempt + "次）：" + e.getMessage());
-                    attempt++;
-                }
-            }
-            if (attempt > maxAttempts) {
-                log.error("MQTT 重连达最大次数，停止尝试");
-                isConnected.set(false);
-            }
-        }, 5, TimeUnit.SECONDS);
+    public MqttDynamicConsumer(IotProperties iotProperties,
+                               @Qualifier("mqttCoreExecutor") ScheduledExecutorService coreExecutor,
+                               @Qualifier("mqttWriteExecutor") ExecutorService writeExecutor,
+                               SysControllerService sysControllerService,
+                               TDengineService tdengineService,
+                               StringRedisTemplate stringRedisTemplate) {
+        super(iotProperties, coreExecutor, writeExecutor);
+        this.sysControllerService = sysControllerService;
+        this.tdengineService = tdengineService;
+        this.stringRedisTemplate = stringRedisTemplate;
     }
 
-    private boolean checkServerAvailability() {
-        try (Socket socket = new Socket()) {
-            socket.setSoTimeout(CONNECT_TIMEOUT);
-            socket.setTcpNoDelay(true);
-            socket.connect(new InetSocketAddress(brokerHost, brokerPort), CONNECT_TIMEOUT);
-            return true;
-        } catch (Exception e) {
-            log.error("MQTT Broker 不可达：" + e.getMessage());
-            return false;
-        }
+    @Override
+    protected List<String> fetchTopics() {
+        return sysControllerService.selectall();
     }
 
-    private String generateUniqueClientId() {
-        String osPrefix = System.getProperty("os.name").toLowerCase().contains("windows") ? "mqtt_win_" : "mqtt_linux_";
-        return osPrefix + System.currentTimeMillis() + "_" + UUID.randomUUID().toString().replace("-", "").substring(0, 8);
-    }
-
-    private void setMqttCallback() {
-        if (mqttClient == null) return;
-        mqttClient.setCallback(new MqttCallback() {
-            @Override
-            public void connectionLost(Throwable cause) {
-                log.error("MQTT 连接断开：" + cause.getMessage());
-                isConnected.set(false);
-                coreExecutor.schedule(() -> triggerReconnect(), 5, TimeUnit.SECONDS);
-            }
-
-            @Override
-            public void messageArrived(String topic, MqttMessage message) {
-                // 直接提交到写入线程池处理
-                writeExecutor.submit(() -> {
-                    try {
-                        String content = new String(message.getPayload(), StandardCharsets.UTF_8);
-                        if (content == null || content.trim().isEmpty()) return;
-
-                        Map<String, Object> messageMap = objectMapper.readValue(content, new TypeReference<Map<String, Object>>() {});
-                        processMessageAndWriteToTDengine(messageMap, topic);
-                    } catch (Exception e) {
-                        log.error("MQTT 消息处理失败（Topic：" + topic + "）：", e);
-                    }
-                });
-            }
-
-            @Override
-            public void deliveryComplete(IMqttDeliveryToken token) {
-                try { token.waitForCompletion(1000); } catch (MqttException ignored) {}
-            }
-        });
+    @Override
+    protected void processMessage(String content, String topic) throws Exception {
+        Map<String, Object> weather = objectMapper.readValue(content, new TypeReference<Map<String, Object>>() {});
+        processMessageAndWriteToTDengine(weather, topic);
+        insertredis(weather, topic);
     }
 
     private void processMessageAndWriteToTDengine(Map<String, Object> weather, String topic) throws Exception {
@@ -444,7 +80,6 @@ public class MqttDynamicConsumer {
         list.put("timestamp", weather.get("timestamp"));
         list.put("device_id", weather.get("device_id"));
 
-        // 构建单条数据并立即写入（可改为批量缓冲）
         String dbName = topicParts[0];
         String superTable = topicParts[1];
         LocalDate date = LocalDate.now();
@@ -452,16 +87,13 @@ public class MqttDynamicConsumer {
 
         List<Map<String, Object>> batch = Collections.singletonList(list);
         tdengineService.insertBatch(dbName, tableName, batch);
-        insertredis(weather,topic);
     }
 
-
     public void insertredis(Map<String, Object> weather, String topic) throws Exception {
         String[] topicParts = topic.split("/", 2);
         if (topicParts.length < 2) return;
 
         String controllerId = topicParts[0];
-        String deviceIdFromTopic = topicParts[1]; // 虽然不用在 key 中，但可记录
 
         SysController sysController = sysControllerService.selectcontrollerpath(topic);
         if (sysController == null || sysController.getName() == null) return;
@@ -472,14 +104,12 @@ public class MqttDynamicConsumer {
         Map<String, Object> metricData = (Map<String, Object>) weather.get(sysController.getName());
         if (metricData == null) return;
 
-        // ✅ 使用标准格式：DSB:controllerId:metricName
         String redisKey = "DSB:" + controllerId + ":" + sysController.getName();
 
-        // 准备写入的数据（包含系统字段）
         Map<String, String> hashData = new HashMap<>();
         hashData.put("createTime", createTime);
         hashData.put("timestamp", getStringFromMap(weather, "timestamp"));
-        hashData.put("device_id", getStringFromMap(weather, "device_id")); // UUID
+        hashData.put("device_id", getStringFromMap(weather, "device_id"));
 
         for (Map.Entry<String, Object> entry : metricData.entrySet()) {
             if (entry.getValue() != null) {
@@ -490,7 +120,6 @@ public class MqttDynamicConsumer {
         stringRedisTemplate.opsForHash().putAll(redisKey, hashData);
         stringRedisTemplate.expire(redisKey, 2, TimeUnit.HOURS);
 
-        // 记录到活跃集合
         stringRedisTemplate.opsForSet().add("DSB:active:devices", redisKey);
         stringRedisTemplate.expire("DSB:active:devices", 2, TimeUnit.HOURS);
     }
@@ -499,71 +128,4 @@ public class MqttDynamicConsumer {
         Object val = map.get(key);
         return val == null ? "" : val.toString().trim();
     }
-
-
-
-    private Map<String, Object> deepCopyMap(Map<String, Object> original) {
-        if (original == null) return new HashMap<>();
-        try {
-            String json = objectMapper.writeValueAsString(original);
-            return objectMapper.readValue(json, new TypeReference<Map<String, Object>>() {});
-        } catch (Exception e) {
-            Map<String, Object> copy = new HashMap<>(original.size());
-            original.forEach((k, v) -> {
-                if (v instanceof Map) {
-                    copy.put(k, deepCopyMap((Map<String, Object>) v));
-                } else {
-                    copy.put(k, v);
-                }
-            });
-            return copy;
-        }
-    }
-
-    public void disconnect() {
-        synchronized (lock) {
-            shutdownExecutor(writeExecutor, "TDengine 写入");
-
-            if (mqttClient != null) {
-                try {
-                    if (mqttClient.isConnected()) {
-                        unsubscribeAll();
-                        mqttClient.disconnect(10000);
-                    }
-                    mqttClient.close();
-                    log.info("MQTT 连接已断开");
-                } catch (MqttException e) {
-                    log.error("断开 MQTT 连接失败：" + e.getMessage());
-                } finally {
-                    isConnected.set(false);
-                    mqttClient = null;
-                }
-            }
-            if (tdengineService != null) tdengineService.close();
-        }
-    }
-
-    private void shutdownExecutor(ExecutorService executor, String name) {
-        if (executor == null || executor.isShutdown()) return;
-        try {
-            executor.shutdown();
-            if (!executor.awaitTermination(20, TimeUnit.SECONDS)) {
-                List<Runnable> remaining = executor.shutdownNow();
-                log.error(name + " 线程池强制关闭，剩余任务数：" + remaining.size());
-            } else {
-                log.info(name + " 线程池已优雅关闭");
-            }
-        } catch (InterruptedException e) {
-            executor.shutdownNow();
-            Thread.currentThread().interrupt();
-            log.error(name + " 线程池关闭被中断");
-        }
-    }
-
-    @PreDestroy
-    public void destroy() {
-        log.info(">>> 服务正在关闭...");
-        disconnect();
-        shutdownExecutor(coreExecutor, "MQTT 核心");
-    }
-}
+}

iot-platform/src/main/java/com/iot/platform/mqtt/MqttFaultConsumer.java

@@ -1,11 +1,13 @@
 package com.iot.platform.mqtt;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.iot.platform.config.IotProperties;
 import com.iot.platform.domain.SysDevice;
 import com.iot.platform.domain.SysFault;
 import com.iot.platform.service.*;
 import com.iot.platform.common.utils.NumericIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 
@@ -22,29 +24,45 @@ import java.util.concurrent.ExecutorService;
 @Component
 public class MqttFaultConsumer extends AbstractMqttConsumer {
 
-    @Autowired
-    public SysControllerService sysControllerService;
-    @Autowired
-    public SysFaultService sysFaultService;
-    @Autowired
-    public SysrealtimeService sysrealtimeService;
-    @Autowired
-    public SysWorkorderService sysWorkorderService;
-    @Autowired
-    public SysAlarmService sysAlarmService;
-    @Autowired
-    public NumericIdGenerator numericIdGenerator;
-    @Autowired
-    public TDegnineAlarm tDegnineAlarm;
-    @Autowired
-    private RestTemplate restTemplate;
+    private final SysControllerService sysControllerService;
+    private final SysFaultService sysFaultService;
+    private final SysrealtimeService sysrealtimeService;
+    private final SysWorkorderService sysWorkorderService;
+    private final SysAlarmService sysAlarmService;
+    private final NumericIdGenerator numericIdGenerator;
+    private final TDegnineAlarm tDegnineAlarm;
+    private final RestTemplate restTemplate;
+
+    private static final String ALARM_STATUS_TRIGGER = "0";
+    private static final String ALARM_STATUS_RECOVERED = "1";
+    private static final String DATE_TIME_PATTERN = "yyyy-MM-dd HH:mm:ss";
+    private static final String COMPANY_ID_PREFIX = "GJ";
 
     private final ObjectMapper objectMapper = new ObjectMapper();
     private final ExecutorService mqttFaultExecutor;
 
     @Autowired
-    public MqttFaultConsumer(ExecutorService mqttFaultExecutor) {
+    public MqttFaultConsumer(@Qualifier("mqttFaultExecutor") ExecutorService mqttFaultExecutor,
+                             @Qualifier("abstractConsumerExecutor") ExecutorService executorService,
+                             IotProperties iotProperties,
+                             SysControllerService sysControllerService,
+                             SysFaultService sysFaultService,
+                             SysrealtimeService sysrealtimeService,
+                             SysWorkorderService sysWorkorderService,
+                             SysAlarmService sysAlarmService,
+                             NumericIdGenerator numericIdGenerator,
+                             TDegnineAlarm tDegnineAlarm,
+                             RestTemplate restTemplate) {
+        super(executorService, iotProperties);
         this.mqttFaultExecutor = mqttFaultExecutor;
+        this.sysControllerService = sysControllerService;
+        this.sysFaultService = sysFaultService;
+        this.sysrealtimeService = sysrealtimeService;
+        this.sysWorkorderService = sysWorkorderService;
+        this.sysAlarmService = sysAlarmService;
+        this.numericIdGenerator = numericIdGenerator;
+        this.tDegnineAlarm = tDegnineAlarm;
+        this.restTemplate = restTemplate;
     }
 
     private static final Map<String, String> KEY_MAPPING = new HashMap<>();
@@ -62,15 +80,27 @@ public class MqttFaultConsumer extends AbstractMqttConsumer {
     @Override
     protected String generateClientId() {
         String osName = System.getProperty("os.name").toLowerCase();
-        return osName.contains("windows") ? "mqttx_e216fbf1620" : "mqttx_e216fbf1621";
+        String base = osName.contains("windows") ? "mqttx_e216fbf1620" : "mqttx_e216fbf1621";
+        return base + "_" + Long.toHexString(System.nanoTime()).substring(0, 6);
     }
 
     @Override
     protected void handleMessage(String topic, String messageContent) throws Exception {
         Map<String, Object> messageMap = objectMapper.readValue(messageContent, Map.class);
-        insertTDegine(messageMap, topic);
+        try {
+            insertTDegine(messageMap, topic);
+        } catch (Exception e) {
+            log.error("告警数据写入TDengine失败, topic={}, error={}", topic, e.getMessage(), e);
+        }
         SysFault sysFault = objectMapper.readValue(messageContent, SysFault.class);
-        mqttFaultExecutor.submit(() -> triggermethod(topic, sysFault));
+        mqttFaultExecutor.submit(() -> {
+            try {
+                triggermethod(topic, sysFault);
+            } catch (Exception e) {
+                log.error("告警业务处理失败, topic={}, controllerId={}, error={}",
+                        topic, sysFault.getController_id(), e.getMessage(), e);
+            }
+        });
     }
 
     @Override
@@ -79,11 +109,16 @@ public class MqttFaultConsumer extends AbstractMqttConsumer {
     }
 
     public void insertTDegine(Map<String, Object> weather, String topic) throws SQLException {
+        String[] topicParts = topic.split("/");
+        if (topicParts.length < 2) {
+            log.warn("无效的topic格式，缺少分隔符: {}", topic);
+            return;
+        }
         LocalDate localDate = LocalDate.now();
         int year = localDate.getYear();
         int month = localDate.getMonthValue();
-        String supertablename = topic.split("/")[0];
-        String table = topic.split("/")[0] + "_" + year + month;
+        String supertablename = topicParts[0];
+        String table = topicParts[0] + "_" + year + month;
 
         Map<String, Object> newMap = new HashMap<>();
         for (Map.Entry<String, Object> entry : weather.entrySet()) {
@@ -95,7 +130,7 @@ public class MqttFaultConsumer extends AbstractMqttConsumer {
                 newMap.put(originalKey, value);
             }
         }
-        tDegnineAlarm.shibaihou(newMap, supertablename, table, topic.split("/")[1]);
+        tDegnineAlarm.shibaihou(newMap, supertablename, table, topicParts[1]);
     }
 
     public void triggermethod(String topic, SysFault weather) {
@@ -103,47 +138,70 @@ public class MqttFaultConsumer extends AbstractMqttConsumer {
         String timestamp = weather.getTimestamp();
         String type = weather.getType();
         String desc = weather.getDesc();
+        String controllerId = weather.getController_id();
+
+        if (controllerId == null || controllerId.isEmpty()) {
+            log.warn("SysFault 缺少 controller_id，跳过处理");
+            return;
+        }
+        if (deviceId == null) {
+            deviceId = "";
+        }
+        if (type == null || desc == null) {
+            log.warn("SysFault 缺少 type 或 desc，跳过处理 controllerId={}", controllerId);
+            return;
+        }
 
         LocalDate localDate = LocalDate.now();
         int year = localDate.getYear();
         int month = localDate.getMonthValue();
         String formattedMonth = String.format("%02d", month);
 
-        String controllerId = weather.getController_id();
         String[] topics = topic.split("/");
+        if (topics.length == 0) {
+            log.warn("无效的topic格式: {}", topic);
+            return;
+        }
 
         List<String> tablename = sysrealtimeService.selecttables();
-        List<Boolean> a = new ArrayList<>();
+        if (tablename == null) {
+            tablename = Collections.emptyList();
+        }
         String controllername = controllerId + year + formattedMonth + "_fault";
 
-        for (int i = 0; i < tablename.size(); i++) {
-            a.add(tablename.get(i).equals(controllername));
+        boolean tableExists = false;
+        for (String name : tablename) {
+            if (controllername.equals(name)) {
+                tableExists = true;
+                break;
+            }
         }
-        if (!a.contains(true)) {
+        if (!tableExists) {
             sysFaultService.createmessage(controllername);
         }
 
+        SysDevice jingdu = sysControllerService.selectjingweidu(topics[0], "经度");
+        SysDevice weidu = sysControllerService.selectjingweidu(topics[0], "纬度");
+        if (jingdu == null || weidu == null) {
+            log.warn("未查询到控制器经纬度信息: {}", topics[0]);
+            return;
+        }
+        String jingduValue = jingdu.getV();
+        String weiduValue = weidu.getV();
+        String companyid = COMPANY_ID_PREFIX + numericIdGenerator.nextId();
+        LocalDateTime currentTime = LocalDateTime.now();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DATE_TIME_PATTERN);
+        String currentTimeStr = currentTime.format(formatter);
+
         if ("触发".equals(type)) {
-            SysDevice jingdu = sysControllerService.selectjingweidu(topics[0], "经度");
-            SysDevice weidu = sysControllerService.selectjingweidu(topics[0], "纬度");
-            String companyid = "GJ" + numericIdGenerator.nextId();
-            LocalDateTime currentTime = LocalDateTime.now();
-            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-            String currentTimeStr = currentTime.format(formatter);
-            sysAlarmService.insertalarm(controllername, companyid, desc, "0", currentTimeStr, "0", controllerId, deviceId, jingdu.getV(), weidu.getV());
-            sysFaultService.insertfault(companyid, desc, "0", currentTimeStr, "0", controllerId, deviceId, jingdu.getV(), weidu.getV(), "");
+            sysAlarmService.insertalarm(controllername, companyid, desc, ALARM_STATUS_TRIGGER, currentTimeStr, ALARM_STATUS_TRIGGER, controllerId, deviceId, jingduValue, weiduValue);
+            sysFaultService.insertfault(companyid, desc, ALARM_STATUS_TRIGGER, currentTimeStr, ALARM_STATUS_TRIGGER, controllerId, deviceId, jingduValue, weiduValue, "");
         } else if ("恢复".equals(type)) {
-            SysDevice jingdu = sysControllerService.selectjingweidu(topics[0], "经度");
-            SysDevice weidu = sysControllerService.selectjingweidu(topics[0], "纬度");
-            String companyid = "GJ" + numericIdGenerator.nextId();
-            LocalDateTime currentTime = LocalDateTime.now();
-            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-            String currentTimeStr = currentTime.format(formatter);
-            sysAlarmService.insertalarm(controllername, companyid, desc, "1", currentTimeStr, "0", controllerId, deviceId, jingdu.getV(), weidu.getV());
-            sysFaultService.updatefault("1", "0", jingdu.getV(), weidu.getV(), desc, controllerId, deviceId, currentTimeStr);
+            sysAlarmService.insertalarm(controllername, companyid, desc, ALARM_STATUS_RECOVERED, currentTimeStr, ALARM_STATUS_TRIGGER, controllerId, deviceId, jingduValue, weiduValue);
+            sysFaultService.updatefault(ALARM_STATUS_RECOVERED, ALARM_STATUS_TRIGGER, jingduValue, weiduValue, desc, controllerId, deviceId, currentTimeStr);
         }
 
-        String url = "https://esos-iot.com:9443/syscar/gaojing?controllerId=" + topics[0];
+        String url = iotProperties.getMqtt().getAlarmWebhookUrl() + "?controllerId=" + topics[0];
         restTemplate.postForObject(url, null, String.class);
     }
 }

iot-platform/src/main/java/com/iot/platform/mqtt/MqttGenericConsumer.java

@@ -1,296 +1,145 @@
 package com.iot.platform.mqtt;
-import com.alibaba.fastjson2.util.DateUtils;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.iot.platform.config.IotProperties;
 import com.iot.platform.domain.ControllerData;
 import com.iot.platform.domain.topics;
 import com.iot.platform.service.SysControllerService;
-import com.iot.platform.service.TDengineService;
-import org.eclipse.paho.client.mqttv3.*;
-import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
-import com.iot.platform.config.IotProperties;
 import org.springframework.beans.factory.annotation.Autowired;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.net.ssl.*;
-import java.io.InputStream;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.security.KeyStore;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.util.*;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import org.springframework.core.io.ClassPathResource;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import java.text.SimpleDateFormat;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
 
 /**
  * 存储控制器数据
  */
 @Component
-public class MqttGenericConsumer {
+public class MqttGenericConsumer extends AbstractMqttConsumer {
 
-    private static final Logger log = LoggerFactory.getLogger(MqttGenericConsumer.class);
-    private static ExecutorService threadPool= Executors.newCachedThreadPool();
-    /**
-     *
-     * 添加mysql数据
-     *
-     */
-    @Autowired
-    private StringRedisTemplate stringRedisTemplate;
-    @Autowired
-    public SysControllerService sysControllerService;
-    @Autowired
-    public MqttDynamicConsumer messageListenerService2;
-
-    @Autowired
-    private IotProperties iotProperties;
-
-    // ========== 移除SSL，改用普通TCP连接 ==========
-    private String brokerUrl;
-    private String brokerHost;
-    private int brokerPort;
+    private final StringRedisTemplate stringRedisTemplate;
+    private final SysControllerService sysControllerService;
+    private final MqttDynamicConsumer messageListenerService2;
 
-    private static final int QOS = 1;
-    // 保留原有订阅主题
-    private static final String SUBSCRIBE_TOPIC = "+/generics";
-    private static final int CONNECT_TIMEOUT = 3000;
-    private static final int RECONNECT_INTERVAL = 5000;
+    private final ObjectMapper objectMapper = new ObjectMapper();
 
-    private String mqttUsername;
-    private String mqttPassword;
-
-    // 移除：SSL相关的CA_CERT_PATH常量（无需证书配置）
-    // 你的其他成员变量保持不变
     @Autowired
-    public TDengineService tDengineMapceshi2;
-    private MqttClient mqttClient;
-    private final ExecutorService executorService = Executors.newSingleThreadExecutor();
-    private boolean isMqttConnected = false;
-    private MqttConnectOptions connOpts;
-    private ObjectMapper objectMapper = new ObjectMapper();
-
-
-    // 移除：未定义的threadPool引用（避免编译错误）
-    @PostConstruct
-    public void connectAndSubscribe() {
-        this.brokerUrl = iotProperties.getMqtt().getBrokerUrl();
-        String brokerAddr = this.brokerUrl.replace("tcp://", "");
-        int colonIdx = brokerAddr.lastIndexOf(':');
-        this.brokerHost = brokerAddr.substring(0, colonIdx);
-        this.brokerPort = Integer.parseInt(brokerAddr.substring(colonIdx + 1));
-        this.mqttUsername = iotProperties.getMqtt().getUsername();
-        this.mqttPassword = iotProperties.getMqtt().getPassword();
-
-        try {
-            // 1. 检测普通MQTT服务器连通性（移除SSL，仅检测TCP端口）
-            checkServerAvailability();
-            // 2. 创建MQTT客户端（使用普通TCP的brokerUrl，保持逻辑不变）
-            String clientId = generateClientIdByOs();
-            mqttClient = new MqttClient(brokerUrl, clientId, new MemoryPersistence());
-            // 3. 初始化MQTT连接选项（移除SSL配置，新增账号密码）
-            initMqttConnectOptions();
-            // 4. 设置MQTT回调（保持核心逻辑，修复消息解析bug）
-            setMqttCallback();
-            // 5. 建立连接并订阅主题（保持逻辑不变，移除SSL日志标识）
-            connectAndSubscribeTopic();
-        } catch (MqttException | InterruptedException e) {
-            log.error("MQTT客户端初始化失败：", e);
-        }
+    public MqttGenericConsumer(@Qualifier("abstractConsumerExecutor") ExecutorService executorService,
+                               IotProperties iotProperties,
+                               StringRedisTemplate stringRedisTemplate,
+                               SysControllerService sysControllerService,
+                               MqttDynamicConsumer messageListenerService2) {
+        super(executorService, iotProperties);
+        this.stringRedisTemplate = stringRedisTemplate;
+        this.sysControllerService = sysControllerService;
+        this.messageListenerService2 = messageListenerService2;
     }
 
-    /**
-     * 检测普通MQTT服务器连通性（移除SSL，仅验证TCP端口可达性）
-     */
-    private void checkServerAvailability() throws InterruptedException {
-        boolean serverAvailable = false;
-        while (!serverAvailable) {
-            try (Socket socket = new Socket()) {
-                // 改用普通brokerHost和brokerPort
-                socket.connect(new InetSocketAddress(brokerHost, brokerPort), CONNECT_TIMEOUT);
-                serverAvailable = true;
-                log.info("普通MQTT服务器连通性检测通过");
-            } catch (Exception e) {
-                log.error("普通MQTT服务器不可达，5秒后重试...");
-                Thread.sleep(RECONNECT_INTERVAL);
-            }
-        }
-    }
-
-    /**
-     * 初始化MQTT连接选项（移除SSL配置，新增账号密码认证）
-     */
-    private void initMqttConnectOptions() {
-        connOpts = new MqttConnectOptions();
-        connOpts.setCleanSession(true);
-        connOpts.setAutomaticReconnect(true);
-        connOpts.setConnectionTimeout(10);
-
-        // ========== 新增：配置MQTT账号密码 ==========
-        connOpts.setUserName(mqttUsername);
-        connOpts.setPassword(mqttPassword.toCharArray()); // 密码要求传入char数组
-
-        // 移除：原有的SSL配置方法调用（configureSslAndStrictHostnameVerify()）
+    @Override
+    protected String getSubscribeTopic() {
+        return "+/generics";
     }
 
-    /**
-     * 按操作系统生成唯一ClientId（保持原有逻辑不变）
-     */
-    private String generateClientIdByOs() {
+    @Override
+    protected String generateClientId() {
         String osName = System.getProperty("os.name").toLowerCase();
-        return osName.contains("windows") ? "mqttx_e216fbf1615" : "mqttx_e216fbf1616";
-    }
-
-    /**
-     * 设置MQTT回调函数（保留核心逻辑，修复2个关键bug）
-     */
-    private void setMqttCallback() {
-        mqttClient.setCallback(new MqttCallback() {
-            @Override
-            public void connectionLost(Throwable cause) {
-                log.error("MQTT连接断开，开始重连：" + cause.getMessage());
-                isMqttConnected = false;
-                reconnect();
-            }
-
-            @Override
-            public void messageArrived(String topic, MqttMessage message) throws Exception {
-                if (isMqttConnected) {
-                    executorService.submit(() -> {
-                        try {
-                            ObjectMapper objectMapper = new ObjectMapper();
-                            // 修复bug1：原代码先读取正确的messageContent，却误用mqtt（message.toString()）解析
-                            // 正确读取消息负载（UTF-8编码，避免乱码）
-                            String messageContent = new String(message.getPayload(), "UTF-8");
-                            // 修复bug2：用正确的messageContent解析为ControllerData对象
-                            ControllerData controllerData = objectMapper.readValue(messageContent, ControllerData.class);
-                            // 业务处理
-                            triggermethod(controllerData);
-                        } catch (Exception e) {
-                            log.error("消息处理失败：", e);
-                        }
-                    });
-                }
-            }
-
-            @Override
-            public void deliveryComplete(IMqttDeliveryToken token) {
-                // 消息投递完成回调（无需处理）
-            }
-        });
+        String base = osName.contains("windows") ? "mqttx_e216fbf1615" : "mqttx_e216fbf1616";
+        return base + "_" + Long.toHexString(System.nanoTime()).substring(0, 6);
     }
 
-    /**
-     * 建立MQTT连接并订阅主题（保持逻辑不变，移除SSL日志标识）
-     */
-    private void connectAndSubscribeTopic() throws MqttException {
-        if (!mqttClient.isConnected()) {
-            IMqttToken connectToken = mqttClient.connectWithResult(connOpts);
-            if (connectToken.isComplete()) {
-                mqttClient.subscribe(SUBSCRIBE_TOPIC, QOS);
-                isMqttConnected = true;
-                log.info("MQTT连接成功，已订阅主题：" + SUBSCRIBE_TOPIC);
-            }
-        }
-    }
-
-    /**
-     * MQTT重连逻辑（移除SSL日志标识，保持功能不变）
-     */
-    public void reconnect() {
-        int maxReconnectAttempts = 3;
-        for (int attempt = 1; attempt <= maxReconnectAttempts; attempt++) {
-            try {
-                Thread.sleep(RECONNECT_INTERVAL);
-                if (mqttClient != null && !mqttClient.isConnected()) {
-                    mqttClient.connect(connOpts);
-                    mqttClient.subscribe(SUBSCRIBE_TOPIC, QOS);
-                    isMqttConnected = true;
-                    log.info("MQTT重连成功（第" + attempt + "次尝试）");
-                    break; // 重连成功后退出循环
-                }
-            } catch (MqttException | InterruptedException e) {
-                log.error("MQTT重连失败（第" + attempt + "次尝试）：" + e.getMessage());
-                if (attempt == maxReconnectAttempts) {
-                    log.error("已达最大重连次数，停止重连");
-                }
-            }
-        }
-    }
-
-    /**
-     * 销毁时断开MQTT连接，关闭线程池（移除未定义的threadPool.shutdown()）
-     */
-    @PreDestroy
-    public void disconnect() {
-        try {
-            if (mqttClient != null && mqttClient.isConnected()) {
-                mqttClient.disconnect();
-                mqttClient.close();
-                log.info("MQTT连接已断开");
-            }
-            executorService.shutdown();
-            // 移除：原代码中未定义的threadPool.shutdown();（避免编译错误）
-        } catch (MqttException e) {
-            log.error("MQTT断开连接失败：", e);
-        }
+    @Override
+    protected void handleMessage(String topic, String messageContent) throws Exception {
+        ControllerData controllerData = objectMapper.readValue(messageContent, ControllerData.class);
+        triggermethod(controllerData);
     }
 
     public void triggermethod(ControllerData weather) throws Exception {
         String timestamp = weather.getTimestamp();
         String fleetId = weather.getFleet_id();
         String controllerId = weather.getController_id();
+
+        if (controllerId == null || controllerId.isEmpty()) {
+            log.warn("ControllerData 缺少 controller_id，跳过处理");
+            return;
+        }
+        if (timestamp == null || timestamp.isEmpty()) {
+            log.warn("ControllerData 缺少 timestamp，跳过处理 controllerId={}", controllerId);
+            return;
+        }
+
         List<topics> topics = weather.getTopics();
+        if (topics == null) topics = Collections.emptyList();
         List<topics> cmdtopics = weather.getCmd_topics();
+        if (cmdtopics == null) cmdtopics = Collections.emptyList();
         topics faultprot = weather.getFault_prot();
-        //需要检索全部的数据是否存在，如果存在就进行修改，如果不存在就进行添加
-        Integer controllercountcount=0;
+
+        Integer controllercountcount = 0;
         for (topics topicsMap : topics) {
-            Integer count = sysControllerService.selectsyscontrollercount(topicsMap.getPath());
+            String path = topicsMap.getPath();
+            String name = topicsMap.getName();
+            if (path == null || path.isEmpty() || name == null) {
+                log.warn("Topic 数据不完整，跳过: path={}, name={}", path, name);
+                continue;
+            }
+            Integer count = sysControllerService.selectsyscontrollercount(path);
             if (count <= 0) {
-                //存储redis
-                stringRedisTemplate.persist(controllerId);
-                stringRedisTemplate.opsForHash().put(controllerId+":"+topicsMap.getName(), "path", topicsMap.getPath());
-                //将数据存储到mysql中
-                sysControllerService.insertsyscontroller(controllerId, timestamp, fleetId, topicsMap.getName(), topicsMap.getPath(),topicsMap.getPath().split("/")[1]);
+                stringRedisTemplate.opsForHash().put(controllerId + ":" + name, "path", path);
+                String deviceId = path.contains("/") ? path.split("/")[1] : "";
+                sysControllerService.insertsyscontroller(controllerId, timestamp, fleetId, name, path, deviceId);
                 controllercountcount++;
-            }else{
-                // 毫秒时间戳转换为秒级日期格式
-                long ts = Long.parseLong(timestamp);
-                String date = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss")
-                        .format(new java.util.Date(ts));
-                //修改数据库
-                sysControllerService.updatecontrollerAccept(controllerId, timestamp, fleetId, topicsMap.getName(), topicsMap.getPath(),topicsMap.getPath().split("/")[1],date);
+            } else {
+                long ts;
+                try {
+                    ts = Long.parseLong(timestamp);
+                } catch (NumberFormatException e) {
+                    log.warn("timestamp 格式错误: {}，使用当前时间", timestamp);
+                    ts = System.currentTimeMillis();
+                }
+                String date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(ts));
+                String deviceId = path.contains("/") ? path.split("/")[1] : "";
+                sysControllerService.updatecontrollerAccept(controllerId, timestamp, fleetId, name, path, deviceId, date);
             }
         }
-        Integer controllercountcmdcount=0;
+
         for (topics cmdtopicsMap : cmdtopics) {
-            //将数据存储到redis
-            Integer count = sysControllerService.selectsyscontrollercountcmd(cmdtopicsMap.getPath());
-            if (count<=0) {
-                stringRedisTemplate.opsForHash().put(controllerId+"_cmd:"+cmdtopicsMap.getName(), "path", cmdtopicsMap.getPath());
-                stringRedisTemplate.persist(controllerId);
-                sysControllerService.insertsyscontrollercmd(controllerId, timestamp, fleetId, cmdtopicsMap.getName(), cmdtopicsMap.getPath());
-                controllercountcmdcount++;
+            String path = cmdtopicsMap.getPath();
+            String name = cmdtopicsMap.getName();
+            if (path == null || path.isEmpty() || name == null) {
+                log.warn("CmdTopic 数据不完整，跳过: path={}, name={}", path, name);
+                continue;
+            }
+            Integer count = sysControllerService.selectsyscontrollercountcmd(path);
+            if (count <= 0) {
+                stringRedisTemplate.opsForHash().put(controllerId + "_cmd:" + name, "path", path);
+                sysControllerService.insertsyscontrollercmd(controllerId, timestamp, fleetId, name, path);
             }
         }
-        Integer count =sysControllerService.selectsyscontrollercountfault(faultprot.getPath());
-        if (count<=0){
-            stringRedisTemplate.opsForHash().put(controllerId+"_fault:"+faultprot.getName(), "path", faultprot.getPath());
-            sysControllerService.insertsyscontrollerfault(controllerId, timestamp, fleetId, faultprot.getName(), faultprot.getPath());
-            stringRedisTemplate.persist(controllerId);
+
+        if (faultprot != null) {
+            String path = faultprot.getPath();
+            String name = faultprot.getName();
+            if (path == null || path.isEmpty() || name == null) {
+                log.warn("FaultProt 数据不完整，跳过: path={}, name={}", path, name);
+            } else {
+                Integer count = sysControllerService.selectsyscontrollercountfault(path);
+                if (count <= 0) {
+                    stringRedisTemplate.opsForHash().put(controllerId + "_fault:" + name, "path", path);
+                    sysControllerService.insertsyscontrollerfault(controllerId, timestamp, fleetId, name, path);
+                }
+            }
         }
-        //如果控制器中的数据出现更新情况，就触发该方法进行重连
-        if (controllercountcount>0) {
-            //关闭连接线程
-            messageListenerService2.destroy();
-            //重新建立连接
-            messageListenerService2.initMqttConnection();
+
+        // 统一 persist controllerId，确保其不会被过期删除
+        stringRedisTemplate.persist(controllerId);
+
+        if (controllercountcount > 0) {
+            // TODO: 后续建议改为 Spring Event 解耦，避免直接调用其他 Bean 的方法
+            messageListenerService2.refreshMqttSubscription();
         }
     }
 }

iot-platform/src/main/java/com/iot/platform/mqtt/MqttStatusConsumer.java

@@ -1,15 +1,18 @@
 package com.iot.platform.mqtt;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.iot.platform.config.IotProperties;
 import com.iot.platform.service.SysControllerService;
 import com.iot.platform.service.SysStatusService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Map;
+import java.util.concurrent.ExecutorService;
 
 /**
  * 存储控制器状态数据
@@ -17,15 +20,24 @@ import java.util.Map;
 @Component
 public class MqttStatusConsumer extends AbstractMqttConsumer {
 
-    @Autowired
-    private StringRedisTemplate stringRedisTemplate;
-    @Autowired
-    public SysControllerService sysControllerService;
-    @Autowired
-    public SysStatusService sysStatusService;
+    private final StringRedisTemplate stringRedisTemplate;
+    private final SysControllerService sysControllerService;
+    private final SysStatusService sysStatusService;
 
     private final ObjectMapper objectMapper = new ObjectMapper();
 
+    @Autowired
+    public MqttStatusConsumer(@Qualifier("abstractConsumerExecutor") ExecutorService executorService,
+                              IotProperties iotProperties,
+                              StringRedisTemplate stringRedisTemplate,
+                              SysControllerService sysControllerService,
+                              SysStatusService sysStatusService) {
+        super(executorService, iotProperties);
+        this.stringRedisTemplate = stringRedisTemplate;
+        this.sysControllerService = sysControllerService;
+        this.sysStatusService = sysStatusService;
+    }
+
     @Override
     protected String getSubscribeTopic() {
         return "+/status";
@@ -34,7 +46,8 @@ public class MqttStatusConsumer extends AbstractMqttConsumer {
     @Override
     protected String generateClientId() {
         String osName = System.getProperty("os.name").toLowerCase();
-        return osName.contains("windows") ? "mqttx_e216fbf1613" : "mqttx_e216fbf1614";
+        String base = osName.contains("windows") ? "mqttx_e216fbf1613" : "mqttx_e216fbf1614";
+        return base + "_" + Long.toHexString(System.nanoTime()).substring(0, 6);
     }
 
     @Override
@@ -44,9 +57,16 @@ public class MqttStatusConsumer extends AbstractMqttConsumer {
     }
 
     public void triggermethod(Map<String, Object> weather) throws Exception {
-        String controllerId = weather.get("controller_id").toString();
-        String fleetId = weather.get("fleet_id").toString();
-        String status = weather.get("status").toString();
+        Object controllerIdObj = weather.get("controller_id");
+        Object fleetIdObj = weather.get("fleet_id");
+        Object statusObj = weather.get("status");
+        if (controllerIdObj == null || fleetIdObj == null || statusObj == null) {
+            log.warn("MQTT状态消息缺少必填字段，跳过处理");
+            return;
+        }
+        String controllerId = controllerIdObj.toString();
+        String fleetId = fleetIdObj.toString();
+        String status = statusObj.toString();
 
         LocalDateTime currentTime = LocalDateTime.now();
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");

iot-platform/src/main/java/com/iot/platform/service/SysAlarmService.java

@@ -5,14 +5,21 @@ import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.regex.Pattern;
 
 @Service
 //@DataSource(value = DataSourceType.SLAVE)
 public class SysAlarmService {
+
+    private static final Pattern TABLE_NAME_PATTERN = Pattern.compile("^[a-zA-Z_][a-zA-Z0-9_]*$");
+
     @Resource
     public SysAlarmMapper sysAlarmMapper;
 
     public void insertalarm(String tableName,String faultId,String faultdescs,String faultstatus,String createtime,String messageType,String controllerId,String deviceId,String longitude,String latitude){
+        if (tableName == null || !TABLE_NAME_PATTERN.matcher(tableName).matches()) {
+            throw new IllegalArgumentException("非法表名: " + tableName);
+        }
         sysAlarmMapper.insertalarm(tableName,faultId, faultdescs, faultstatus, createtime, messageType,controllerId,deviceId,longitude,latitude);
     }
 

iot-platform/src/main/java/com/iot/platform/service/SysControllerService.java

@@ -8,9 +8,13 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.regex.Pattern;
 
 @Service
 public class SysControllerService {
+
+    private static final Pattern TABLE_NAME_PATTERN = Pattern.compile("^[a-zA-Z_][a-zA-Z0-9_]*$");
+
     @Resource
     public SysControllerMapper sysControllerMapper;
     public void insertsyscontroller(@Param("controllerId")String controllerId,
@@ -38,14 +42,14 @@ public class SysControllerService {
         sysControllerMapper.insertsyscontrollerfault(controllerId, timestamp, fleetId, name, path);
     }
 
-    public Integer selectsyscontrollercount(@Param("path")String paht){
-        return sysControllerMapper.selectsyscontrollercount(paht);
+    public Integer selectsyscontrollercount(@Param("path")String path){
+        return sysControllerMapper.selectsyscontrollercount(path);
     }
-    public Integer selectsyscontrollercountcmd(@Param("path")String paht){
-        return sysControllerMapper.selectsyscontrollercountcmd(paht);
+    public Integer selectsyscontrollercountcmd(@Param("path")String path){
+        return sysControllerMapper.selectsyscontrollercountcmd(path);
     }
-    public Integer selectsyscontrollercountfault(@Param("path")String paht){
-        return sysControllerMapper.selectsyscontrollercountfault(paht);
+    public Integer selectsyscontrollercountfault(@Param("path")String path){
+        return sysControllerMapper.selectsyscontrollercountfault(path);
     }
 
     public void updatecontrollerAccept(@Param("controllerId")String controllerId,
@@ -64,6 +68,9 @@ public class SysControllerService {
         return sysControllerMapper.selectall();
     }
     public SysDevice selectjingweidu(String tableName, String Name){
+        if (tableName == null || !TABLE_NAME_PATTERN.matcher(tableName).matches()) {
+            throw new IllegalArgumentException("非法表名: " + tableName);
+        }
         return sysControllerMapper.selectjingweidu(tableName, Name);
     }
 

iot-platform/src/main/java/com/iot/platform/service/SysFaultService.java

@@ -4,11 +4,14 @@ import com.iot.platform.mapper.SysFaultMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 
-
 import javax.annotation.Resource;
+import java.util.regex.Pattern;
 
 @Service
 public class SysFaultService {
+
+    private static final Pattern TABLE_NAME_PATTERN = Pattern.compile("^[a-zA-Z_][a-zA-Z0-9_]*$");
+
     @Resource
     public SysFaultMapper sysFaultMapper;
 
@@ -41,6 +44,9 @@ public class SysFaultService {
         return sysFaultMapper.selectfaultcount(fleetId);
     }
     public void createmessage(@Param("tableName")String tableName){
+        if (tableName == null || !TABLE_NAME_PATTERN.matcher(tableName).matches()) {
+            throw new IllegalArgumentException("非法表名: " + tableName);
+        }
         sysFaultMapper.createmessage(tableName);
     }
 

iot-platform/src/main/java/com/iot/platform/service/SysIndicatorsService.java

@@ -11,8 +11,12 @@ import org.springframework.stereotype.Service;
 @DataSource(value = DataSourceType.SLAVE)
 public class SysIndicatorsService {
 
+    private final SysIndicatorsMapper sysIndicatorsMapper;
+
     @Autowired
-    public SysIndicatorsMapper sysIndicatorsMapper;
+    public SysIndicatorsService(SysIndicatorsMapper sysIndicatorsMapper) {
+        this.sysIndicatorsMapper = sysIndicatorsMapper;
+    }
 
 
     public void insertindicators(Integer workordercount, Double profit, String carId,String createdata){

iot-platform/src/main/java/com/iot/platform/service/SysWorkorderService.java

@@ -9,8 +9,13 @@ import org.springframework.stereotype.Service;
 @Service
 @DataSource(value = DataSourceType.SLAVE)
 public class SysWorkorderService {
+
+    private final SysWorkorderMapper sysWorkorderMapper;
+
     @Autowired
-    public SysWorkorderMapper sysWorkorderMapper;
+    public SysWorkorderService(SysWorkorderMapper sysWorkorderMapper) {
+        this.sysWorkorderMapper = sysWorkorderMapper;
+    }
 
 
 

iot-platform/src/main/java/com/iot/platform/service/TDegnineAlarm.java

@@ -14,8 +14,11 @@ public class TDegnineAlarm {
 
     private static final Logger log = LoggerFactory.getLogger(TDegnineAlarm.class);
 
-    @Autowired
-    private TDengineService tdengineService;
+    private final TDengineService tdengineService;
+
+    public TDegnineAlarm(TDengineService tdengineService) {
+        this.tdengineService = tdengineService;
+    }
 
     private static final String VALID_FIELD_PATTERN = "^[a-zA-Z0-9_]+$";
 
@@ -37,6 +40,11 @@ public class TDegnineAlarm {
      * 根据标签获取表的名称，添加数据到TDengine时序数据中
      */
     public void shibaihou(Map<String, Object> shuzi, String supertablename, String table, String deviceid) throws SQLException {
+        // 白名单校验表名和超级表名（提前到获取连接前）
+        if (!isValidFieldName(supertablename) || !isValidFieldName(table)) {
+            throw new IllegalArgumentException("非法表名或超级表名: supertablename=" + supertablename + ", table=" + table);
+        }
+
         Connection conn = null;
         Statement stmt = null;
 
@@ -44,12 +52,6 @@ public class TDegnineAlarm {
             conn = tdengineService.getConnection();
             stmt = conn.createStatement();
 
-            // 白名单校验表名和超级表名
-            if (!isValidFieldName(supertablename) || !isValidFieldName(table)) {
-                log.warn("非法表名或超级表名: supertablename={}, table={}", supertablename, table);
-                return;
-            }
-
             // 解析数据value（安全转义）
             String value = shuzi.values().stream()
                     .map(obj -> "'" + escapeValue(obj == null ? "" : obj.toString()) + "'")
@@ -87,45 +89,45 @@ public class TDegnineAlarm {
             StringBuilder u = new StringBuilder();
 
             // ========== 查询超级表是否存在 ==========
-            boolean s = false;
+            boolean stableExists = false;
             List<String> tableNamesc = new ArrayList<>();
             try {
                 stmt.executeUpdate("use fault");
-                ResultSet resultSet = stmt.executeQuery("SHOW stables");
-                while (resultSet.next()) {
-                    tableNamesc.add(resultSet.getString(1));
+                try (ResultSet resultSet = stmt.executeQuery("SHOW stables")) {
+                    while (resultSet.next()) {
+                        tableNamesc.add(resultSet.getString(1));
+                    }
                 }
-                resultSet.close();
             } catch (SQLException e) {
-                log.warn("SHOW stables 失败: {}", e.getMessage());
+                throw new SQLException("SHOW stables 查询失败: " + e.getMessage(), e);
             }
             for (String ta : tableNamesc) {
                 if (supertablename.equalsIgnoreCase(ta)) {
-                    s = true;
+                    stableExists = true;
+                    break;
                 }
             }
 
             // ========== 超级表存在，查看子表是否存在 ==========
-            if (s) {
+            if (stableExists) {
                 String querySubTable = "select distinct tbname from " + wrapName(table)
                         + " where location='" + escapeValue(supertablename) + "'";
-                ResultSet rsc = stmt.executeQuery(querySubTable);
-                while (rsc.next()) {
-                    zibiaoname.add(rsc.getString(1));
+                try (ResultSet rsc = stmt.executeQuery(querySubTable)) {
+                    while (rsc.next()) {
+                        zibiaoname.add(rsc.getString(1));
+                    }
                 }
-                rsc.close();
-                boolean zibiaobu = zibiaoname.isEmpty();
+                boolean subTableMissing = zibiaoname.isEmpty();
 
                 // ========== 添加数据到数据库中 ==========
-                try {
-                    if (!zibiaobu) {
+                if (!subTableMissing) {
                         // 子表存在：查询列、新增差异列、插入数据
-                        ResultSet resultSet = stmt.executeQuery("describe " + wrapName(table));
-                        int columnNameIndex = resultSet.findColumn("field");
-                        while (resultSet.next()) {
-                            columnNames.add(resultSet.getString(columnNameIndex));
+                        try (ResultSet resultSet = stmt.executeQuery("describe " + wrapName(table))) {
+                            int columnNameIndex = resultSet.findColumn("field");
+                            while (resultSet.next()) {
+                                columnNames.add(resultSet.getString(columnNameIndex));
+                            }
                         }
-                        resultSet.close();
 
                         for (int z = 0; z < columnNames.size(); z++) {
                             u.append(columnNames.get(z));
@@ -148,8 +150,13 @@ public class TDegnineAlarm {
                                 try {
                                     stmt.executeUpdate("ALTER TABLE " + wrapName(supertablename)
                                             + " ADD COLUMN " + setCopys[ar]);
-                                } catch (Exception e) {
-                                    // 列可能已存在，忽略
+                                } catch (SQLException e) {
+                                    String msg = e.getMessage();
+                                    if (msg != null && (msg.contains("already exists") || msg.contains("Duplicate column") || msg.contains("TAG"))) {
+                                        log.debug("列已存在，忽略: {}", setCopys[ar]);
+                                    } else {
+                                        throw new SQLException("添加列失败: " + setCopys[ar] + " | " + msg, e);
+                                    }
                                 }
                             }
                         }
@@ -162,12 +169,12 @@ public class TDegnineAlarm {
                                 + " using " + wrapName(supertablename)
                                 + " tags('" + escapeValue(supertablename) + "')");
 
-                        ResultSet resultSet = stmt.executeQuery("describe " + wrapName(supertablename));
-                        int columnNameIndex = resultSet.findColumn("field");
-                        while (resultSet.next()) {
-                            columnNames.add(resultSet.getString(columnNameIndex));
+                        try (ResultSet resultSet = stmt.executeQuery("describe " + wrapName(supertablename))) {
+                            int columnNameIndex = resultSet.findColumn("field");
+                            while (resultSet.next()) {
+                                columnNames.add(resultSet.getString(columnNameIndex));
+                            }
                         }
-                        resultSet.close();
 
                         for (int z = 0; z < columnNames.size(); z++) {
                             if (z < columnNames.size() - 1) {
@@ -188,23 +195,16 @@ public class TDegnineAlarm {
                         stmt.executeUpdate("insert into " + wrapName(table)
                                 + "(ts," + inkey + ")values(now()," + value + ")");
                     }
-                } catch (SQLException e) {
-                    log.error("shibaihou 数据处理异常: {}", e.getMessage());
-                }
             } else {
                 // ========== 超级表不存在：创建超级表、子表、插入数据 ==========
-                try {
-                    stmt.executeUpdate("create stable " + wrapName(supertablename)
-                            + " (ts timestamp," + tia + " ) TAGS (location binary(64))");
-                    stmt.executeUpdate("create table " + wrapName(table)
-                            + " using " + wrapName(supertablename)
-                            + " tags('" + escapeValue(supertablename) + "')");
-                    log.debug("insert into {}(ts,{})values(now(),{})", table, inkey, value);
-                    stmt.executeUpdate("insert into " + wrapName(table)
-                            + "(ts," + inkey + ")values(now()," + value + ")");
-                } catch (SQLException e) {
-                    log.error("shibaihou 创建超级表异常: {}", e.getMessage());
-                }
+                stmt.executeUpdate("create stable " + wrapName(supertablename)
+                        + " (ts timestamp," + tia + " ) TAGS (location binary(64))");
+                stmt.executeUpdate("create table " + wrapName(table)
+                        + " using " + wrapName(supertablename)
+                        + " tags('" + escapeValue(supertablename) + "')");
+                log.debug("insert into {}(ts,{})values(now(),{})", table, inkey, value);
+                stmt.executeUpdate("insert into " + wrapName(table)
+                        + "(ts," + inkey + ")values(now()," + value + ")");
             }
         } finally {
             if (stmt != null) {

iot-platform/src/main/java/com/iot/platform/service/TDengineService.java

@@ -20,21 +20,21 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 public class TDengineService {
     private static final Logger log = LoggerFactory.getLogger(TDengineService.class);
 
-    @Autowired
-    private IotProperties iotProperties;
-
+    private final IotProperties iotProperties;
     private final ExecutorService batchExecutor;
 
     @Autowired
-    public TDengineService(ExecutorService tdengineBatchExecutor) {
+    public TDengineService(ExecutorService tdengineBatchExecutor, IotProperties iotProperties) {
         this.batchExecutor = tdengineBatchExecutor;
+        this.iotProperties = iotProperties;
     }
 
     private HikariDataSource dataSource;
-    private boolean dataSourceInitialized = false;
+    private volatile boolean dataSourceInitialized = false;
 
     // === 新增：缓存超级表结构 (key = dbName.stableName) ===
     private final Map<String, Set<String>> stableColumnCache = new ConcurrentHashMap<>();
+    private static final int MAX_CACHE_SIZE = 1000;
 
     // JSON 列名，用于存储所有动态字段
     private static final String JSON_COLUMN_NAME = "ext_data";
@@ -61,10 +61,10 @@ public class TDengineService {
             config.setConnectionTestQuery("SELECT NOW()");
             config.setValidationTimeout(3000);
             this.dataSource = new HikariDataSource(config);
-            log.info("✅ TDengine 连接池初始化完成");
+            log.info("TDengine 连接池初始化完成");
         } catch (Exception e) {
-            log.warn("⚠️ TDengine 连接池初始化失败: {}", e.getMessage());
-            this.dataSource = null;
+            log.error("TDengine 连接池初始化失败: {}", e.getMessage());
+            throw new IllegalStateException("TDengine 连接池初始化失败", e);
         }
         dataSourceInitialized = true;
     }
@@ -130,6 +130,10 @@ public class TDengineService {
         // 缓存未命中，查 DB
         Set<String> columns = loadStableColumnsFromDB(dbName, stableName);
         if (!columns.isEmpty()) {
+            if (stableColumnCache.size() >= MAX_CACHE_SIZE) {
+                stableColumnCache.clear();
+                log.warn("TDengine 超级表缓存已达上限({})，已清空", MAX_CACHE_SIZE);
+            }
             stableColumnCache.put(key, columns);
         }
         return columns;
@@ -165,7 +169,7 @@ public class TDengineService {
     // ==========================================
     // 初始化表结构
     // ==========================================
-    private boolean initTableStructure(String dbName, String supertablename, String table, Set<String> fieldNames) {
+    private void initTableStructure(String dbName, String supertablename, String table, Set<String> fieldNames) throws SQLException {
         Connection conn = null;
         Statement stmt = null;
         try {
@@ -186,6 +190,10 @@ public class TDengineService {
 
             // 更新缓存：固定列
             String key = getStableKey(dbName, supertablename);
+            if (stableColumnCache.size() >= MAX_CACHE_SIZE) {
+                stableColumnCache.clear();
+                log.warn("TDengine 超级表缓存已达上限({})，已清空", MAX_CACHE_SIZE);
+            }
             Set<String> fixedCols = new HashSet<>();
             fixedCols.add("ts");
             fixedCols.add("surfacename");
@@ -202,11 +210,6 @@ public class TDengineService {
             );
             stmt.executeUpdate(tableSql);
 
-            return true;
-
-        } catch (SQLException e) {
-            log.error("❌ 表结构初始化失败: {}.{} | {}", dbName, table, e.getMessage());
-            return false;
         } finally {
             if (stmt != null) try { stmt.close(); } catch (SQLException ignored) {}
             closeConnection(conn);
@@ -216,8 +219,8 @@ public class TDengineService {
     // ==========================================
     // 批量插入
     // ==========================================
-    public boolean insertBatch(String dbName, String table, List<Map<String, Object>> dataList) throws Exception {
-        if (dataList == null || dataList.isEmpty()) return true;
+    public void insertBatch(String dbName, String table, List<Map<String, Object>> dataList) throws SQLException {
+        if (dataList == null || dataList.isEmpty()) return;
 
         String supertablename = table.contains("_") ? table.substring(0, table.lastIndexOf('_')) : table;
 
@@ -233,19 +236,16 @@ public class TDengineService {
             int end = Math.min(start + batchSize, dataList.size());
             List<Map<String, Object>> batch = dataList.subList(start, end);
 
-            if (!insertBatchInternal(dbName, supertablename, table, batch)) {
-                return false;
-            }
+            insertBatchInternal(dbName, supertablename, table, batch);
         }
 
-        log.info("✅ 批量写入成功: {} | 条数: {}", table, dataList.size());
-        return true;
+        log.info("批量写入成功: {} | 条数: {}", table, dataList.size());
     }
 
     /**
      * 内部方法：插入一批数据
      */
-    private boolean insertBatchInternal(String dbName, String supertablename, String table, List<Map<String, Object>> dataList) {
+    private void insertBatchInternal(String dbName, String supertablename, String table, List<Map<String, Object>> dataList) throws SQLException {
         // 确保表存在（可能有竞态条件）
         ensureTableExists(dbName, supertablename, table);
 
@@ -266,7 +266,7 @@ public class TDengineService {
             hasData = true;
         }
 
-        if (!hasData) return true;
+        if (!hasData) return;
 
         sqlBuilder.setLength(sqlBuilder.length() - 1);
         String finalSql = sqlBuilder.toString();
@@ -278,16 +278,15 @@ public class TDengineService {
             stmt = conn.createStatement();
             stmt.setQueryTimeout(30);
             stmt.executeUpdate(finalSql);
-            return true;
         } catch (SQLException e) {
             // 表不存在时尝试重建表后重试
             if (e.getMessage().contains("Table does not exist")) {
-                log.warn("⚠️ 表不存在，重建表: {}", table);
+                log.warn("表不存在，重建表: {}", table);
                 initTableStructure(dbName, supertablename, table, Collections.emptySet());
-                return insertBatchRetry(dbName, supertablename, table, dataList);
+                insertBatchRetry(dbName, supertablename, table, dataList);
+                return;
             }
-            log.error("❌ 批量写入 SQL 失败: {} | 错误: {}", table, e.getMessage());
-            return false;
+            throw new SQLException("批量写入 SQL 失败: " + table + " | 错误: " + e.getMessage(), e);
         } finally {
             if (stmt != null) try { stmt.close(); } catch (SQLException ignored) {}
             closeConnection(conn);
@@ -297,7 +296,7 @@ public class TDengineService {
     /**
      * 重试插入（表重建后）
      */
-    private boolean insertBatchRetry(String dbName, String supertablename, String table, List<Map<String, Object>> dataList) {
+    private void insertBatchRetry(String dbName, String supertablename, String table, List<Map<String, Object>> dataList) throws SQLException {
         StringBuilder sqlBuilder = new StringBuilder();
         sqlBuilder.append("INSERT INTO ").append(wrapName(dbName)).append(".").append(wrapName(table))
                 .append(" (ts, surfacename, ext_data) VALUES ");
@@ -312,7 +311,7 @@ public class TDengineService {
             hasData = true;
         }
 
-        if (!hasData) return true;
+        if (!hasData) return;
 
         sqlBuilder.setLength(sqlBuilder.length() - 1);
         String finalSql = sqlBuilder.toString();
@@ -324,10 +323,8 @@ public class TDengineService {
             stmt = conn.createStatement();
             stmt.setQueryTimeout(30);
             stmt.executeUpdate(finalSql);
-            return true;
         } catch (SQLException e) {
-            log.error("❌ 重试插入失败: {} | 错误: {}", table, e.getMessage());
-            return false;
+            throw new SQLException("重试插入失败: " + table + " | 错误: " + e.getMessage(), e);
         } finally {
             if (stmt != null) try { stmt.close(); } catch (SQLException ignored) {}
             closeConnection(conn);
@@ -337,7 +334,7 @@ public class TDengineService {
     /**
      * 确保表存在（检查+创建）
      */
-    private void ensureTableExists(String dbName, String supertablename, String table) {
+    private void ensureTableExists(String dbName, String supertablename, String table) throws SQLException {
         Connection conn = null;
         Statement stmt = null;
         ResultSet rs = null;
@@ -381,10 +378,10 @@ public class TDengineService {
                         escapeValue(supertablename)
                 );
                 stmt.executeUpdate(tableSql);
-                log.info("✅ 子表创建成功: {}", table);
+                log.info("子表创建成功: {}", table);
             }
         } catch (SQLException e) {
-            log.warn("检查表存在性失败，继续尝试插入: {}", e.getMessage());
+            throw new SQLException("检查表存在性失败: " + dbName + "." + table + " | " + e.getMessage(), e);
         } finally {
             closeQuietly(rs, stmt);
             closeConnection(conn);
@@ -411,8 +408,7 @@ public class TDengineService {
         try {
             return objectMapper.writeValueAsString(dynamic);
         } catch (Exception e) {
-            log.warn("JSON 序列化失败，返回空对象: {}", e.getMessage());
-            return "{}";
+            throw new IllegalStateException("JSON 序列化失败，数据可能丢失: " + dynamic, e);
         }
     }
 
@@ -423,27 +419,21 @@ public class TDengineService {
         if (data == null || data.isEmpty()) return "";
         try {
             ByteArrayOutputStream bos = new ByteArrayOutputStream();
-            GZIPOutputStream gzip = new GZIPOutputStream(bos);
-            gzip.write(data.getBytes("UTF-8"));
-            gzip.close();
+            try (GZIPOutputStream gzip = new GZIPOutputStream(bos)) {
+                gzip.write(data.getBytes("UTF-8"));
+            }
             byte[] compressed = Base64.getEncoder().encode(bos.toByteArray());
             return new String(compressed);
         } catch (Exception e) {
-            log.warn("GZIP 压缩失败，使用原始数据: {}", e.getMessage());
-            return data;
+            throw new IllegalStateException("GZIP 压缩失败: " + e.getMessage(), e);
         }
     }
 
     @Deprecated
-    public boolean addToBatch(String dbName, String table, Map<String, Object> dataMap) {
+    public void addToBatch(String dbName, String table, Map<String, Object> dataMap) throws SQLException {
         List<Map<String, Object>> list = new ArrayList<>();
         list.add(dataMap);
-        try {
-            return insertBatch(dbName, table, list);
-        } catch (Exception e) {
-            log.error("单条转批量写入失败", e);
-            return false;
-        }
+        insertBatch(dbName, table, list);
     }
 
     // ==========================================
@@ -451,7 +441,7 @@ public class TDengineService {
     // ==========================================
     public void clearStableColumnCache() {
         stableColumnCache.clear();
-        log.info("🧹 清除了 TDengine 超级表结构缓存");
+        log.info("清除了 TDengine 超级表结构缓存");
     }
 
     public void close() {

iot-platform/src/main/java/com/iot/platform/task/VehicleSyncTask.java

@@ -4,6 +4,7 @@ import com.iot.platform.domain.SysCar;
 import com.iot.platform.domain.SysCompany;
 import com.iot.platform.domain.SysDevice;
 import com.iot.platform.domain.SysDeviceControl;
+import com.iot.platform.config.IotProperties;
 import com.iot.platform.service.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -28,26 +29,42 @@ public class VehicleSyncTask {
 
     private static final Logger log = LoggerFactory.getLogger(VehicleSyncTask.class);
 
+    private final SysCarService sysCarService;
+    private final SysDeviceService sysDeviceService;
+    private final StringRedisTemplate stringRedisTemplate;
+    private final SysrealtimeService sysrealtimeService;
+    private final SysDeviceVoService sysDeviceVoService;
+    private final SysDeviceControlService sysDeviceControlService;
+    private final SysWorkorderService sysWorkorderService;
+    private final SysIndicatorsService sysIndicatorsService;
+    private final SysCompanyService sysCompanyService;
+    private final RestTemplate restTemplate;
+    private final IotProperties iotProperties;
+
     @Autowired
-    public SysCarService sysCarService;
-    @Autowired
-    public SysDeviceService sysDeviceService;
-    @Autowired
-    private StringRedisTemplate stringRedisTemplate;
-    @Autowired
-    private SysrealtimeService sysrealtimeService;
-    @Autowired
-    public SysDeviceVoService sysDeviceVoService;
-    @Autowired
-    public SysDeviceControlService sysDeviceControlService;
-    @Autowired
-    public SysWorkorderService sysWorkorderService;
-    @Autowired
-    public SysIndicatorsService sysIndicatorsService;
-    @Autowired
-    public SysCompanyService sysCompanyService;
-    @Autowired
-    private RestTemplate restTemplate;
+    public VehicleSyncTask(SysCarService sysCarService,
+                           SysDeviceService sysDeviceService,
+                           StringRedisTemplate stringRedisTemplate,
+                           SysrealtimeService sysrealtimeService,
+                           SysDeviceVoService sysDeviceVoService,
+                           SysDeviceControlService sysDeviceControlService,
+                           SysWorkorderService sysWorkorderService,
+                           SysIndicatorsService sysIndicatorsService,
+                           SysCompanyService sysCompanyService,
+                           RestTemplate restTemplate,
+                           IotProperties iotProperties) {
+        this.sysCarService = sysCarService;
+        this.sysDeviceService = sysDeviceService;
+        this.stringRedisTemplate = stringRedisTemplate;
+        this.sysrealtimeService = sysrealtimeService;
+        this.sysDeviceVoService = sysDeviceVoService;
+        this.sysDeviceControlService = sysDeviceControlService;
+        this.sysWorkorderService = sysWorkorderService;
+        this.sysIndicatorsService = sysIndicatorsService;
+        this.sysCompanyService = sysCompanyService;
+        this.restTemplate = restTemplate;
+        this.iotProperties = iotProperties;
+    }
 
     private boolean tryLock(String lockKey, long expireSeconds) {
         Boolean acquired = stringRedisTemplate.opsForValue().setIfAbsent(lockKey, "1", expireSeconds, TimeUnit.SECONDS);
@@ -55,7 +72,10 @@ public class VehicleSyncTask {
     }
 
     private void unlock(String lockKey) {
-        stringRedisTemplate.delete(lockKey);
+        Boolean deleted = stringRedisTemplate.delete(lockKey);
+        if (!Boolean.TRUE.equals(deleted)) {
+            log.warn("分布式锁释放失败: {}", lockKey);
+        }
     }
 
     /**
@@ -79,25 +99,33 @@ public class VehicleSyncTask {
     private void doUpdateSysCar() {
         List<SysCar> sysCarList = sysCarService.selectcontrollerId();
         for (SysCar sysCar : sysCarList) {
-            if (sysCar.getControllerId() == null || sysCar.getControllerId().isEmpty()) {
-                continue;
-            }
-            SysDevice latitude = sysDeviceService.selectsysdevice(sysCar.getControllerId(), "纬度");
-            SysDevice longitude = sysDeviceService.selectsysdevice(sysCar.getControllerId(), "经度");
+            try {
+                if (sysCar.getControllerId() == null || sysCar.getControllerId().isEmpty()) {
+                    continue;
+                }
+                SysDevice latitude = sysDeviceService.selectsysdevice(sysCar.getControllerId(), "纬度");
+                SysDevice longitude = sysDeviceService.selectsysdevice(sysCar.getControllerId(), "经度");
 
-            String redisKeyPattern = "workorder:coordinate:" + sysCar.getControllerId() + ":*";
-            Set<String> keys = scanKeys(redisKeyPattern);
+                String redisKeyPattern = "workorder:coordinate:" + sysCar.getControllerId() + ":*";
+                Set<String> keys = scanKeys(redisKeyPattern);
 
-            if (keys == null || keys.isEmpty()) {
-                updateCarPosition(sysCar, latitude, longitude);
-            } else {
-                for (String key : keys) {
-                    Map<Object, Object> coordinateMap = stringRedisTemplate.opsForHash().entries(key);
-                    if (coordinateMap.get("latitude").equals(latitude.getV()) && coordinateMap.get("longitude").equals(longitude.getV())) {
-                        continue;
-                    }
+                if (keys == null || keys.isEmpty()) {
                     updateCarPosition(sysCar, latitude, longitude);
+                } else {
+                    for (String key : keys) {
+                        Map<Object, Object> coordinateMap = stringRedisTemplate.opsForHash().entries(key);
+                        Object cachedLat = coordinateMap.get("latitude");
+                        Object cachedLon = coordinateMap.get("longitude");
+                        if (cachedLat != null && cachedLat.equals(latitude.getV()) && cachedLon != null && cachedLon.equals(longitude.getV())) {
+                            continue;
+                        }
+                        updateCarPosition(sysCar, latitude, longitude);
+                    }
                 }
+            } catch (DataAccessException e) {
+                log.error("更新车辆位置失败 carId={}: {}", sysCar.getCarId(), e.getMessage(), e);
+            } catch (Exception e) {
+                log.error("更新车辆位置异常 carId={}: {}", sysCar.getCarId(), e.getMessage(), e);
             }
         }
     }
@@ -110,7 +138,7 @@ public class VehicleSyncTask {
 
         String position = latitude.getV() + "," + longitude.getV();
         sysCarService.updatecarposition(position, sysCar.getCarId());
-        String url = "https://esos-iot.com:9443/syscar/trigger?carId=" + sysCar.getCarId();
+        String url = iotProperties.getMqtt().getVehicleTriggerUrl() + "?carId=" + sysCar.getCarId();
         try {
             restTemplate.postForObject(url, null, String.class);
         } catch (RestClientException e) {
@@ -130,8 +158,10 @@ public class VehicleSyncTask {
                 cursor.close();
                 return null;
             });
+        } catch (RedisConnectionFailureException e) {
+            log.warn("Redis SCAN 连接失败 pattern={}: {}", pattern, e.getMessage());
         } catch (Exception e) {
-            log.error("Redis SCAN失败 pattern={}: {}", pattern, e.getMessage());
+            log.error("Redis SCAN 失败 pattern={}: {}", pattern, e.getMessage(), e);
         }
         return keys;
     }
@@ -185,13 +215,16 @@ public class VehicleSyncTask {
                             String fieldvalue = entry.getValue().toString();
                             if (sysDeviceControlList.get(i).getControllerName().equals(fieldKey)) {
                                 keyvalue.append(fieldKey).append("=/'").append(fieldvalue).append("/'");
-                                if (i > sysDeviceControlList.size() - 1) {
+                                if (i < sysDeviceControlList.size() - 1) {
                                     keyvalue.append(",");
                                 }
                             }
                         }
                     }
-                    sysDeviceVoService.updatesysdevice(keyvalue.toString(), controllerId);
+                    boolean updated = sysDeviceVoService.updatesysdevice(keyvalue.toString(), controllerId);
+                    if (!updated) {
+                        log.warn("更新设备配置失败: controllerId={}", controllerId);
+                    }
                 } else {
                     StringBuilder key = new StringBuilder();
                     StringBuilder value = new StringBuilder();
@@ -202,14 +235,17 @@ public class VehicleSyncTask {
                             if (sysDeviceControlList.get(i).getControllerName().equals(fieldKey)) {
                                 key.append(fieldKey);
                                 value.append(fieldvalue);
-                                if (i > sysDeviceControlList.size() - 1) {
+                                if (i < sysDeviceControlList.size() - 1) {
                                     key.append(",");
                                     value.append(",");
                                 }
                             }
                         }
                     }
-                    sysDeviceVoService.insertdevice(key.toString(), value.toString());
+                    boolean inserted = sysDeviceVoService.insertdevice(key.toString(), value.toString());
+                    if (!inserted) {
+                        log.warn("插入设备配置失败: controllerId={}", controllerId);
+                    }
                 }
             }
         } catch (RedisConnectionFailureException e) {
@@ -307,40 +343,40 @@ public class VehicleSyncTask {
      * 更新指标信息
      * 根据公司去查询
      */
-    @Scheduled(fixedDelay = 30000)
-    public void insertIndicators() {
-        String lockKey = "lock:vehicle-sync:insertIndicators";
-        if (!tryLock(lockKey, 60)) {
-            log.debug("获取锁失败，跳过本次执行: {}", lockKey);
-            return;
-        }
-        try {
-            doInsertIndicators();
-        } finally {
-            unlock(lockKey);
-        }
-    }
+//    @Scheduled(fixedDelay = 30000)
+//    public void insertIndicators() {
+//        String lockKey = "lock:vehicle-sync:insertIndicators";
+//        if (!tryLock(lockKey, 60)) {
+//            log.debug("获取锁失败，跳过本次执行: {}", lockKey);
+//            return;
+//        }
+//        try {
+//            doInsertIndicators();
+//        } finally {
+//            unlock(lockKey);
+//        }
+//    }
 
-    private void doInsertIndicators() {
-        try {
-            LocalDate today = LocalDate.now();
-            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-            String day = today.format(formatter);
-            List<SysCompany> sysCompanyList = sysCompanyService.selectcompany();
-            for (SysCompany sysCompany : sysCompanyList) {
-                Integer countworkorder = sysWorkorderService.selectworkordercount(sysCompany.getCompanyId(), day);
-                Double countprofit = sysWorkorderService.selectwokroderprofit(sysCompany.getCompanyId(), day);
-                Integer count = sysIndicatorsService.selectcarcount(sysCompany.getCompanyId(), day);
-                if (count <= 0) {
-                    sysIndicatorsService.insertindicators(countworkorder, countprofit, sysCompany.getCompanyId(), day);
-                } else {
-                    sysIndicatorsService.updateindicators(countworkorder, countprofit, sysCompany.getCompanyId(), day);
-                }
-            }
-        } catch (DataAccessException e) {
-            log.error("数据库操作失败: {}", e.getMessage(), e);
-        } catch (Exception e) {
-            log.error("更新指标信息失败: {}", e.getMessage(), e);
-        }
-    }
+//    private void doInsertIndicators() {
+//        try {
+//            LocalDate today = LocalDate.now();
+//            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+//            String day = today.format(formatter);
+//            List<SysCompany> sysCompanyList = sysCompanyService.selectcompany();
+//            for (SysCompany sysCompany : sysCompanyList) {
+//                Integer countworkorder = sysWorkorderService.selectworkordercount(sysCompany.getCompanyId(), day);
+//                Double countprofit = sysWorkorderService.selectwokroderprofit(sysCompany.getCompanyId(), day);
+//                Integer count = sysIndicatorsService.selectcarcount(sysCompany.getCompanyId(), day);
+//                if (count <= 0) {
+//                    sysIndicatorsService.insertindicators(countworkorder, countprofit, sysCompany.getCompanyId(), day);
+//                } else {
+//                    sysIndicatorsService.updateindicators(countworkorder, countprofit, sysCompany.getCompanyId(), day);
+//                }
+//            }
+//        } catch (DataAccessException e) {
+//            log.error("数据库操作失败: {}", e.getMessage(), e);
+//        } catch (Exception e) {
+//            log.error("更新指标信息失败: {}", e.getMessage(), e);
+//        }
+//    }
 }

iot-platform/src/main/resources/application-druid.yml

@@ -8,14 +8,14 @@ spring:
             master:
                 url: jdbc:mysql://47.104.204.180:3306/data?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: ${MYSQL_USERNAME:root}
-                password: ${MYSQL_PASSWORD:Zhu059300()__}
+                password: ${MYSQL_PASSWORD}
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
                 enabled: true
                 url: jdbc:mysql://47.104.204.180:3306/cnc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: ${MYSQL_USERNAME:root}
-                password: ${MYSQL_PASSWORD:Zhu059300()__}
+                password: ${MYSQL_PASSWORD}
             # 初始连接数
             initialSize: 5
             # 最小连接池数量
@@ -48,7 +48,7 @@ spring:
                 url-pattern: /druid/*
                 # 控制台管理用户名和密码
                 login-username: ${DRUID_USERNAME:ruoyi}
-                login-password: ${DRUID_PASSWORD:123456}
+                login-password: ${DRUID_PASSWORD}
             filter:
                 stat:
                     enabled: true

iot-platform/src/main/resources/application.yml

@@ -68,6 +68,7 @@ iot:
     broker-url: tcp://47.104.204.180:1883
     username: ${MQTT_USERNAME:}
     password: ${MQTT_PASSWORD:}
+    charge-station-topic: ${MQTT_CHARGE_STATION_TOPIC:station/ChargeStation/device/+/post/json}
   tdengine:
     url: jdbc:TAOS://localhost:6030/
     username: ${TDENGINE_USERNAME:}

iot-platform/src/main/resources/mapper/SysFaultMapper.xml

@@ -30,7 +30,7 @@
     </insert>
 
     <select id="selectfaultcount" resultType="Integer">
-        select cout(*) from alert_data where  device_id=#{deviceId}
+        select count(*) from alert_data where device_id=#{deviceId}
     </select>
     <update id="createmessage">
         CREATE TABLE `${tableName}` (

iot-platform/src/main/resources/mybatis-config.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration
-PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-config.dtd">
-<configuration>
-    <!-- 全局参数 -->
-    <settings>
-        <!-- 使全局的映射器启用或禁用缓存 -->
-        <setting name="cacheEnabled"             value="true"   />
-        <!-- 允许JDBC 支持自动生成主键 -->
-        <setting name="useGeneratedKeys"         value="true"   />
-        <!-- 配置默认的执行器.SIMPLE就是普通执行器;REUSE执行器会重用预处理语句(prepared statements);BATCH执行器将重用语句并执行批量更新 -->
-        <setting name="defaultExecutorType"      value="SIMPLE" />
-		<!-- 指定 MyBatis 所用日志的具体实现 -->
-        <setting name="logImpl"                  value="SLF4J"  />
-        <!-- 使用驼峰命名法转换字段 -->
-		<!-- <setting name="mapUnderscoreToCamelCase" value="true"/> -->
-	</settings>
-	
-</configuration>

iot-platform/src/test/java/com/iot/platform/mqtt/AbstractDynamicMqttConsumerTest.java

@@ -0,0 +1,105 @@
+package com.iot.platform.mqtt;
+
+import com.iot.platform.config.IotProperties;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@ExtendWith(MockitoExtension.class)
+class AbstractDynamicMqttConsumerTest {
+
+    @Mock
+    private IotProperties iotProperties;
+
+    private TestDynamicConsumer consumer;
+
+    @BeforeEach
+    void setUp() {
+        ScheduledExecutorService coreExecutor = Executors.newSingleThreadScheduledExecutor();
+        ExecutorService writeExecutor = Executors.newSingleThreadExecutor();
+        consumer = new TestDynamicConsumer(iotProperties, coreExecutor, writeExecutor);
+    }
+
+    @Test
+    @DisplayName("deepCopyMap: null 输入应返回空 Map")
+    void deepCopyMap_nullInput_returnsEmptyMap() {
+        Map<String, Object> result = consumer.deepCopyMap(null);
+        assertThat(result).isNotNull().isEmpty();
+    }
+
+    @Test
+    @DisplayName("deepCopyMap: 应返回深拷贝，修改副本不影响原图")
+    void deepCopyMap_returnsDeepCopy() {
+        Map<String, Object> original = new HashMap<>();
+        original.put("key1", "value1");
+        original.put("key2", 42);
+
+        Map<String, Object> copy = consumer.deepCopyMap(original);
+
+        assertThat(copy).containsExactlyInAnyOrderEntriesOf(original);
+        copy.put("key1", "modified");
+        assertThat(original.get("key1")).isEqualTo("value1");
+    }
+
+    @Test
+    @DisplayName("deepCopyMap: 应处理嵌套 Map")
+    void deepCopyMap_nestedMap_returnsDeepCopy() {
+        Map<String, Object> inner = new HashMap<>();
+        inner.put("innerKey", "innerValue");
+
+        Map<String, Object> original = new HashMap<>();
+        original.put("nested", inner);
+
+        Map<String, Object> copy = consumer.deepCopyMap(original);
+
+        assertThat(copy).containsKey("nested");
+        @SuppressWarnings("unchecked")
+        Map<String, Object> copiedInner = (Map<String, Object>) copy.get("nested");
+        copiedInner.put("innerKey", "modified");
+        assertThat(inner.get("innerKey")).isEqualTo("innerValue");
+    }
+
+    @Test
+    @DisplayName("deepCopyMap: 应处理包含 List 的 Map")
+    void deepCopyMap_withList_returnsDeepCopy() {
+        Map<String, Object> original = new HashMap<>();
+        original.put("list", Arrays.asList("a", "b", "c"));
+
+        Map<String, Object> copy = consumer.deepCopyMap(original);
+
+        assertThat(copy).containsKey("list");
+        @SuppressWarnings("unchecked")
+        List<String> copiedList = (List<String>) copy.get("list");
+        assertThat(copiedList).containsExactly("a", "b", "c");
+    }
+
+    /**
+     * 用于测试的匿名实现
+     */
+    static class TestDynamicConsumer extends AbstractDynamicMqttConsumer {
+        TestDynamicConsumer(IotProperties iotProperties,
+                            ScheduledExecutorService coreExecutor,
+                            ExecutorService writeExecutor) {
+            super(iotProperties, coreExecutor, writeExecutor);
+        }
+
+        @Override
+        protected List<String> fetchTopics() {
+            return Collections.emptyList();
+        }
+
+        @Override
+        protected void processMessage(String content, String topic) {
+        }
+    }
+}

iot-platform/src/test/java/com/iot/platform/mqtt/MqttChargeStationConsumerTest.java

@@ -0,0 +1,86 @@
+package com.iot.platform.mqtt;
+
+import com.iot.platform.config.IotProperties;
+import com.iot.platform.service.TDengineService;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+class MqttChargeStationConsumerTest {
+
+    @Mock
+    private IotProperties iotProperties;
+
+    @Mock
+    private IotProperties.Mqtt mqtt;
+
+    @Mock
+    private TDengineService tdengineService;
+
+    private MqttChargeStationConsumer consumer;
+
+    @BeforeEach
+    void setUp() {
+        ScheduledExecutorService coreExecutor = Executors.newSingleThreadScheduledExecutor();
+        ExecutorService writeExecutor = Executors.newSingleThreadExecutor();
+        consumer = new MqttChargeStationConsumer(iotProperties, coreExecutor, writeExecutor, tdengineService);
+    }
+
+    @Test
+    @DisplayName("fetchTopics: 应返回配置的 chargeStationTopic")
+    void fetchTopics_withConfiguredTopic_returnsTopicList() {
+        when(iotProperties.getMqtt()).thenReturn(mqtt);
+        when(mqtt.getChargeStationTopic()).thenReturn("station/ChargeStation/device/+/post/json");
+
+        List<String> result = consumer.fetchTopics();
+
+        assertThat(result).containsExactly("station/ChargeStation/device/+/post/json");
+    }
+
+    @Test
+    @DisplayName("fetchTopics: topic 为 null 时应返回空列表")
+    void fetchTopics_nullTopic_returnsEmptyList() {
+        when(iotProperties.getMqtt()).thenReturn(mqtt);
+        when(mqtt.getChargeStationTopic()).thenReturn(null);
+
+        List<String> result = consumer.fetchTopics();
+
+        assertThat(result).isEmpty();
+    }
+
+    @Test
+    @DisplayName("fetchTopics: topic 为空字符串时应返回空列表")
+    void fetchTopics_emptyTopic_returnsEmptyList() {
+        when(iotProperties.getMqtt()).thenReturn(mqtt);
+        when(mqtt.getChargeStationTopic()).thenReturn("   ");
+
+        List<String> result = consumer.fetchTopics();
+
+        assertThat(result).isEmpty();
+    }
+
+    @Test
+    @DisplayName("fetchTopics: topic 应被 trim 处理")
+    void fetchTopics_trimmedTopic_returnsTrimmedList() {
+        when(iotProperties.getMqtt()).thenReturn(mqtt);
+        when(mqtt.getChargeStationTopic()).thenReturn("  station/test  ");
+
+        List<String> result = consumer.fetchTopics();
+
+        assertThat(result).containsExactly("station/test");
+    }
+}

iot-platform/src/test/java/com/iot/platform/mqtt/MqttDynamicConsumerTest.java

@@ -0,0 +1,138 @@
+package com.iot.platform.mqtt;
+
+import com.iot.platform.config.IotProperties;
+import com.iot.platform.domain.SysController;
+import com.iot.platform.service.SysControllerService;
+import com.iot.platform.service.TDengineService;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.data.redis.core.HashOperations;
+import org.springframework.data.redis.core.SetOperations;
+import org.springframework.data.redis.core.StringRedisTemplate;
+
+import java.util.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+class MqttDynamicConsumerTest {
+
+    @Mock
+    private IotProperties iotProperties;
+
+    @Mock
+    private SysControllerService sysControllerService;
+
+    @Mock
+    private TDengineService tdengineService;
+
+    @Mock
+    private StringRedisTemplate stringRedisTemplate;
+
+    @Mock
+    private HashOperations<String, Object, Object> hashOperations;
+
+    @Mock
+    private SetOperations<String, String> setOperations;
+
+    private MqttDynamicConsumer consumer;
+
+    @BeforeEach
+    void setUp() {
+        ScheduledExecutorService coreExecutor = Executors.newSingleThreadScheduledExecutor();
+        ExecutorService writeExecutor = Executors.newSingleThreadExecutor();
+        consumer = new MqttDynamicConsumer(iotProperties, coreExecutor, writeExecutor,
+                sysControllerService, tdengineService, stringRedisTemplate);
+    }
+
+    @Test
+    @DisplayName("fetchTopics 应返回 sysControllerService.selectall() 的结果")
+    void fetchTopics_delegatesToService() {
+        List<String> expected = Arrays.asList("topic/1", "topic/2");
+        when(sysControllerService.selectall()).thenReturn(expected);
+
+        List<String> result = consumer.fetchTopics();
+
+        assertThat(result).isEqualTo(expected);
+        verify(sysControllerService).selectall();
+    }
+
+    @Test
+    @DisplayName("fetchTopics 应处理 null 返回值")
+    void fetchTopics_nullReturn_returnsNull() {
+        when(sysControllerService.selectall()).thenReturn(null);
+
+        List<String> result = consumer.fetchTopics();
+
+        assertThat(result).isNull();
+    }
+
+    @Test
+    @DisplayName("insertredis: 应写入 Redis hash 和 active devices set")
+    void insertredis_validData_writesToRedis() throws Exception {
+        when(stringRedisTemplate.opsForHash()).thenReturn(hashOperations);
+        when(stringRedisTemplate.opsForSet()).thenReturn(setOperations);
+
+        SysController controller = new SysController();
+        controller.setName("temperature");
+        when(sysControllerService.selectcontrollerpath("ctrl1/temperature")).thenReturn(controller);
+
+        Map<String, Object> weather = new HashMap<>();
+        weather.put("timestamp", "1234567890");
+        weather.put("device_id", "dev001");
+        Map<String, Object> metricData = new HashMap<>();
+        metricData.put("val", "25.5");
+        weather.put("temperature", metricData);
+
+        consumer.insertredis(weather, "ctrl1/temperature");
+
+        verify(hashOperations).putAll(eq("DSB:ctrl1:temperature"), anyMap());
+        verify(stringRedisTemplate).expire("DSB:ctrl1:temperature", 2, TimeUnit.HOURS);
+        verify(setOperations).add("DSB:active:devices", "DSB:ctrl1:temperature");
+        verify(stringRedisTemplate).expire("DSB:active:devices", 2, TimeUnit.HOURS);
+    }
+
+    @Test
+    @DisplayName("insertredis: topic 格式无效时应直接返回")
+    void insertredis_invalidTopic_returnsSilently() throws Exception {
+        consumer.insertredis(new HashMap<>(), "invalidtopic");
+
+        verifyNoInteractions(stringRedisTemplate);
+    }
+
+    @Test
+    @DisplayName("insertredis: controller 未找到时应直接返回")
+    void insertredis_controllerNotFound_returnsSilently() throws Exception {
+        when(sysControllerService.selectcontrollerpath("ctrl1/missing")).thenReturn(null);
+
+        Map<String, Object> weather = new HashMap<>();
+        consumer.insertredis(weather, "ctrl1/missing");
+
+        verifyNoInteractions(stringRedisTemplate);
+    }
+
+    @Test
+    @DisplayName("insertredis: metricData 为 null 时应直接返回")
+    void insertredis_nullMetricData_returnsSilently() throws Exception {
+        SysController controller = new SysController();
+        controller.setName("temperature");
+        when(sysControllerService.selectcontrollerpath("ctrl1/temperature")).thenReturn(controller);
+
+        Map<String, Object> weather = new HashMap<>();
+        weather.put("temperature", null);
+
+        consumer.insertredis(weather, "ctrl1/temperature");
+
+        verifyNoInteractions(stringRedisTemplate);
+    }
+}

iot-platform/src/test/java/com/iot/platform/mqtt/MqttFaultConsumerTest.java

@@ -0,0 +1,225 @@
+package com.iot.platform.mqtt;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.iot.platform.common.utils.NumericIdGenerator;
+import com.iot.platform.config.IotProperties;
+import com.iot.platform.domain.SysDevice;
+import com.iot.platform.domain.SysFault;
+import com.iot.platform.service.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+import org.springframework.web.client.RestTemplate;
+
+import java.sql.SQLException;
+import java.time.LocalDate;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class MqttFaultConsumerTest {
+
+    @Mock
+    private SysControllerService sysControllerService;
+
+    @Mock
+    private SysFaultService sysFaultService;
+
+    @Mock
+    private SysrealtimeService sysrealtimeService;
+
+    @Mock
+    private SysWorkorderService sysWorkorderService;
+
+    @Mock
+    private SysAlarmService sysAlarmService;
+
+    @Mock
+    private NumericIdGenerator numericIdGenerator;
+
+    @Mock
+    private TDegnineAlarm tDegnineAlarm;
+
+    @Mock
+    private RestTemplate restTemplate;
+
+    @Mock
+    private IotProperties iotProperties;
+
+    @Mock(name = "mqttFaultExecutor")
+    private ExecutorService mqttFaultExecutor;
+
+    @Mock(name = "abstractConsumerExecutor")
+    private ExecutorService abstractConsumerExecutor;
+
+    private MqttFaultConsumer mqttFaultConsumer;
+
+    private final ObjectMapper objectMapper = new ObjectMapper();
+
+    @BeforeEach
+    void setUp() {
+        mqttFaultConsumer = new MqttFaultConsumer(
+                mqttFaultExecutor, abstractConsumerExecutor, iotProperties,
+                sysControllerService, sysFaultService, sysrealtimeService,
+                sysWorkorderService, sysAlarmService, numericIdGenerator,
+                tDegnineAlarm, restTemplate);
+
+        IotProperties.Mqtt mqttConfig = new IotProperties.Mqtt();
+        mqttConfig.setAlarmWebhookUrl("https://esos-iot.com:9443/syscar/gaojing");
+        when(iotProperties.getMqtt()).thenReturn(mqttConfig);
+
+        // executor mock runs submitted tasks synchronously
+        lenient().when(mqttFaultExecutor.submit(any(Runnable.class))).thenAnswer(inv -> {
+            Runnable r = inv.getArgument(0);
+            r.run();
+            return null;
+        });
+    }
+
+    @Test
+    @DisplayName("getSubscribeTopic returns +/fault_prot")
+    void getSubscribeTopic_returnsCorrectValue() {
+        assertThat(mqttFaultConsumer.getSubscribeTopic()).isEqualTo("+/fault_prot");
+    }
+
+    @Test
+    @DisplayName("generateClientId contains mqttx prefix and differs by OS")
+    void generateClientId_containsPrefixAndDiffersByOs() {
+        String clientId = mqttFaultConsumer.generateClientId();
+        assertThat(clientId).startsWith("mqttx_e216fbf162");
+
+        String osName = System.getProperty("os.name").toLowerCase();
+        String expectedBase = osName.contains("windows") ? "mqttx_e216fbf1620" : "mqttx_e216fbf1621";
+        assertThat(clientId).startsWith(expectedBase + "_");
+    }
+
+    @Test
+    @DisplayName("insertTDegine maps keys correctly via KEY_MAPPING")
+    void insertTDegine_mapsKeysCorrectly() throws SQLException {
+        Map<String, Object> weather = new HashMap<>();
+        weather.put("timestamp", "2024-01-01T00:00:00Z");
+        weather.put("type", "触发");
+        weather.put("desc", "overtemperature");
+        weather.put("other", "value");
+
+        String topic = "controller1/fault_prot";
+
+        mqttFaultConsumer.insertTDegine(weather, topic);
+
+        verify(tDegnineAlarm).shibaihou(argThat(map ->
+                "2024-01-01T00:00:00Z".equals(map.get("devicetimestamp"))
+                        && "触发".equals(map.get("devicetype"))
+                        && "overtemperature".equals(map.get("devicedesc"))
+                        && "value".equals(map.get("other"))
+                        && !map.containsKey("timestamp")
+                        && !map.containsKey("type")
+                        && !map.containsKey("desc")
+        ), anyString(), anyString(), anyString());
+    }
+
+    @Test
+    @DisplayName("insertTDegine splits topic correctly")
+    void insertTDegine_splitsTopicCorrectly() throws SQLException {
+        Map<String, Object> weather = new HashMap<>();
+        weather.put("timestamp", "2024-01-01T00:00:00Z");
+
+        String topic = "myController/fault_prot";
+        LocalDate now = LocalDate.now();
+        int year = now.getYear();
+        int month = now.getMonthValue();
+        String expectedTable = "myController_" + year + month;
+
+        mqttFaultConsumer.insertTDegine(weather, topic);
+
+        verify(tDegnineAlarm).shibaihou(anyMap(), eq("myController"), eq(expectedTable), eq("fault_prot"));
+    }
+
+    @Test
+    @DisplayName("handleMessage parses JSON and calls insertTDegine")
+    void handleMessage_parsesJsonAndCallsInsertTDegine() throws Exception {
+        String topic = "ctrl1/fault_prot";
+        String messageContent = "{\"device_id\":\"dev1\",\"controller_id\":\"ctrl1\",\"timestamp\":\"2024-01-01T00:00:00Z\",\"type\":\"触发\",\"code\":1,\"desc\":\"overtemperature\"}";
+
+        SysDevice jingdu = new SysDevice();
+        jingdu.setV("116.3974");
+        SysDevice weidu = new SysDevice();
+        weidu.setV("39.9093");
+
+        lenient().when(sysrealtimeService.selecttables()).thenReturn(Collections.singletonList("ctrl1" + LocalDate.now().getYear() + String.format("%02d", LocalDate.now().getMonthValue()) + "_fault"));
+        lenient().when(sysControllerService.selectjingweidu("ctrl1", "经度")).thenReturn(jingdu);
+        lenient().when(sysControllerService.selectjingweidu("ctrl1", "纬度")).thenReturn(weidu);
+        lenient().when(numericIdGenerator.nextId()).thenReturn("123456789");
+
+        mqttFaultConsumer.handleMessage(topic, messageContent);
+
+        verify(tDegnineAlarm).shibaihou(anyMap(), eq("ctrl1"), anyString(), eq("fault_prot"));
+    }
+
+    @Test
+    @DisplayName("triggermethod with 触发 type calls insertalarm and insertfault")
+    void triggermethod_triggerType_callsInsertAlarmAndInsertFault() {
+        SysFault weather = new SysFault();
+        weather.setDevice_id("dev1");
+        weather.setController_id("ctrl1");
+        weather.setTimestamp("2024-01-01T00:00:00Z");
+        weather.setType("触发");
+        weather.setDesc("overtemperature");
+
+        String topic = "ctrl1/fault_prot";
+
+        SysDevice jingdu = new SysDevice();
+        jingdu.setV("116.3974");
+        SysDevice weidu = new SysDevice();
+        weidu.setV("39.9093");
+
+        when(sysrealtimeService.selecttables()).thenReturn(Collections.singletonList("ctrl1" + LocalDate.now().getYear() + String.format("%02d", LocalDate.now().getMonthValue()) + "_fault"));
+        when(sysControllerService.selectjingweidu("ctrl1", "经度")).thenReturn(jingdu);
+        when(sysControllerService.selectjingweidu("ctrl1", "纬度")).thenReturn(weidu);
+        when(numericIdGenerator.nextId()).thenReturn("123456789");
+
+        mqttFaultConsumer.triggermethod(topic, weather);
+
+        verify(sysAlarmService).insertalarm(anyString(), eq("GJ123456789"), eq("overtemperature"), eq("0"), anyString(), eq("0"), eq("ctrl1"), eq("dev1"), eq("116.3974"), eq("39.9093"));
+        verify(sysFaultService).insertfault(eq("GJ123456789"), eq("overtemperature"), eq("0"), anyString(), eq("0"), eq("ctrl1"), eq("dev1"), eq("116.3974"), eq("39.9093"), eq(""));
+    }
+
+    @Test
+    @DisplayName("triggermethod with 恢复 type calls insertalarm and updatefault")
+    void triggermethod_recoverType_callsInsertAlarmAndUpdateFault() {
+        SysFault weather = new SysFault();
+        weather.setDevice_id("dev1");
+        weather.setController_id("ctrl1");
+        weather.setTimestamp("2024-01-01T00:00:00Z");
+        weather.setType("恢复");
+        weather.setDesc("overtemperature recovered");
+
+        String topic = "ctrl1/fault_prot";
+
+        SysDevice jingdu = new SysDevice();
+        jingdu.setV("116.3974");
+        SysDevice weidu = new SysDevice();
+        weidu.setV("39.9093");
+
+        when(sysrealtimeService.selecttables()).thenReturn(Collections.singletonList("ctrl1" + LocalDate.now().getYear() + String.format("%02d", LocalDate.now().getMonthValue()) + "_fault"));
+        when(sysControllerService.selectjingweidu("ctrl1", "经度")).thenReturn(jingdu);
+        when(sysControllerService.selectjingweidu("ctrl1", "纬度")).thenReturn(weidu);
+        when(numericIdGenerator.nextId()).thenReturn("987654321");
+
+        mqttFaultConsumer.triggermethod(topic, weather);
+
+        verify(sysAlarmService).insertalarm(anyString(), eq("GJ987654321"), eq("overtemperature recovered"), eq("1"), anyString(), eq("0"), eq("ctrl1"), eq("dev1"), eq("116.3974"), eq("39.9093"));
+        verify(sysFaultService).updatefault(eq("1"), eq("0"), eq("116.3974"), eq("39.9093"), eq("overtemperature recovered"), eq("ctrl1"), eq("dev1"), anyString());
+    }
+}

iot-platform/src/test/java/com/iot/platform/mqtt/MqttGenericConsumerTest.java

@@ -1,23 +1,40 @@
 package com.iot.platform.mqtt;
 
+import com.iot.platform.config.IotProperties;
+import com.iot.platform.service.SysControllerService;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
+import org.springframework.data.redis.core.StringRedisTemplate;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
 
 class MqttGenericConsumerTest {
 
+    private final ExecutorService executorService = Executors.newSingleThreadExecutor();
+    private final IotProperties iotProperties = mock(IotProperties.class);
+    private final StringRedisTemplate stringRedisTemplate = mock(StringRedisTemplate.class);
+    private final SysControllerService sysControllerService = mock(SysControllerService.class);
+    private final MqttDynamicConsumer mqttDynamicConsumer = mock(MqttDynamicConsumer.class);
+
+    private MqttGenericConsumer createConsumer() {
+        return new MqttGenericConsumer(executorService, iotProperties, stringRedisTemplate, sysControllerService, mqttDynamicConsumer);
+    }
+
     @Test
     @DisplayName("getSubscribeTopic 应返回 +/generics")
     void getSubscribeTopic_returnsCorrectValue() {
-        MqttGenericConsumer consumer = new MqttGenericConsumer();
+        MqttGenericConsumer consumer = createConsumer();
         assertThat(consumer.getSubscribeTopic()).isEqualTo("+/generics");
     }
 
     @Test
     @DisplayName("generateClientId 应包含 mqttx 前缀")
     void generateClientId_containsPrefix() {
-        MqttGenericConsumer consumer = new MqttGenericConsumer();
+        MqttGenericConsumer consumer = createConsumer();
         String clientId = consumer.generateClientId();
         assertThat(clientId).startsWith("mqttx_e216fbf16");
     }

iot-platform/src/test/java/com/iot/platform/mqtt/MqttStatusConsumerTest.java

@@ -0,0 +1,204 @@
+package com.iot.platform.mqtt;
+
+import com.iot.platform.config.IotProperties;
+import com.iot.platform.service.SysControllerService;
+import com.iot.platform.service.SysStatusService;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+import org.springframework.data.redis.core.HashOperations;
+import org.springframework.data.redis.core.StringRedisTemplate;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.lenient;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class MqttStatusConsumerTest {
+
+    @Mock
+    private StringRedisTemplate stringRedisTemplate;
+
+    @Mock
+    private SysControllerService sysControllerService;
+
+    @Mock
+    private SysStatusService sysStatusService;
+
+    @Mock
+    private HashOperations<String, Object, Object> hashOperations;
+
+    @Mock
+    private IotProperties iotProperties;
+
+    private MqttStatusConsumer mqttStatusConsumer;
+
+    private final ExecutorService executorService = Executors.newSingleThreadExecutor();
+
+    @BeforeEach
+    void setUp() {
+        mqttStatusConsumer = new MqttStatusConsumer(executorService, iotProperties,
+                stringRedisTemplate, sysControllerService, sysStatusService);
+        lenient().when(stringRedisTemplate.opsForHash()).thenReturn(hashOperations);
+    }
+
+    @Test
+    @DisplayName("getSubscribeTopic returns +/status")
+    void getSubscribeTopic_returnsStatusTopic() {
+        assertThat(mqttStatusConsumer.getSubscribeTopic()).isEqualTo("+/status");
+    }
+
+    @Test
+    @DisplayName("generateClientId contains mqttx prefix and differs by OS")
+    void generateClientId_containsPrefixAndDiffersByOs() {
+        String clientId = mqttStatusConsumer.generateClientId();
+
+        assertThat(clientId).startsWith("mqttx_e216fbf161");
+
+        String osName = System.getProperty("os.name").toLowerCase();
+        String expectedBase = osName.contains("windows") ? "mqttx_e216fbf1613" : "mqttx_e216fbf1614";
+        assertThat(clientId).startsWith(expectedBase + "_");
+    }
+
+    @Test
+    @DisplayName("triggermethod with count <= 0 calls insertsysstatus")
+    void triggermethod_countZeroOrLess_callsInsertsysstatus() throws Exception {
+        Map<String, Object> weather = new HashMap<>();
+        weather.put("controller_id", "CTRL_001");
+        weather.put("fleet_id", "FLEET_001");
+        weather.put("status", "online");
+
+        when(sysStatusService.selectstatuscount("CTRL_001")).thenReturn(0);
+
+        mqttStatusConsumer.triggermethod(weather);
+
+        verify(sysStatusService).selectstatuscount("CTRL_001");
+        verify(sysStatusService).insertsysstatus(
+            eq("CTRL_001"), eq("FLEET_001"), eq("online"), anyString()
+        );
+        verify(sysStatusService, never()).updatestatus(anyString(), anyString(), anyString(), anyString());
+
+        verify(hashOperations).put("CTRL_001status:", "fleet_id", "FLEET_001");
+        verify(hashOperations).put("CTRL_001status:", "status", "online");
+    }
+
+    @Test
+    @DisplayName("triggermethod with count > 0 calls updatestatus")
+    void triggermethod_countGreaterThanZero_callsUpdatestatus() throws Exception {
+        Map<String, Object> weather = new HashMap<>();
+        weather.put("controller_id", "CTRL_002");
+        weather.put("fleet_id", "FLEET_002");
+        weather.put("status", "offline");
+
+        when(sysStatusService.selectstatuscount("CTRL_002")).thenReturn(3);
+
+        mqttStatusConsumer.triggermethod(weather);
+
+        verify(sysStatusService).selectstatuscount("CTRL_002");
+        verify(sysStatusService).updatestatus(
+            eq("CTRL_002"), eq("FLEET_002"), eq("offline"), anyString()
+        );
+        verify(sysStatusService, never()).insertsysstatus(anyString(), anyString(), anyString(), anyString());
+
+        verify(hashOperations).put("CTRL_002status:", "fleet_id", "FLEET_002");
+        verify(hashOperations).put("CTRL_002status:", "status", "offline");
+    }
+
+    @Test
+    @DisplayName("handleMessage parses JSON and calls triggermethod")
+    void handleMessage_validJson_callsTriggermethod() throws Exception {
+        String json = "{\"controller_id\":\"CTRL_003\",\"fleet_id\":\"FLEET_003\",\"status\":\"running\"}";
+
+        when(sysStatusService.selectstatuscount("CTRL_003")).thenReturn(1);
+
+        mqttStatusConsumer.handleMessage("+/status", json);
+
+        verify(sysStatusService).selectstatuscount("CTRL_003");
+        verify(sysStatusService).updatestatus(
+            eq("CTRL_003"), eq("FLEET_003"), eq("running"), anyString()
+        );
+
+        verify(hashOperations).put("CTRL_003status:", "fleet_id", "FLEET_003");
+        verify(hashOperations).put("CTRL_003status:", "status", "running");
+    }
+
+    @Test
+    @DisplayName("handleMessage with invalid JSON throws exception")
+    void handleMessage_invalidJson_throwsException() {
+        String invalidJson = "not valid json";
+
+        assertThatThrownBy(() -> mqttStatusConsumer.handleMessage("+/status", invalidJson))
+            .isInstanceOf(Exception.class);
+    }
+
+    @Test
+    @DisplayName("triggermethod with null controller_id returns silently")
+    void triggermethod_nullControllerId_returnsSilently() throws Exception {
+        Map<String, Object> weather = new HashMap<>();
+        weather.put("controller_id", null);
+        weather.put("fleet_id", "FLEET_001");
+        weather.put("status", "online");
+
+        mqttStatusConsumer.triggermethod(weather);
+        verify(sysStatusService, never()).selectstatuscount(anyString());
+    }
+
+    @Test
+    @DisplayName("triggermethod with null fleet_id returns silently")
+    void triggermethod_nullFleetId_returnsSilently() throws Exception {
+        Map<String, Object> weather = new HashMap<>();
+        weather.put("controller_id", "CTRL_001");
+        weather.put("fleet_id", null);
+        weather.put("status", "online");
+
+        mqttStatusConsumer.triggermethod(weather);
+        verify(sysStatusService, never()).selectstatuscount(anyString());
+    }
+
+    @Test
+    @DisplayName("triggermethod with null status returns silently")
+    void triggermethod_nullStatus_returnsSilently() throws Exception {
+        Map<String, Object> weather = new HashMap<>();
+        weather.put("controller_id", "CTRL_001");
+        weather.put("fleet_id", "FLEET_001");
+        weather.put("status", null);
+
+        mqttStatusConsumer.triggermethod(weather);
+        verify(sysStatusService, never()).selectstatuscount(anyString());
+    }
+
+    @Test
+    @DisplayName("triggermethod with negative count calls insertsysstatus")
+    void triggermethod_negativeCount_callsInsertsysstatus() throws Exception {
+        Map<String, Object> weather = new HashMap<>();
+        weather.put("controller_id", "CTRL_004");
+        weather.put("fleet_id", "FLEET_004");
+        weather.put("status", "error");
+
+        when(sysStatusService.selectstatuscount("CTRL_004")).thenReturn(-1);
+
+        mqttStatusConsumer.triggermethod(weather);
+
+        verify(sysStatusService).insertsysstatus(
+            eq("CTRL_004"), eq("FLEET_004"), eq("error"), anyString()
+        );
+        verify(sysStatusService, never()).updatestatus(anyString(), anyString(), anyString(), anyString());
+    }
+}

iot-platform/src/test/java/com/iot/platform/service/TDengineServiceTest.java

@@ -0,0 +1,200 @@
+package com.iot.platform.service;
+
+import com.iot.platform.config.IotProperties;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+
+import java.lang.reflect.Method;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.*;
+import java.util.concurrent.ExecutorService;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class TDengineServiceTest {
+
+    @Mock
+    private IotProperties iotProperties;
+
+    @Mock
+    private ExecutorService executorService;
+
+    @Mock
+    private IotProperties.TDengine tdengineConfig;
+
+    @InjectMocks
+    private TDengineService tdengineService;
+
+    @BeforeEach
+    void setUp() {
+        when(iotProperties.getTdengine()).thenReturn(tdengineConfig);
+        when(tdengineConfig.getUrl()).thenReturn("jdbc:TAOS://localhost:6030/test");
+        when(tdengineConfig.getUsername()).thenReturn("root");
+        when(tdengineConfig.getPassword()).thenReturn("taosdata");
+    }
+
+    @Test
+    @DisplayName("escapeValue: 单引号应被转义")
+    void escapeValue_singleQuote_doublesIt() throws Exception {
+        Method method = TDengineService.class.getDeclaredMethod("escapeValue", String.class);
+        method.setAccessible(true);
+
+        assertThat(method.invoke(tdengineService, "it's")).isEqualTo("it''s");
+        assertThat(method.invoke(tdengineService, (String) null)).isEqualTo("");
+        assertThat(method.invoke(tdengineService, "normal")).isEqualTo("normal");
+    }
+
+    @Test
+    @DisplayName("wrapName: 应包裹反引号并去除原有反引号")
+    void wrapName_wrapsInBackticks() throws Exception {
+        Method method = TDengineService.class.getDeclaredMethod("wrapName", String.class);
+        method.setAccessible(true);
+
+        assertThat(method.invoke(tdengineService, "mytable")).isEqualTo("`mytable`");
+        assertThat(method.invoke(tdengineService, "`injected`")).isEqualTo("`injected`");
+        assertThat(method.invoke(tdengineService, (String) null)).isEqualTo("`unknown`");
+        assertThat(method.invoke(tdengineService, "")).isEqualTo("`unknown`");
+    }
+
+    @Test
+    @DisplayName("isValidFieldName: 只允许字母数字下划线")
+    void isValidFieldName_validatesPattern() throws Exception {
+        Method method = TDengineService.class.getDeclaredMethod("isValidFieldName", String.class);
+        method.setAccessible(true);
+
+        assertThat(method.invoke(tdengineService, "valid_name")).isEqualTo(true);
+        assertThat(method.invoke(tdengineService, "Valid123")).isEqualTo(true);
+        assertThat(method.invoke(tdengineService, "invalid-name")).isEqualTo(false);
+        assertThat(method.invoke(tdengineService, "invalid.name")).isEqualTo(false);
+        assertThat(method.invoke(tdengineService, (String) null)).isEqualTo(false);
+    }
+
+    @Test
+    @DisplayName("buildDynamicJson: 应排除 topic/ts/surfacename")
+    void buildDynamicJson_excludesReservedKeys() throws Exception {
+        Method method = TDengineService.class.getDeclaredMethod("buildDynamicJson", Map.class);
+        method.setAccessible(true);
+
+        Map<String, Object> data = new LinkedHashMap<>();
+        data.put("topic", "test/topic");
+        data.put("ts", "1234567890");
+        data.put("surfacename", "s1");
+        data.put("temperature", "25.5");
+        data.put("humidity", "60");
+
+        String result = (String) method.invoke(tdengineService, data);
+        assertThat(result).contains("temperature", "humidity");
+        assertThat(result).doesNotContain("topic", "ts", "surfacename");
+    }
+
+    @Test
+    @DisplayName("buildDynamicJson: 空值和空字符串应被过滤")
+    void buildDynamicJson_filtersEmptyValues() throws Exception {
+        Method method = TDengineService.class.getDeclaredMethod("buildDynamicJson", Map.class);
+        method.setAccessible(true);
+
+        Map<String, Object> data = new LinkedHashMap<>();
+        data.put("valid", "value");
+        data.put("empty", "");
+        data.put("nullVal", null);
+
+        String result = (String) method.invoke(tdengineService, data);
+        assertThat(result).contains("valid");
+        assertThat(result).doesNotContain("empty", "nullVal");
+    }
+
+    @Test
+    @DisplayName("buildDynamicJson: null 输入应返回空 JSON")
+    void buildDynamicJson_nullInput_returnsEmptyJson() throws Exception {
+        Method method = TDengineService.class.getDeclaredMethod("buildDynamicJson", Map.class);
+        method.setAccessible(true);
+
+        assertThat(method.invoke(tdengineService, (Map<String, Object>) null)).isEqualTo("{}");
+    }
+
+    @Test
+    @DisplayName("compressToBase64: 应压缩并返回非空字符串")
+    void compressToBase64_compressesData() throws Exception {
+        Method method = TDengineService.class.getDeclaredMethod("compressToBase64", String.class);
+        method.setAccessible(true);
+
+        String input = "{\"temperature\":25.5,\"humidity\":60}";
+        String result = (String) method.invoke(tdengineService, input);
+
+        assertThat(result).isNotEmpty();
+        assertThat(result).isNotEqualTo(input); // should be compressed
+    }
+
+    @Test
+    @DisplayName("compressToBase64: null 或空字符串应返回空")
+    void compressToBase64_nullOrEmpty_returnsEmpty() throws Exception {
+        Method method = TDengineService.class.getDeclaredMethod("compressToBase64", String.class);
+        method.setAccessible(true);
+
+        assertThat(method.invoke(tdengineService, (String) null)).isEqualTo("");
+        assertThat(method.invoke(tdengineService, "")).isEqualTo("");
+    }
+
+    @Test
+    @DisplayName("insertBatch: 空列表应直接返回不抛异常")
+    void insertBatch_emptyList_returnsWithoutError() throws Exception {
+        tdengineService.insertBatch("db", "table", Collections.emptyList());
+        tdengineService.insertBatch("db", "table", null);
+    }
+
+    @Test
+    @DisplayName("addToBatch: 应包装为单元素列表调用 insertBatch")
+    void addToBatch_wrapsSingleItem() {
+        Map<String, Object> data = new HashMap<>();
+        data.put("key", "value");
+
+        // addToBatch 现在声明 throws SQLException，尝试连接 TDengine 会失败
+        // 本地环境缺少 TDengine 驱动时会抛出各种异常（UnsatisfiedLinkError / NoClassDefFoundError / IllegalStateException）
+        assertThatThrownBy(() -> tdengineService.addToBatch("db", "table", data))
+                .isInstanceOf(Throwable.class);
+    }
+
+    @Test
+    @DisplayName("clearStableColumnCache: 应清空缓存不抛异常")
+    void clearStableColumnCache_clearsWithoutError() {
+        tdengineService.clearStableColumnCache();
+        // Should not throw
+    }
+
+    @Test
+    @DisplayName("close: 应关闭数据源不抛异常")
+    void close_closesDataSource() {
+        tdengineService.close();
+        // Should not throw even if dataSource is null
+    }
+
+    @Test
+    @DisplayName("closeConnection: null 连接应安全处理")
+    void closeConnection_nullConnection_safe() {
+        tdengineService.closeConnection(null);
+        // Should not throw
+    }
+
+    @Test
+    @DisplayName("getConnection: 数据源初始化失败时应抛异常")
+    void getConnection_initFails_throwsException() {
+        when(tdengineConfig.getUrl()).thenReturn("jdbc:TAOS://invalid:6030/test");
+
+        // 本地环境缺少 TDengine 驱动时会抛出 NoClassDefFoundError / UnsatisfiedLinkError
+        assertThatThrownBy(() -> tdengineService.getConnection())
+                .isInstanceOf(Throwable.class);
+    }
+}

iot-platform/src/test/java/com/iot/platform/task/VehicleSyncTaskTest.java

@@ -0,0 +1,221 @@
+package com.iot.platform.task;
+
+import com.iot.platform.config.IotProperties;
+import com.iot.platform.domain.SysCar;
+import com.iot.platform.domain.SysDevice;
+import com.iot.platform.service.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+import org.springframework.dao.DataAccessException;
+import org.springframework.data.redis.RedisConnectionFailureException;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+import org.springframework.web.client.RestClientException;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.*;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class VehicleSyncTaskTest {
+
+    @Mock
+    private SysCarService sysCarService;
+    @Mock
+    private SysDeviceService sysDeviceService;
+    @Mock
+    private StringRedisTemplate stringRedisTemplate;
+    @Mock
+    private SysrealtimeService sysrealtimeService;
+    @Mock
+    private SysDeviceVoService sysDeviceVoService;
+    @Mock
+    private SysDeviceControlService sysDeviceControlService;
+    @Mock
+    private SysWorkorderService sysWorkorderService;
+    @Mock
+    private SysIndicatorsService sysIndicatorsService;
+    @Mock
+    private SysCompanyService sysCompanyService;
+    @Mock
+    private RestTemplate restTemplate;
+    @Mock
+    private IotProperties iotProperties;
+    @Mock
+    private IotProperties.Mqtt mqttConfig;
+
+    @InjectMocks
+    private VehicleSyncTask task;
+
+    @Mock
+    private ValueOperations<String, String> valueOps;
+
+    @BeforeEach
+    void setUp() {
+        when(stringRedisTemplate.opsForValue()).thenReturn(valueOps);
+        when(iotProperties.getMqtt()).thenReturn(mqttConfig);
+        when(mqttConfig.getVehicleTriggerUrl()).thenReturn("https://esos-iot.com:9443/syscar/trigger");
+    }
+
+    @Test
+    @DisplayName("updateSysCar: 获取锁失败时应跳过执行")
+    void updateSysCar_lockFail_skipsExecution() {
+        when(valueOps.setIfAbsent(anyString(), eq("1"), anyLong(), any())).thenReturn(false);
+
+        task.updateSysCar();
+
+        verify(sysCarService, never()).selectcontrollerId();
+    }
+
+    @Test
+    @DisplayName("updateSysCar: 获取锁成功时应执行车辆位置更新")
+    void updateSysCar_lockSuccess_executesUpdate() {
+        when(valueOps.setIfAbsent(anyString(), eq("1"), anyLong(), any())).thenReturn(true);
+
+        SysCar car = new SysCar();
+        car.setCarId("1");
+        car.setControllerId("CTRL001");
+        when(sysCarService.selectcontrollerId()).thenReturn(Collections.singletonList(car));
+
+        SysDevice lat = new SysDevice();
+        lat.setV("31.2304");
+        SysDevice lon = new SysDevice();
+        lon.setV("121.4737");
+        when(sysDeviceService.selectsysdevice("CTRL001", "纬度")).thenReturn(lat);
+        when(sysDeviceService.selectsysdevice("CTRL001", "经度")).thenReturn(lon);
+
+        when(stringRedisTemplate.opsForHash()).thenReturn(mock(org.springframework.data.redis.core.HashOperations.class));
+        when(stringRedisTemplate.delete(anyString())).thenReturn(true);
+
+        task.updateSysCar();
+
+        verify(sysCarService).selectcontrollerId();
+    }
+
+    @Test
+    @DisplayName("updateSysCar: 单条记录异常时不应中断整个批次")
+    void updateSysCar_singleRecordException_continuesBatch() {
+        when(valueOps.setIfAbsent(anyString(), eq("1"), anyLong(), any())).thenReturn(true);
+
+        SysCar car1 = new SysCar();
+        car1.setCarId("1");
+        car1.setControllerId("CTRL001");
+        SysCar car2 = new SysCar();
+        car2.setCarId("2");
+        car2.setControllerId("CTRL002");
+        when(sysCarService.selectcontrollerId()).thenReturn(Arrays.asList(car1, car2));
+
+        // car1 正常
+        SysDevice lat1 = new SysDevice();
+        lat1.setV("31.2304");
+        SysDevice lon1 = new SysDevice();
+        lon1.setV("121.4737");
+        when(sysDeviceService.selectsysdevice("CTRL001", "纬度")).thenReturn(lat1);
+        when(sysDeviceService.selectsysdevice("CTRL001", "经度")).thenReturn(lon1);
+
+        // car2 抛异常
+        when(sysDeviceService.selectsysdevice("CTRL002", "纬度"))
+                .thenThrow(new DataAccessException("DB error") {});
+
+        when(stringRedisTemplate.opsForHash()).thenReturn(mock(org.springframework.data.redis.core.HashOperations.class));
+        when(stringRedisTemplate.delete(anyString())).thenReturn(true);
+
+        task.updateSysCar();
+
+        // car1 正常执行，car2 异常被捕获，两者都应该尝试
+        verify(sysDeviceService).selectsysdevice("CTRL001", "纬度");
+        verify(sysDeviceService).selectsysdevice("CTRL002", "纬度");
+    }
+
+    @Test
+    @DisplayName("insertDevice: Redis 连接失败时应跳过执行")
+    void insertDevice_redisConnectionFailure_skipsGracefully() {
+        when(valueOps.setIfAbsent(anyString(), eq("1"), anyLong(), any())).thenReturn(true);
+        when(stringRedisTemplate.opsForSet()).thenThrow(
+                new RedisConnectionFailureException("Redis down"));
+        when(stringRedisTemplate.delete(anyString())).thenReturn(true);
+
+        task.insertDevice();
+
+        verify(sysDeviceControlService, never()).selectdevice(anyString());
+    }
+
+    @Test
+    @DisplayName("insertDevice: 空数据时应直接返回")
+    void insertDevice_emptyData_returnsEarly() {
+        when(valueOps.setIfAbsent(anyString(), eq("1"), anyLong(), any())).thenReturn(true);
+
+        org.springframework.data.redis.core.SetOperations setOps = mock(org.springframework.data.redis.core.SetOperations.class);
+        when(stringRedisTemplate.opsForSet()).thenReturn(setOps);
+        when(setOps.members("DSB:active:devices")).thenReturn(Collections.emptySet());
+        when(stringRedisTemplate.delete(anyString())).thenReturn(true);
+
+        task.insertDevice();
+
+        verify(sysDeviceControlService, never()).selectdevice(anyString());
+    }
+
+    @Test
+    @DisplayName("syncRedisToMySQL: 空活跃 key 时应直接返回")
+    void syncRedisToMySQL_emptyKeys_returnsEarly() {
+        when(valueOps.setIfAbsent(anyString(), eq("1"), anyLong(), any())).thenReturn(true);
+
+        org.springframework.data.redis.core.SetOperations setOps = mock(org.springframework.data.redis.core.SetOperations.class);
+        when(stringRedisTemplate.opsForSet()).thenReturn(setOps);
+        when(setOps.members("DSB:active:devices")).thenReturn(null);
+        when(stringRedisTemplate.delete(anyString())).thenReturn(true);
+
+        task.syncRedisToMySQL();
+
+        verify(sysrealtimeService, never()).createrealtime(anyString());
+    }
+
+//    @Test
+//    @DisplayName("insertIndicators: 公司列表为空时不应抛异常")
+//    void insertIndicators_emptyCompanyList_noException() {
+//        when(valueOps.setIfAbsent(anyString(), eq("1"), anyLong(), any())).thenReturn(true);
+//        when(sysCompanyService.selectcompany()).thenReturn(Collections.emptyList());
+//        when(stringRedisTemplate.delete(anyString())).thenReturn(true);
+//
+//        task.insertIndicators();
+//
+//        verify(sysWorkorderService, never()).selectworkordercount(anyString(), anyString());
+//    }
+
+    @Test
+    @DisplayName("webhook 调用失败时不应中断主流程")
+    void updateCarPosition_webhookFailure_continues() {
+        when(valueOps.setIfAbsent(anyString(), eq("1"), anyLong(), any())).thenReturn(true);
+
+        SysCar car = new SysCar();
+        car.setCarId("1");
+        car.setControllerId("CTRL001");
+        when(sysCarService.selectcontrollerId()).thenReturn(Collections.singletonList(car));
+
+        SysDevice lat = new SysDevice();
+        lat.setV("31.2304");
+        SysDevice lon = new SysDevice();
+        lon.setV("121.4737");
+        when(sysDeviceService.selectsysdevice("CTRL001", "纬度")).thenReturn(lat);
+        when(sysDeviceService.selectsysdevice("CTRL001", "经度")).thenReturn(lon);
+
+        when(stringRedisTemplate.opsForHash()).thenReturn(mock(org.springframework.data.redis.core.HashOperations.class));
+        when(stringRedisTemplate.delete(anyString())).thenReturn(true);
+        when(restTemplate.postForObject(anyString(), isNull(), eq(String.class)))
+                .thenThrow(new RestClientException("Connection refused"));
+
+        // 不应抛异常
+        task.updateSysCar();
+    }
+}

pom.xml

@@ -20,16 +20,9 @@
         <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
         <spring-boot.version>2.5.15</spring-boot.version>
         <druid.version>1.2.23</druid.version>
-        <bitwalker.version>1.21</bitwalker.version>
-        <swagger.version>3.0.0</swagger.version>
-        <kaptcha.version>2.3.3</kaptcha.version>
         <pagehelper.boot.version>1.4.7</pagehelper.boot.version>
         <fastjson.version>2.0.57</fastjson.version>
-        <oshi.version>6.8.2</oshi.version>
         <commons.io.version>2.19.0</commons.io.version>
-        <poi.version>4.1.2</poi.version>
-        <velocity.version>2.3</velocity.version>
-        <jwt.version>0.9.1</jwt.version>
         <!-- override dependency version -->
         <tomcat.version>9.0.106</tomcat.version>
         <logback.version>1.2.13</logback.version>
@@ -107,13 +100,6 @@
                 <version>${druid.version}</version>
             </dependency>
 
-            <!-- 解析客户端操作系统、浏览器等 -->
-            <dependency>
-                <groupId>eu.bitwalker</groupId>
-                <artifactId>UserAgentUtils</artifactId>
-                <version>${bitwalker.version}</version>
-            </dependency>
-
             <!-- pagehelper 分页插件 -->
             <dependency>
                 <groupId>com.github.pagehelper</groupId>
@@ -121,26 +107,6 @@
                 <version>${pagehelper.boot.version}</version>
             </dependency>
 
-            <!-- 获取系统信息 -->
-            <dependency>
-                <groupId>com.github.oshi</groupId>
-                <artifactId>oshi-core</artifactId>
-                <version>${oshi.version}</version>
-            </dependency>
-
-            <!-- Swagger3依赖 -->
-            <dependency>
-                <groupId>io.springfox</groupId>
-                <artifactId>springfox-boot-starter</artifactId>
-                <version>${swagger.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>io.swagger</groupId>
-                        <artifactId>swagger-models</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
             <!-- io常用工具类 -->
             <dependency>
                 <groupId>commons-io</groupId>
@@ -148,42 +114,6 @@
                 <version>${commons.io.version}</version>
             </dependency>
 
-            <!-- excel工具 -->
-            <dependency>
-                <groupId>org.apache.poi</groupId>
-                <artifactId>poi-ooxml</artifactId>
-                <version>${poi.version}</version>
-            </dependency>
-
-            <!-- velocity代码生成使用模板 -->
-            <dependency>
-                <groupId>org.apache.velocity</groupId>
-                <artifactId>velocity-engine-core</artifactId>
-                <version>${velocity.version}</version>
-            </dependency>
-
-            <!-- 阿里JSON解析器 -->
-            <dependency>
-                <groupId>com.alibaba.fastjson2</groupId>
-                <artifactId>fastjson2</artifactId>
-                <version>${fastjson.version}</version>
-            </dependency>
-
-            <!-- Token生成与解析-->
-            <dependency>
-                <groupId>io.jsonwebtoken</groupId>
-                <artifactId>jjwt</artifactId>
-                <version>${jwt.version}</version>
-            </dependency>
-
-            <!-- 验证码 -->
-            <dependency>
-                <groupId>pro.fessional</groupId>
-                <artifactId>kaptcha</artifactId>
-                <version>${kaptcha.version}</version>
-            </dependency>
-
-
         </dependencies>
     </dependencyManagement>
 

ry.bat

@@ -1,67 +0,0 @@
-@echo off
-
-rem jar平级目录
-set AppName=ruoyi-admin.jar
-
-rem JVM参数
-set JVM_OPTS="-Dname=%AppName%  -Duser.timezone=Asia/Shanghai -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -XX:+PrintGCDateStamps  -XX:+PrintGCDetails -XX:NewRatio=1 -XX:SurvivorRatio=30 -XX:+UseParallelGC -XX:+UseParallelOldGC"
-
-
-ECHO.
-	ECHO.  [1] 启动%AppName%
-	ECHO.  [2] 关闭%AppName%
-	ECHO.  [3] 重启%AppName%
-	ECHO.  [4] 启动状态 %AppName%
-	ECHO.  [5] 退 出
-ECHO.
-
-ECHO.请输入选择项目的序号:
-set /p ID=
-	IF "%id%"=="1" GOTO start
-	IF "%id%"=="2" GOTO stop
-	IF "%id%"=="3" GOTO restart
-	IF "%id%"=="4" GOTO status
-	IF "%id%"=="5" EXIT
-PAUSE
-:start
-    for /f "usebackq tokens=1-2" %%a in (`jps -l ^| findstr %AppName%`) do (
-		set pid=%%a
-		set image_name=%%b
-	)
-	if  defined pid (
-		echo %%is running
-		PAUSE
-	)
-
-start javaw %JVM_OPTS% -jar %AppName%
-
-echo  starting……
-echo  Start %AppName% success...
-goto:eof
-
-rem 函数stop通过jps命令查找pid并结束进程
-:stop
-	for /f "usebackq tokens=1-2" %%a in (`jps -l ^| findstr %AppName%`) do (
-		set pid=%%a
-		set image_name=%%b
-	)
-	if not defined pid (echo process %AppName% does not exists) else (
-		echo prepare to kill %image_name%
-		echo start kill %pid% ...
-		rem 根据进程ID，kill进程
-		taskkill /f /pid %pid%
-	)
-goto:eof
-:restart
-	call :stop
-    call :start
-goto:eof
-:status
-	for /f "usebackq tokens=1-2" %%a in (`jps -l ^| findstr %AppName%`) do (
-		set pid=%%a
-		set image_name=%%b
-	)
-	if not defined pid (echo process %AppName% is dead ) else (
-		echo %image_name% is running
-	)
-goto:eof

ry.sh

@@ -1,86 +0,0 @@
-#!/bin/sh
-# ./ry.sh start 启动 stop 停止 restart 重启 status 状态
-AppName=ruoyi-admin.jar
-
-# JVM参数
-JVM_OPTS="-Dname=$AppName  -Duser.timezone=Asia/Shanghai -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -XX:+PrintGCDateStamps  -XX:+PrintGCDetails -XX:NewRatio=1 -XX:SurvivorRatio=30 -XX:+UseParallelGC -XX:+UseParallelOldGC"
-APP_HOME=`pwd`
-LOG_PATH=$APP_HOME/logs/$AppName.log
-
-if [ "$1" = "" ];
-then
-    echo -e "\033[0;31m 未输入操作名 \033[0m  \033[0;34m {start|stop|restart|status} \033[0m"
-    exit 1
-fi
-
-if [ "$AppName" = "" ];
-then
-    echo -e "\033[0;31m 未输入应用名 \033[0m"
-    exit 1
-fi
-
-function start()
-{
-    PID=`ps -ef |grep java|grep $AppName|grep -v grep|awk '{print $2}'`
-
-	if [ x"$PID" != x"" ]; then
-	    echo "$AppName is running..."
-	else
-		nohup java $JVM_OPTS -jar $AppName > /dev/null 2>&1 &
-		echo "Start $AppName success..."
-	fi
-}
-
-function stop()
-{
-    echo "Stop $AppName"
-
-	PID=""
-	query(){
-		PID=`ps -ef |grep java|grep $AppName|grep -v grep|awk '{print $2}'`
-	}
-
-	query
-	if [ x"$PID" != x"" ]; then
-		kill -TERM $PID
-		echo "$AppName (pid:$PID) exiting..."
-		while [ x"$PID" != x"" ]
-		do
-			sleep 1
-			query
-		done
-		echo "$AppName exited."
-	else
-		echo "$AppName already stopped."
-	fi
-}
-
-function restart()
-{
-    stop
-    sleep 2
-    start
-}
-
-function status()
-{
-    PID=`ps -ef |grep java|grep $AppName|grep -v grep|wc -l`
-    if [ $PID != 0 ];then
-        echo "$AppName is running..."
-    else
-        echo "$AppName is not running..."
-    fi
-}
-
-case $1 in
-    start)
-    start;;
-    stop)
-    stop;;
-    restart)
-    restart;;
-    status)
-    status;;
-    *)
-
-esac