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

deploy/README.md

@@ -31,9 +31,9 @@
 
 ## 容器架构
 
-| 容器 | 网络模式 | 端口映射 | 数据持久化 |
-|------|---------|---------|-----------|
-| `tdengine-operator` | host | 6031, 6041 | `/mnt/tdengine-operator/data` |
+| 容器 | 网络模式 | 端口 | 数据持久化 |
+|------|---------|------|-----------|
+| `tdengine-operator` | host | 6031 (taosd), 6041 (taosadapter) | `/mnt/tdengine-operator/data` |
 | `taos-explorer` | bridge | `127.0.0.1:6060->6060` | `/mnt/taos-explorer-data` |
 | `iot-platform` | bridge | `0.0.0.0:8887->8887` | `/mnt/iot-platform/logs` |
 
@@ -183,6 +183,62 @@ podman run -d \
     localhost/iot-platform:latest
 ```
 
+## TDengine 容器管理
+
+```bash
+# 查看所有 TDengine 相关容器
+podman ps | grep -E 'tdengine|taos'
+
+# 重启 tdengine-operator（taosd + taosadapter）
+podman restart tdengine-operator
+
+# 重启 taos-explorer
+podman restart taos-explorer
+
+# 查看 tdengine-operator 日志
+podman logs -f tdengine-operator
+
+# 查看 taos-explorer 日志
+podman logs -f taos-explorer
+
+# 验证 taosadapter REST API
+curl -s -u root:taosdata http://127.0.0.1:6041/rest/sql -X POST -d "SHOW DATABASES"
+```
+
+### 启动脚本位置
+
+| 脚本 | 用途 |
+|------|------|
+| `scripts/start-tdengine-operator.sh` | 启动 tdengine-operator（host 网络，taosd + taosadapter） |
+| `scripts/start-taos-explorer.sh` | 启动 taos-explorer（bridge 网络，REST API） |
+
+## 架构说明
+
+```
+┌─────────────────────────────────────────────┐
+│                    宿主机                     │
+│  ┌─────────────┐      ┌─────────────────┐   │
+│  │ nginx :6060 │─────▶│ taos-explorer   │   │
+│  └─────────────┘      │ (REST API)      │   │
+│                       └────────┬────────┘   │
+│                                │            │
+│  ┌─────────────────────────────┼────────┐   │
+│  │         iot-platform        │        │   │
+│  │         (bridge)            │        │   │
+│  └─────────────────────────────┘        │   │
+│                                         │   │
+│  ┌──────────────────────────────────────┘   │
+│  │  tdengine-operator (host网络)            │
+│  │  taosd :6031  +  taosadapter :6041       │
+│  └──────────────────────────────────────────┘
+└─────────────────────────────────────────────┘
+```
+
+- `tdengine-operator` 使用 **host 网络**，内部同时运行 `taosd`（6031）和 `taosadapter`（6041）
+- `taos-explorer` 通过 `host.containers.internal:6041` 使用 **REST API** 连接
+- `iot-platform` 通过 `host.containers.internal:6031` 使用 **native 协议** 连接
+- `taosadapter` 配置通过覆盖镜像 `entrypoint.sh` 读取 `/etc/taos/taosadapter.toml`
+
 ## 配置文件说明
 
 | 文件 | 说明 |
@@ -194,5 +250,7 @@ podman run -d \
 | `start-container.sh` | 容器内启动脚本（加载 .env） |
 | `iot-platform.service` | systemd 服务定义（已废弃，保留备用） |
 | `config/taos.cfg` | TDengine 服务端配置 |
-| `config/explorer.toml` | taos-explorer 配置 |
+| `config/entrypoint.sh` | 覆盖容器默认 entrypoint，使 taosadapter 读取配置文件 |
+| `config/explorer.toml` | taos-explorer 配置（REST API） |
+| `config/taosadapter.toml` | taosadapter 配置（禁用未使用插件） |
 | `config/tdengine-explorer.conf` | nginx 代理配置 |

deploy/config/entrypoint.sh

@@ -0,0 +1,164 @@
+#!/bin/bash
+set -ex
+# for TZ awareness
+if [ "$TZ" != "" ]; then
+    ln -sf /usr/share/zoneinfo/$TZ /etc/localtime
+    echo $TZ >/etc/timezone
+fi
+
+TAOS_ROOT_PASSWORD=${TAOS_ROOT_PASSWORD:-taosdata}
+export TAOS_KEEPER_TDENGINE_PASSWORD=${TAOS_ROOT_PASSWORD}
+
+INITDB_DIR=/docker-entrypoint-initdb.d/
+
+# option to disable taosadapter, default is no
+DISABLE_ADAPTER=${TAOS_DISABLE_ADAPTER:-0}
+unset TAOS_DISABLE_ADAPTER
+
+DISABLE_KEEPER=${TAOS_DISABLE_KEEPER:-0}
+unset TAOS_DISABLE_KEEPER
+
+DISABLE_EXPLORER=${TAOS_DISABLE_EXPLORER:-0}
+unset TAOS_DISABLE_EXPLORER
+
+# Get DATA_DIR from taosd -C
+DATA_DIR=$(taosd -C|grep -E 'dataDir\s+(\S+)' -o |head -n1|sed 's/dataDir *//')
+DATA_DIR=${DATA_DIR:-/var/lib/taos}
+
+# Get FQDN from taosd -C
+FQDN=$(taosd -C|grep -E 'fqdn\s+(\S+)' -o |head -n1|sed 's/fqdn *//')
+# ensure the fqdn is resolved as localhost
+grep "$FQDN" /etc/hosts >/dev/null || echo "127.0.0.1 $FQDN" >>/etc/hosts
+
+# Get first ep from taosd -C
+FIRSET_EP=$(taosd -C|grep -E 'firstEp\s+(\S+)' -o |head -n1|sed 's/firstEp *//')
+# parse first ep host and port
+FIRST_EP_HOST=${FIRSET_EP%:*}
+FIRST_EP_PORT=${FIRSET_EP#*:}
+
+# in case of custom server port
+SERVER_PORT=$(taosd -C|grep -E 'serverPort\s+(\S+)' -o |head -n1|sed 's/serverPort *//')
+SERVER_PORT=${SERVER_PORT:-6030}
+
+set +e
+ulimit -c unlimited
+# set core files pattern, maybe failed
+sysctl -w kernel.core_pattern=/corefile/core-$FQDN-%e-%p >/dev/null >&1
+set -e
+
+if [ $# -gt 0 ]; then
+    exec $@
+    exit 0
+fi
+
+NEEDS_INITDB=0
+
+# if dnode has been created or has mnode ep set or the host is first ep or not for cluster, just start.
+if [ -f "$DATA_DIR/dnode/dnode.json" ] ||
+    [ -f "$DATA_DIR/dnode/mnodeEpSet.json" ] ||
+    [ "$FQDN" = "$FIRST_EP_HOST" ]; then
+    echo "start taosd with mnode ep set"
+    taosd &
+    while true; do
+        es=$(taos -h $FIRST_EP_HOST -P $FIRST_EP_PORT --check | grep "^[0-9]*:")
+        echo ${es}
+        if [ "${es%%:*}" -eq 2 ]; then
+
+            # Initialization scripts should only work in first node.
+            if [ "$FQDN" = "$FIRST_EP_HOST" ]; then
+                if [ ! -f "${DATA_DIR}/.docker-entrypoint-root-password-changed" ]; then
+                    if [ "$TAOS_ROOT_PASSWORD" != "taosdata" ]; then
+                        # change default root password
+                        taos -s "ALTER USER root PASS '$TAOS_ROOT_PASSWORD'"
+                        touch "${DATA_DIR}/.docker-entrypoint-root-password-changed"
+                    fi
+                fi
+                # Initialization scripts should only work in first node.
+                if [ ! -f "${DATA_DIR}/.docker-entrypoint-inited" ]; then
+                    NEEDS_INITDB=1
+                fi
+            fi
+
+            break
+        fi
+        sleep 1s
+    done
+# others will first wait the first ep ready.
+else
+    if [ "$TAOS_FIRST_EP" = "" ]; then
+        echo "run TDengine with single node."
+        taosd &
+    fi
+    while true; do
+        es=$(taos -h $FIRST_EP_HOST -P $FIRST_EP_PORT --check | grep "^[0-9]*:")
+        echo ${es}
+        if [ "${es%%:*}" -eq 2 ]; then
+            echo "execute create dnode"
+            sh -c "taos -p'$TAOS_ROOT_PASSWORD' -h $FIRST_EP_HOST -P $FIRST_EP_PORT -s 'create dnode \"$FQDN:$SERVER_PORT\";'"
+            break
+        fi
+        sleep 1s
+    done
+    if ps aux | grep -v grep | grep taosd > dev/null; then
+        echo "TDengine is running"
+      else
+        taosd &
+    fi
+fi
+
+if [ "$DISABLE_ADAPTER" = "0" ]; then
+    which taosadapter >/dev/null && taosadapter -c /etc/taos/taosadapter.toml &
+    # wait for 6041 port ready
+    for _ in $(seq 1 20); do
+        nc -z localhost 6041 && break
+        sleep 0.5
+    done
+fi
+
+if [ "$DISABLE_KEEPER" = "0" ]; then
+    sleep 3
+    which taoskeeper >/dev/null && taoskeeper &
+    # wait for 6043 port ready
+    for _ in $(seq 1 20); do
+        nc -z localhost 6043 && break
+        sleep 0.5
+    done
+fi
+
+if [ "$DISABLE_EXPLORER" = "0" ]; then
+    which taos-explorer >/dev/null && taos-explorer &
+    # wait for 6060 port ready
+    for _ in $(seq 1 20); do
+        nc -z localhost 6060 && break
+        sleep 0.5
+    done
+fi
+
+if [ "$NEEDS_INITDB" = "1" ]; then
+    # check if initdb.d exists
+    if [ -d "${INITDB_DIR}" ]; then
+        # execute initdb scripts in sql
+        for FILE in "$INITDB_DIR"*.sql; do
+            echo "Initialize db with file $FILE"
+            MAX_RETRIES=5
+            RETRY_COUNT=0
+            SUCCESS=0
+            while [ $RETRY_COUNT -lt $MAX_RETRIES ] && [ "$SUCCESS" = "0" ]; do
+                set -x
+                OUTPUT=$(sh -c "taos -f $FILE -p'$TAOS_ROOT_PASSWORD'")
+                set +x
+                echo $OUTPUT
+                if [[ "$OUTPUT" =~ "DB error" ]]; then
+                    echo "Retrying in 2 seconds..."
+                    sleep 2
+                else
+                    SUCCESS=1
+                fi
+            done
+        done
+    fi
+
+    touch "${DATA_DIR}/.docker-entrypoint-inited"
+fi
+
+while true; do sleep 1000; done

deploy/config/explorer.toml

@@ -32,17 +32,19 @@ log_level = "info"
 
 # REST API endpoint to connect to the cluster.
 # This configuration is also the target for data migration tasks.
-# 
+#
 # Default is "http://localhost:6041" - the default endpoint for REST API.
+# Note: taos-explorer requires REST API for registration/login.
+# Use host.containers.internal for bridge network containers to reach host network services.
 #
-cluster = "http://172.21.185.173:6041"
+cluster = "http://host.containers.internal:6041"
 
 # native endpoint to connect to the cluster.
-# Default is disabled. To enable it, set it to the native API URL like "taos://localhost:6030" and uncomment it.
-# If you enable it, you will get more performance for data migration tasks.
-# If modify this config item, you must relogin to clear the cache in browser local storage.
+# Default is disabled. Native connection from bridge network to host network
+# does not work due to TDengine FQDN reconnection mechanism (epset contains 127.0.0.1).
+# Keep disabled; REST API is sufficient.
 #
-# cluster_native = "taos://localhost:6030"
+# cluster_native = "taos://host.containers.internal:6031"
 
 # API endpoint for data replication/backup/data sources. No default option.
 #   Set it to API URL like "http://localhost:6050".

deploy/config/taosadapter.toml

@@ -0,0 +1,40 @@
+# taosAdapter configuration (runs inside tdengine-operator container)
+# Mounted to /etc/taos/taosadapter.toml
+
+debug = false
+port = 6041
+logLevel = "info"
+
+[cors]
+allowAllOrigins = true
+
+[log]
+rotationCount = 30
+rotationTime = "24h"
+rotationSize = "1GB"
+
+# Disable keeper upload (keeper is not running)
+[uploadKeeper]
+enable = false
+
+# Disable unused plugins
+[opentsdb]
+enable = false
+
+[influxdb]
+enable = false
+
+[statsd]
+enable = false
+
+[collectd]
+enable = false
+
+[opentsdb_telnet]
+enable = false
+
+[node_exporter]
+enable = false
+
+[prometheus]
+enable = false

deploy/scripts/start-taos-explorer.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+# Start taos-explorer container
+# Uses REST API (taosAdapter) via host.containers.internal
+# TDengine native connection from bridge network does not work due to FQDN mechanism
+#
+# Data mount note: TDengine image defines VOLUME /var/lib/taos which creates
+# an anonymous volume that overrides child bind mounts. We mount the parent
+# directory here; actual explorer data lives in DATA_DIR/explorer/ subdirectory.
+
+set -e
+
+CONTAINER_NAME="taos-explorer"
+IMAGE="docker.io/tdengine/tdengine:3.3.6.13"
+DATA_DIR="/mnt/taos-explorer-data"
+CFG_FILE="/mnt/iot-platform/config/explorer.toml"
+REGISTER_FILE="/mnt/iot-platform/config/explorer-register.cfg"
+
+echo "Starting ${CONTAINER_NAME}..."
+
+# Stop and remove existing container if present
+podman rm -f "${CONTAINER_NAME}" 2>/dev/null || true
+
+podman run -d \
+    --name "${CONTAINER_NAME}" \
+    --network bridge \
+    --restart unless-stopped \
+    -p 127.0.0.1:6060:6060 \
+    -v "${DATA_DIR}:/var/lib/taos" \
+    -v "${CFG_FILE}:/etc/taos/explorer.toml:ro" \
+    -v "${REGISTER_FILE}:/etc/taos/explorer-register.cfg" \
+    -e EXPLORER_SKIP_REGISTER=true \
+    "${IMAGE}" \
+    taos-explorer
+
+echo "${CONTAINER_NAME} started."
+echo "Port: 127.0.0.1:6060 (nginx proxy)"
+echo "Connection: REST API via host.containers.internal:6041"

deploy/scripts/start-tdengine-operator.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+# Start tdengine-operator container (taosd + taosadapter)
+# Data directory: /mnt/tdengine-operator/data
+# Network: host (required for TDengine FQDN mechanism)
+# taosadapter runs inside this container, listening on host port 6041
+# taoskeeper and taos-explorer are disabled (deployed separately)
+# Note: entrypoint.sh is overridden to add `-c /etc/taos/taosadapter.toml`
+#       because the upstream image starts taosadapter without config flag.
+
+set -e
+
+CONTAINER_NAME="tdengine-operator"
+IMAGE="docker.io/tdengine/tdengine:3.3.6.13"
+DATA_DIR="/mnt/tdengine-operator/data"
+LOG_DIR="/mnt/tdengine-operator/log"
+CFG_FILE="/mnt/tdengine-operator/taos.cfg"
+ADAPTER_CFG="/mnt/iot-platform/config/taosadapter.toml"
+ENTRYPOINT_FILE="/mnt/iot-platform/config/entrypoint.sh"
+
+echo "Starting ${CONTAINER_NAME}..."
+
+# Stop and remove existing container if present
+podman rm -f "${CONTAINER_NAME}" 2>/dev/null || true
+
+podman run -d \
+    --name "${CONTAINER_NAME}" \
+    --network host \
+    --restart unless-stopped \
+    -e TAOS_DISABLE_KEEPER=1 \
+    -e TAOS_DISABLE_EXPLORER=1 \
+    -v "${DATA_DIR}:/var/lib/taos" \
+    -v "${LOG_DIR}:/var/log/taos" \
+    -v "${CFG_FILE}:/etc/taos/taos.cfg:ro" \
+    -v "${ADAPTER_CFG}:/etc/taos/taosadapter.toml:ro" \
+    -v "${ENTRYPOINT_FILE}:/usr/bin/entrypoint.sh:ro" \
+    "${IMAGE}"
+
+echo "${CONTAINER_NAME} started."
+echo "Ports: 6031 (taosd native), 6041 (taosadapter REST API)"

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

@@ -115,7 +115,7 @@ public class IotProperties {
      * TDengine配置
      */
     public static class TDengine {
-        private String url = "jdbc:TAOS://172.21.185.173:6031/";
+        private String url = "jdbc:TAOS://host.containers.internal:6031/";
         private String username = "";
         private String password = "";
 

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

@@ -70,7 +70,8 @@ public class MqttChargeStationConsumer extends AbstractDynamicMqttConsumer {
         }
 
         String dbName = topicParts[1];
-        String dbNamePrefix = "pe_iot_"+dbName.substring(0, 2);
+        String dbPrefix = dbName.length() >= 2 ? dbName.substring(0, 2) : dbName;
+        String dbNamePrefix = "pe_iot_" + dbPrefix;
         //先传输为deviceid，到后面进行优化
         String superTable = topicParts[3];
 //        String tableName = superTable + "_" + date.getYear() + String.format("%02d", date.getMonthValue());

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

@@ -105,7 +105,8 @@ public class MqttDynamicConsumer extends AbstractDynamicMqttConsumer {
         data.put("device_id", ctx.deviceId);
         List<Map<String, Object>> batch = Collections.singletonList(data);
 
-        String dbNamePrefix = "pe_iot_"+ctx.controllerId.substring(0, 2);
+        String controllerPrefix = ctx.controllerId.length() >= 2 ? ctx.controllerId.substring(0, 2) : ctx.controllerId;
+        String dbNamePrefix = "pe_iot_" + controllerPrefix;
         String controllerId = ctx.controllerId;
         tdengineService.insertBatch(dbNamePrefix, ctx.deviceId, controllerId, batch);
     }

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

@@ -77,15 +77,21 @@ public class VehicleSyncTask {
                 }
 
                 // redisKey 格式: pe_iot_<controllerId>_<deviceId>
-                // 从右往左取，避免 id 本身含下划线的问题
-                String[] parts = redisKey.split("_");
-                if (parts.length < 3) {
+                String prefix = "pe_iot_";
+                if (!redisKey.startsWith(prefix) || redisKey.length() <= prefix.length()) {
                     log.warn("跳过非法 redis key: {}", redisKey);
                     continue;
                 }
-                String controllerId = parts[parts.length - 2];
-                String deviceId = parts[parts.length - 1];
-                String tableName = "pe_iot_" + controllerId.substring(0, 2);
+                String remainder = redisKey.substring(prefix.length());
+                int lastUnderscore = remainder.lastIndexOf('_');
+                if (lastUnderscore <= 0 || lastUnderscore == remainder.length() - 1) {
+                    log.warn("跳过非法 redis key: {}", redisKey);
+                    continue;
+                }
+                String controllerId = remainder.substring(0, lastUnderscore);
+                String deviceId = remainder.substring(lastUnderscore + 1);
+                String dbPrefix = controllerId.length() >= 2 ? controllerId.substring(0, 2) : controllerId;
+                String tableName = "pe_iot_" + dbPrefix;
 
                 try {
                     sysrealtimeService.createRealtime(tableName);

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

@@ -70,6 +70,6 @@ iot:
     password: ${MQTT_PASSWORD:}
     charge-station-topic: ${MQTT_CHARGE_STATION_TOPIC:station/ChargeStation/device/+/post/json}
   tdengine:
-    url: jdbc:TAOS://172.21.185.173:6031/
+    url: jdbc:TAOS://host.containers.internal:6031/
     username: ${TDENGINE_USERNAME:}
     password: ${TDENGINE_PASSWORD:}

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

@@ -96,12 +96,9 @@ class MqttChargeStationConsumerTest {
         List<Map<String, Object>> dataList = Collections.singletonList(data1);
         String topic = "prefix/myDb/suffix/mySuperTable/extra";
 
-        LocalDate now = LocalDate.now();
-        String expectedTable = "mySuperTable_" + now.getYear() + String.format("%02d", now.getMonthValue());
-
         method.invoke(consumer, dataList, topic);
 
-        verify(tdengineService).insertBatch(eq("myDb"), "mySuperTable_",eq(expectedTable), anyList());
+        verify(tdengineService).insertBatch(eq("pe_iot_my"), eq("mySuperTable"), eq("myDb"), anyList());
     }
 
     @Test
@@ -113,7 +110,7 @@ class MqttChargeStationConsumerTest {
 
         method.invoke(consumer, Collections.emptyList(), "prefix/db/suffix/table/extra");
 
-        verify(tdengineService, never()).insertBatch(anyString(), "mySuperTable_",anyString(), anyList());
+        verify(tdengineService, never()).insertBatch(anyString(), anyString(), anyString(), anyList());
     }
 
     @Test
@@ -146,11 +143,9 @@ class MqttChargeStationConsumerTest {
         dataList.add(valid);
 
         String topic = "prefix/myDb/suffix/mySuperTable/extra";
-        LocalDate now = LocalDate.now();
-        String expectedTable = "mySuperTable_" + now.getYear() + String.format("%02d", now.getMonthValue());
 
         method.invoke(consumer, dataList, topic);
 
-        verify(tdengineService).insertBatch(eq("myDb"), "mySuperTable_",eq(expectedTable), argThat(list -> list.size() == 1));
+        verify(tdengineService).insertBatch(eq("pe_iot_my"), eq("mySuperTable"), eq("myDb"), argThat(list -> list.size() == 1));
     }
 }

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

@@ -54,7 +54,7 @@ class SysRealtimeServiceTest {
     @Test
     @DisplayName("insertTables: 非法表名应抛出异常且不调用 mapper")
     void inserttables_invalidTableName_throwsWithoutCallingMapper() {
-        assertThatThrownBy(() -> service.insertTables("bad;name", "2024-01-01", "D1", "ts", "k", "v"))
+        assertThatThrownBy(() -> service.insertTables("bad;name", "2024-01-01", "C1", "D1", "ts", "k", "v"))
             .isInstanceOf(IllegalArgumentException.class);
         verifyNoInteractions(sysRealtimeMapper);
     }
@@ -62,14 +62,14 @@ class SysRealtimeServiceTest {
     @Test
     @DisplayName("updateTables: 合法表名应调用 mapper")
     void updatetables_validTableName_callsMapper() {
-        service.updateTables("dev_001", "2024-01-01", "v1", "ts", "key1", "D1");
-        verify(sysRealtimeMapper).updateTables("dev_001", "2024-01-01", "v1", "ts", "key1", "D1");
+        service.updateTables("dev_001", "2024-01-01", "v1", "ts", "key1", "C1", "D1");
+        verify(sysRealtimeMapper).updateTables("dev_001", "2024-01-01", "v1", "ts", "key1", "C1", "D1");
     }
 
     @Test
     @DisplayName("selectKey: 非法表名应抛出异常")
     void selectkey_invalidTableName_throws() {
-        assertThatThrownBy(() -> service.selectKey("--comment", "k"))
+        assertThatThrownBy(() -> service.selectKey("--comment", "k", "C1"))
             .isInstanceOf(IllegalArgumentException.class)
             .hasMessageContaining("非法表名");
     }
@@ -77,7 +77,7 @@ class SysRealtimeServiceTest {
     @Test
     @DisplayName("selectAllKeys: 合法表名应调用 mapper")
     void selectAllKeys_validTableName_callsMapper() {
-        service.selectAllKeys("realtime_001");
-        verify(sysRealtimeMapper).selectAllKeys("realtime_001");
+        service.selectAllKeys("realtime_001", "C1");
+        verify(sysRealtimeMapper).selectAllKeys("realtime_001", "C1");
     }
 }

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

@@ -185,22 +185,23 @@ class TDengineServiceTest {
     @Test
     @DisplayName("getColumnTypeForDDL: BOOL/BIGINT/DOUBLE/TIMESTAMP 直接返回")
     void getColumnTypeForDDL_directTypes() throws Exception {
-        Method method = TdEngineService.class.getDeclaredMethod("getColumnTypeForDDL", String.class, String.class);
+        Method method = TdEngineService.class.getDeclaredMethod("getColumnTypeForDDL", String.class, Integer.class);
         method.setAccessible(true);
 
-        assertThat(method.invoke(tdengineService, "BOOL", "col")).isEqualTo("BOOL");
-        assertThat(method.invoke(tdengineService, "BIGINT", "col")).isEqualTo("BIGINT");
-        assertThat(method.invoke(tdengineService, "DOUBLE", "col")).isEqualTo("DOUBLE");
-        assertThat(method.invoke(tdengineService, "TIMESTAMP", "col")).isEqualTo("TIMESTAMP");
+        assertThat(method.invoke(tdengineService, "BOOL", null)).isEqualTo("BOOL");
+        assertThat(method.invoke(tdengineService, "BIGINT", null)).isEqualTo("BIGINT");
+        assertThat(method.invoke(tdengineService, "DOUBLE", null)).isEqualTo("DOUBLE");
+        assertThat(method.invoke(tdengineService, "TIMESTAMP", null)).isEqualTo("TIMESTAMP");
     }
 
     @Test
-    @DisplayName("getColumnTypeForDDL: VARCHAR 返回 VARCHAR(255)")
+    @DisplayName("getColumnTypeForDDL: VARCHAR 返回带长度")
     void getColumnTypeForDDL_varchar_returnsWithLength() throws Exception {
-        Method method = TdEngineService.class.getDeclaredMethod("getColumnTypeForDDL", String.class, String.class);
+        Method method = TdEngineService.class.getDeclaredMethod("getColumnTypeForDDL", String.class, Integer.class);
         method.setAccessible(true);
 
-        assertThat(method.invoke(tdengineService, "VARCHAR", "col")).isEqualTo("VARCHAR(255)");
+        assertThat(method.invoke(tdengineService, "VARCHAR", 250)).isEqualTo("VARCHAR(255)");
+        assertThat(method.invoke(tdengineService, "VARCHAR", null)).isEqualTo("VARCHAR(16)");
     }
 
     @Test
@@ -241,14 +242,14 @@ class TDengineServiceTest {
     }
 
     @Test
-    @DisplayName("formatValue: VARCHAR 类型超长时截断存储")
-    void formatValue_varchar_exceedsLength_truncates() throws Exception {
+    @DisplayName("formatValue: VARCHAR 类型不截断，完整返回")
+    void formatValue_varchar_noTruncation() throws Exception {
         Method method = TdEngineService.class.getDeclaredMethod("formatValue", Object.class, String.class, String.class);
         method.setAccessible(true);
 
         String longStr = "a".repeat(300);
         assertThat(method.invoke(tdengineService, longStr, "col", "VARCHAR"))
-                .isEqualTo("'" + "a".repeat(255) + "'");
+                .isEqualTo("'" + "a".repeat(300) + "'");
     }
 
     @Test
@@ -281,15 +282,15 @@ class TDengineServiceTest {
     }
 
     @Test
-    @DisplayName("isReservedColumn: ts 和 surfacename 返回 true")
+    @DisplayName("isReservedColumn: ts 和 controller_id 返回 true")
     void isReservedColumn_reservedNames() throws Exception {
         Method method = TdEngineService.class.getDeclaredMethod("isReservedColumn", String.class);
         method.setAccessible(true);
 
         assertThat(method.invoke(tdengineService, "ts")).isEqualTo(true);
         assertThat(method.invoke(tdengineService, "TS")).isEqualTo(true);
-        assertThat(method.invoke(tdengineService, "surfacename")).isEqualTo(true);
-        assertThat(method.invoke(tdengineService, "Surfacename")).isEqualTo(true);
+        assertThat(method.invoke(tdengineService, "controller_id")).isEqualTo(true);
+        assertThat(method.invoke(tdengineService, "CONTROLLER_ID")).isEqualTo(true);
     }
 
     @Test