fix(P0): 5项安全与稳定性修复

- MqttGenericConsumer: destroy/init → refreshMqttSubscription() 避免破坏Spring生命周期
- MqttGenericConsumer: 添加 topics/cmdtopics/faultprot 空值保护防止NPE
- MqttGenericConsumer: 合并3处重复 persist 调用到方法末尾
- VehicleSyncTask: 修复 coordinateMap.get 的NPE风险（先判空再equals）
- VehicleSyncTask: 修复逗号分隔逻辑错误（i > size-1 → i < size-1）
- MqttDynamicConsumer: 删除废弃的 shutdownExecutor 死代码

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

@@ -530,23 +530,6 @@ public class MqttDynamicConsumer {
         }
     }
 
-    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(">>> 服务正在关闭...");

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

@@ -10,6 +10,7 @@ import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Component;
 
 import java.text.SimpleDateFormat;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
@@ -55,15 +56,17 @@ public class MqttGenericConsumer extends AbstractMqttConsumer {
         String timestamp = weather.getTimestamp();
         String fleetId = weather.getFleet_id();
         String controllerId = weather.getController_id();
+
         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;
         for (topics topicsMap : topics) {
             Integer count = sysControllerService.selectsyscontrollercount(topicsMap.getPath());
             if (count <= 0) {
-                stringRedisTemplate.persist(controllerId);
                 stringRedisTemplate.opsForHash().put(controllerId + ":" + topicsMap.getName(), "path", topicsMap.getPath());
                 sysControllerService.insertsyscontroller(controllerId, timestamp, fleetId, topicsMap.getName(), topicsMap.getPath(), topicsMap.getPath().split("/")[1]);
                 controllercountcount++;
@@ -74,27 +77,28 @@ public class MqttGenericConsumer extends AbstractMqttConsumer {
             }
         }
 
-        Integer controllercountcmdcount = 0;
         for (topics cmdtopicsMap : cmdtopics) {
             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++;
             }
         }
 
-        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) {
+            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());
+            }
         }
 
+        // 统一 persist controllerId，确保其不会被过期删除
+        stringRedisTemplate.persist(controllerId);
+
         if (controllercountcount > 0) {
-            messageListenerService2.destroy();
-            messageListenerService2.initMqttConnection();
+            // TODO: 后续建议改为 Spring Event 解耦，避免直接调用其他 Bean 的方法
+            messageListenerService2.refreshMqttSubscription();
         }
     }
 }

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

@@ -94,7 +94,9 @@ public class VehicleSyncTask {
                 } 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())) {
+                        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);
@@ -193,7 +195,7 @@ 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(",");
                                 }
                             }
@@ -210,7 +212,7 @@ 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(",");
                                 }