Merge branch 'mqy20260511' of http://114.215.146.132:3000/Mqy/Wisdom-Data into mqy20260511

 Conflicts:

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

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

@@ -70,13 +70,13 @@ public class MqttChargeStationConsumer extends AbstractDynamicMqttConsumer {
         }
 
         String dbName = topicParts[1];
-        String dbNamePrefix = dbName.substring(0, 2);
+        String dbNamePrefix = "pe_iot_"+dbName.substring(0, 2);
         //先传输为deviceid，到后面进行优化
         String superTable = topicParts[3];
 //        String tableName = superTable + "_" + date.getYear() + String.format("%02d", date.getMonthValue());
                            //deviceid_controllerid
-        String tableName = superTable + "_" +dbName;
-
+        String tableName = dbName;
+//        superTable + "_" +
 //        int i = ((int) "g".getBytes("UTF-8")[0]) % 10;
 
         tdengineService.insertBatch(dbNamePrefix, superTable,tableName, batchToInsert);

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

@@ -104,15 +104,11 @@ public class MqttDynamicConsumer extends AbstractDynamicMqttConsumer {
         data.put("createTime", ctx.currentTime);
         data.put("timestamp", ctx.timestamp);
         data.put("device_id", ctx.deviceId);
-
-        LocalDate date = LocalDate.now();
-        String tableName = ctx.superTable + "_" + date.getYear() + String.format("%02d", date.getMonthValue());
-
         List<Map<String, Object>> batch = Collections.singletonList(data);
 
-
-//        log.info("数据：({})",batch);
-        tdengineService.insertBatch(ctx.dbName, ctx.superTable,tableName, batch);
+        String dbNamePrefix = "pe_iot_"+ctx.dbName.substring(0, 2);
+        String tableName = ctx.dbName;
+        tdengineService.insertBatch(dbNamePrefix, ctx.superTable,tableName, batch);
     }
 
     private void writeToRedis(MessageContext ctx) {

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

@@ -288,7 +288,7 @@ public class TdEngineService {
     /**
      * 根据列 key 首字符的 UTF-8 值拆分到多个超级表
      */
-    private void splitAndInsertToMultipleStables(String dbName, String baseSuperTable, String baseTable,
+    private void splitAndInsertToMultipleStables(String dbName, String stableName, String tableName,
                                                  List<Map<String, Object>> dataList,
                                                  Map<String, String> columnTypes) throws SQLException {
         // 按首字符 UTF-8 值分组
@@ -303,8 +303,9 @@ public class TdEngineService {
         // 每个分组作为一个超级表，处理其对应的列和数据
         for (Map.Entry<Integer, Map<String, String>> group : groupColumnTypes.entrySet()) {
             int groupId = group.getKey();
-            String stableName = "device_" + groupId;
-            String tableName = baseTable + "_" + groupId;
+            // 超级表名 = superTableName + groupId (例如 charge + 3 = charge3)
+            String newStableName = stableName+"_"+groupId;
+            String newTableName = stableName+"_"+groupId+"_"+tableName;
 
             // 筛选出该组列的数据
             List<Map<String, Object>> filteredData = filterDataByColumnGroup(dataList, group.getValue().keySet());
@@ -313,10 +314,10 @@ public class TdEngineService {
             int batchSize = DEFAULT_BATCH_SIZE;
             for (int i = 0; i < filteredData.size(); i += batchSize) {
                 List<Map<String, Object>> batch = filteredData.subList(i, Math.min(i + batchSize, filteredData.size()));
-                insertBatchInternal(dbName, stableName, tableName, batch);
+                insertBatchInternal(dbName, newStableName, newTableName, batch);
             }
             log.info("分组插入完成: stable={}, table={}, 列数={}, 数据条数={}",
-                    stableName, tableName, group.getValue().size(), filteredData.size());
+                    newStableName, newTableName, group.getValue().size(), filteredData.size());
         }
     }
 
@@ -329,7 +330,7 @@ public class TdEngineService {
         }
         String firstChar = columnName.substring(0, 1);
         byte[] bytes = firstChar.getBytes(java.nio.charset.StandardCharsets.UTF_8);
-        return (int) bytes[0] % 10;
+        return (bytes[0] & 0xFF) % 10;
     }
 
     /**