test: 修复 mqy20260511 合并后的测试编译和运行时失败

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