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

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

@@ -110,6 +110,8 @@ public class MqttDynamicConsumer extends AbstractDynamicMqttConsumer {
         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);
     }
 

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

@@ -32,8 +32,8 @@ public class TdEngineService {
     private final Map<String, Set<String>> stableColumnCache = new ConcurrentHashMap<>();
     private static final int MAX_CACHE_SIZE = 1000;
 
-    // 允许的列名字符（仅 ASCII 字母、数字、下划线）
-    private static final String ALLOWED_COLUMNS = "^[a-zA-Z_][a-zA-Z0-9_]*$";
+    // 允许的列名字符（支持中文、ASCII字母、数字、下划线）
+    private static final String ALLOWED_COLUMNS = "^[a-zA-Z_一-龥][a-zA-Z0-9_一-龥]*$";
 
     // 允许的表名/数据库名字符（允许数字开头和连字符，如 UUID 格式的表名）
     private static final String ALLOWED_TABLE_NAME = "^[a-zA-Z0-9][a-zA-Z0-9_-]*$";
@@ -122,7 +122,7 @@ public class TdEngineService {
         if (name == null || name.isEmpty()) {
             return "`unknown`";
         }
-        return "`" + name.replace("`", "") + "`";
+        return "`" + name.replaceAll("`", "") + "`";
     }
 
     private boolean isValidFieldName(String name) {
@@ -133,6 +133,18 @@ public class TdEngineService {
         return name != null && name.matches(ALLOWED_TABLE_NAME);
     }
 
+    private boolean isNumeric(String str) {
+        if (str == null || str.isEmpty()) {
+            return false;
+        }
+        try {
+            Double.parseDouble(str);
+            return true;
+        } catch (NumberFormatException e) {
+            return false;
+        }
+    }
+
     // === 缓存工具方法 ===
     private String getStableKey(String dbName, String stableName) {
         return dbName + "." + stableName;
@@ -261,10 +273,13 @@ public class TdEngineService {
             for (Map.Entry<String, Object> entry : data.entrySet()) {
                 String key = entry.getKey();
                 if (isValidFieldName(key) && !isReservedColumn(key) && !columnTypes.containsKey(key)) {
-                    columnTypes.put(key, getValueType(entry.getValue()));
+                    // 统一使用 VARCHAR，避免类型推断导致的问题
+                    columnTypes.put(key, "VARCHAR");
                 }
             }
         }
+
+        log.debug("收集到的列: {} | 共 {} 列", columnTypes.keySet(), columnTypes.size());
         return columnTypes;
     }
 
@@ -305,7 +320,7 @@ public class TdEngineService {
         if (!hasData) {
             return null;
         }
-
+        log.info("生成的 INSERT SQL | 列类型: {} | SQL 前100字符: {}", columnTypes, sql.toString().substring(0, Math.min(100, sql.toString().length())));
         sql.setLength(sql.length() - 1);
         return sql.toString();
     }
@@ -329,7 +344,9 @@ public class TdEngineService {
             return;
         }
 
+        log.info("收集到的列类型: {}", columnTypes);
         Set<String> existingColumns = getStableColumns(dbName, superTableName);
+        log.info("超级表已有列: {}", existingColumns);
         // 计算实际新增列数（扣除已有列的交集）
         int newColumns = 0;
         for (String col : columnTypes.keySet()) {