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

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

@@ -70,18 +70,21 @@ public class MqttChargeStationConsumer extends AbstractDynamicMqttConsumer {
         }
 
         String dbName = topicParts[1];
+        String dbNamePrefix = dbName.substring(0, 2);
+        //先传输为deviceid，到后面进行优化
         String superTable = topicParts[3];
-        LocalDate date = LocalDate.now();
 //        String tableName = superTable + "_" + date.getYear() + String.format("%02d", date.getMonthValue());
-        String tableName = superTable + "_" + date.getYear() + String.format("%02d", date.getMonthValue());
+                           //deviceid_controllerid
+        String tableName = superTable + "_" +dbName;
 
         //拆分出数据库名称
+
         //拆分出对于看哪个的超级表的名称
 
         //字表名称公式
 
-        int i = ((int) "g".getBytes("UTF-8")[0]) % 10;
+//        int i = ((int) "g".getBytes("UTF-8")[0]) % 10;
 
-        tdengineService.insertBatch(dbName, superTable,tableName, batchToInsert);
+        tdengineService.insertBatch(dbNamePrefix, superTable,tableName, batchToInsert);
     }
-}
+}