Merge remote-tracking branch 'origin/master' into mqy20260511

CLAUDE.md

@@ -55,7 +55,7 @@ iot-platform/
 ### TDengine (Time-Series Database)
 - Used for high-frequency IoT telemetry ingestion
 - Connection pool: HikariCP via `TDengineService`
-- Connects to `jdbc:TAOS://localhost:6030/`
+- Connects to `jdbc:TAOS://127.0.0.1:6031/`
 - Super-table pattern with column caching (`stableColumnCache`)
 
 ### Redis
@@ -71,7 +71,7 @@ iot-platform/
 - `iot-platform/src/main/resources/application.yml` — Main config (port 8887, Redis, MyBatis, Actuator)
 - `iot-platform/src/main/resources/application-druid.yml` — Database connection (Druid pool, master/slave)
 - `iot-platform/src/main/resources/logback-spring.xml` — Logging config with rolling
-- `.env` — Environment variables (passwords, credentials) loaded by systemd or start.sh
+- `.env` — Environment variables (passwords, credentials) loaded by start-container.sh
 
 ## Environment Variables
 
@@ -134,18 +134,18 @@ Implementations:
 
 ## Deployment
 
-Production deployment uses systemd on online180 (47.104.204.180).
+Production deployment uses Podman containers on online180 (47.104.204.180).
 
 ```bash
 # Deploy from local
 cd deploy
-./deploy.sh --build          # Build and deploy
+./deploy.sh --build          # Build, build image, and deploy
 ./deploy.sh --jar <path>     # Deploy specific jar
 
-# Server management
-systemctl status iot-platform
-systemctl restart iot-platform
-journalctl -u iot-platform -f
+# Container management
+podman ps | grep iot-platform
+podman logs -f iot-platform
+podman restart iot-platform
 ```
 
 See `deploy/README.md` for full deployment documentation.

deploy/README.md

@@ -2,42 +2,53 @@
 
 ## 概述
 
-本项目使用 systemd 管理进程，通过 `deploy.sh` 脚本实现一键构建、上传、备份、健康检查和自动回滚。
+本项目使用 Podman 容器化部署，通过 `deploy.sh` 脚本实现一键构建、上传、构建镜像、健康检查和自动回滚。
 
 ## 服务器环境
 
 - **服务器**: online180 (47.104.204.180)
 - **OS**: Alibaba Cloud Linux 3
-- **Java**: OpenJDK 1.8.0_412
+- **容器运行时**: Podman 4.9.4 (docker 兼容)
+- **Java**: OpenJDK 1.8 (容器内)
 - **安装目录**: `/opt/iot-platform/`
-- **服务名称**: `iot-platform`
+- **容器名称**: `iot-platform`
 
 ## 目录结构
 
 ```
 /opt/iot-platform/
 ├── iot-platform.jar          # 当前运行版本
+├── Dockerfile                # 容器镜像构建定义
+├── start-container.sh        # 容器启动脚本（加载 .env）
 ├── .env                      # 环境变量（密码、凭据）
 ├── backup/                   # 版本备份（自动创建）
 ├── bin/
 │   ├── deploy.sh             # 一键部署脚本（本地运行）
 │   └── health-check.sh       # 健康检查脚本
 ├── config/                   # 线上专属配置
-└── logs/                     # 日志输出
+└── logs/                     # 日志输出（宿主机挂载）
 ```
 
 ## 快速开始
 
 ### 首次部署（服务器初始化）
 
-如果服务器上还没有安装 systemd 服务，执行初始化：
+确保服务器上已有 `/opt/iot-platform/` 目录，并包含 `Dockerfile`、`.env`、`start-container.sh`：
+
+```bash
+# 从本地同步必要文件到服务器
+scp deploy/setup-server.sh root@47.104.204.180:/opt/iot-platform/
+scp .env root@47.104.204.180:/opt/iot-platform/
+scp Dockerfile root@47.104.204.180:/opt/iot-platform/
+scp start-container.sh root@47.104.204.180:/opt/iot-platform/
+ssh root@47.104.204.180 "chmod +x /opt/iot-platform/start-container.sh"
+```
+
+然后执行首次部署：
 
 ```bash
 cd deploy
-scp setup-server.sh root@47.104.204.180:/tmp/
-scp iot-platform.service root@47.104.204.180:/tmp/
-scp ../.env root@47.104.204.180:/tmp/iot-platform.env
-ssh root@47.104.204.180 "chmod +x /tmp/setup-server.sh && /tmp/setup-server.sh"
+./deploy.sh --build
 ```
 
 ### 日常部署
@@ -53,9 +64,9 @@ cd deploy
 1. 本地执行 `mvn clean package`
 2. 上传 jar 到服务器
 3. 备份当前版本（带时间戳）
-4. 停止 systemd 服务
-5. 替换 jar
-6. 启动服务
+4. 停止并删除旧容器
+5. 替换 jar 并构建新镜像
+6. 启动容器（host 网络模式）
 7. 健康检查（`/actuator/health`）
 8. 失败则自动回滚到上一个版本
 
@@ -104,20 +115,26 @@ DRUID_PASSWORD=...
 ## 服务器管理
 
 ```bash
-# 查看状态
-systemctl status iot-platform
+# 查看容器状态
+podman ps | grep iot-platform
 
-# 重启
-systemctl restart iot-platform
+# 查看实时日志
+podman logs -f iot-platform
 
-# 停止
-systemctl stop iot-platform
+# 查看最后 100 行日志
+podman logs --tail 100 iot-platform
 
-# 查看日志
-journalctl -u iot-platform -f
+# 查看宿主机上的日志文件（和容器内同步）
+tail -f /opt/iot-platform/logs/iot-platform.$(date +%Y-%m-%d).*.log
 
-# 查看历史日志
-journalctl -u iot-platform --since "1 hour ago"
+# 停止容器
+podman stop iot-platform
+
+# 删除容器
+podman rm iot-platform
+
+# 重启容器
+podman restart iot-platform
 ```
 
 ## 健康检查
@@ -142,10 +159,22 @@ curl -s http://47.104.204.180:8887/actuator/health
 
 ```bash
 ssh root@47.104.204.180
-systemctl stop iot-platform
+
+# 停止并删除当前容器
+podman stop iot-platform && podman rm iot-platform
+
+# 恢复旧版本 jar
 ls /opt/iot-platform/backup/          # 查看可用备份
 cp /opt/iot-platform/backup/iot-platform-XXXX.jar /opt/iot-platform/iot-platform.jar
-systemctl start iot-platform
+
+# 重新构建镜像并启动
+cd /opt/iot-platform && podman build -t iot-platform:latest .
+podman run -d \
+    --name iot-platform \
+    --network host \
+    --restart unless-stopped \
+    -v /opt/iot-platform/logs:/opt/iot-platform/logs \
+    localhost/iot-platform:latest
 ```
 
 ## 配置文件说明
@@ -153,6 +182,8 @@ systemctl start iot-platform
 | 文件 | 说明 |
 |------|------|
 | `deploy.sh` | 一键部署脚本（本地执行） |
-| `setup-server.sh` | 服务器初始化脚本（服务器执行） |
+| `setup-server.sh` | 服务器初始化脚本 |
 | `health-check.sh` | 健康检查脚本 |
-| `iot-platform.service` | systemd 服务定义 |
+| `Dockerfile` | 容器镜像构建定义 |
+| `start-container.sh` | 容器内启动脚本（加载 .env） |
+| `iot-platform.service` | systemd 服务定义（已废弃，保留备用） |

deploy/deploy.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# IoT Platform 一键部署脚本
+# IoT Platform 容器化一键部署脚本 (Podman)
 # 用法:
 #   ./deploy.sh --build              # 本地构建后部署
 #   ./deploy.sh --jar path/to/jar    # 使用指定 jar 部署
@@ -107,29 +107,40 @@ ssh "${SERVER_USER}@${SERVER_HOST}" "
 "
 echo -e "${GREEN}[2/6] 备份完成${NC}"
 
-# 步骤 3: 停止服务
-echo -e "${YELLOW}[3/6] 停止服务...${NC}"
-ssh "${SERVER_USER}@${SERVER_HOST}" "systemctl stop ${APP_NAME} || true"
+# 步骤 3: 停止旧容器
+echo -e "${YELLOW}[3/6] 停止旧容器...${NC}"
+ssh "${SERVER_USER}@${SERVER_HOST}" "podman stop ${APP_NAME} >/dev/null 2>&1 && podman rm ${APP_NAME} >/dev/null 2>&1 || true"
 sleep 2
-echo -e "${GREEN}[3/6] 服务已停止${NC}"
+echo -e "${GREEN}[3/6] 旧容器已清理${NC}"
 
-# 步骤 4: 替换 JAR
-echo -e "${YELLOW}[4/6] 替换 JAR...${NC}"
+# 步骤 4: 替换 JAR 并构建镜像
+echo -e "${YELLOW}[4/6] 替换 JAR 并构建镜像...${NC}"
 ssh "${SERVER_USER}@${SERVER_HOST}" "
     cp ${REMOTE_DIR}/tmp/${JAR_NAME} ${REMOTE_DIR}/${APP_NAME}.jar
     chmod 644 ${REMOTE_DIR}/${APP_NAME}.jar
     rm -f ${REMOTE_DIR}/tmp/${JAR_NAME}
     echo '  新 JAR:'
     ls -lh ${REMOTE_DIR}/${APP_NAME}.jar
+    echo '  构建镜像...'
+    cd ${REMOTE_DIR} && podman build -t ${APP_NAME}:latest . >/dev/null 2>&1
+    echo '  镜像构建完成'
+    podman images | grep ${APP_NAME}
 "
-echo -e "${GREEN}[4/6] 替换完成${NC}"
+echo -e "${GREEN}[4/6] 镜像构建完成${NC}"
 
-# 步骤 5: 启动服务
-echo -e "${YELLOW}[5/6] 启动服务...${NC}"
-ssh "${SERVER_USER}@${SERVER_HOST}" "systemctl start ${APP_NAME}"
-sleep 3
+# 步骤 5: 启动容器
+echo -e "${YELLOW}[5/6] 启动容器...${NC}"
+ssh "${SERVER_USER}@${SERVER_HOST}" "
+    podman run -d \
+        --name ${APP_NAME} \
+        --network host \
+        --restart unless-stopped \
+        -v ${REMOTE_DIR}/logs:/opt/iot-platform/logs \
+        localhost/${APP_NAME}:latest >/dev/null 2>&1
+"
+sleep 5
 
-echo -e "${GREEN}[5/6] 服务已启动${NC}"
+echo -e "${GREEN}[5/6] 容器已启动${NC}"
 
 # 步骤 6: 健康检查
 echo -e "${YELLOW}[6/6] 健康检查...${NC}"
@@ -144,8 +155,11 @@ if ssh "${SERVER_USER}@${SERVER_HOST}" "bash ${REMOTE_DIR}/bin/health-check.sh l
     echo "备份:     ${BACKUP_NAME}"
     echo "状态:     成功"
     echo ""
-    echo "服务状态:"
-    ssh "${SERVER_USER}@${SERVER_HOST}" "systemctl status ${APP_NAME} --no-pager"
+    echo "容器状态:"
+    ssh "${SERVER_USER}@${SERVER_HOST}" "podman ps | grep ${APP_NAME}"
+    echo ""
+    echo "查看日志:"
+    echo "  ssh ${SERVER_USER}@${SERVER_HOST} 'podman logs -f ${APP_NAME}'"
     exit 0
 else
     echo -e "${RED}[6/6] 健康检查失败!${NC}"
@@ -153,21 +167,27 @@ else
     if [ "$NO_ROLLBACK" = true ]; then
         echo -e "${YELLOW}[no-rollback] 已启用不回滚模式，保留新版本用于排查${NC}"
         echo -e "${YELLOW}排查命令:${NC}"
-        echo "  ssh ${SERVER_USER}@${SERVER_HOST} 'journalctl -u ${APP_NAME} -f'"
-        echo "  ssh ${SERVER_USER}@${SERVER_HOST} 'systemctl status ${APP_NAME}'"
+        echo "  ssh ${SERVER_USER}@${SERVER_HOST} 'podman logs -f ${APP_NAME}'"
+        echo "  ssh ${SERVER_USER}@${SERVER_HOST} 'podman ps | grep ${APP_NAME}'"
         exit 1
     fi
 
     echo -e "${YELLOW}[rollback] 执行回滚...${NC}"
-    ssh "${SERVER_USER}@${SERVER_HOST}" "systemctl stop ${APP_NAME} || true"
+    ssh "${SERVER_USER}@${SERVER_HOST}" "podman stop ${APP_NAME} >/dev/null 2>&1 && podman rm ${APP_NAME} >/dev/null 2>&1 || true"
 
     if ssh "${SERVER_USER}@${SERVER_HOST}" "test -f ${REMOTE_DIR}/backup/${BACKUP_NAME}"; then
         echo -e "${YELLOW}[rollback] 恢复旧版本...${NC}"
         ssh "${SERVER_USER}@${SERVER_HOST}" "
             cp ${REMOTE_DIR}/backup/${BACKUP_NAME} ${REMOTE_DIR}/${APP_NAME}.jar
-            systemctl start ${APP_NAME}
+            cd ${REMOTE_DIR} && podman build -t ${APP_NAME}:latest . >/dev/null 2>&1
+            podman run -d \
+                --name ${APP_NAME} \
+                --network host \
+                --restart unless-stopped \
+                -v ${REMOTE_DIR}/logs:/opt/iot-platform/logs \
+                localhost/${APP_NAME}:latest >/dev/null 2>&1
         "
-        sleep 3
+        sleep 5
 
         if ssh "${SERVER_USER}@${SERVER_HOST}" "bash ${REMOTE_DIR}/bin/health-check.sh localhost 8887 60"; then
             echo -e "${GREEN}[rollback] 回滚成功，旧版本已恢复${NC}"

iot-platform/pom.xml

@@ -74,7 +74,7 @@
         <dependency>
             <groupId>com.taosdata.jdbc</groupId>
             <artifactId>taos-jdbcdriver</artifactId>
-            <version>3.2.7</version>
+            <version>3.3.2</version>
         </dependency>
 
         <!-- HikariCP (TdEngine 连接池) -->

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://localhost:6030/";
+        private String url = "jdbc:TAOS://127.0.0.1:6031/";
         private String username = "";
         private String password = "";
 

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

@@ -72,7 +72,16 @@ public class MqttChargeStationConsumer extends AbstractDynamicMqttConsumer {
         String dbName = topicParts[1];
         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());
+
+        //拆分出数据库名称
+        //拆分出对于看哪个的超级表的名称
+
+        //字表名称公式
+
+        int i = ((int) "g".getBytes("UTF-8")[0]) % 10;
+
         tdengineService.insertBatch(dbName, superTable,tableName, batchToInsert);
     }
 }

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

@@ -44,7 +44,6 @@ public class MqttDynamicConsumer extends AbstractDynamicMqttConsumer {
         this.tdengineService = tdengineService;
         this.stringRedisTemplate = stringRedisTemplate;
     }
-
     @Override
     protected List<String> fetchTopics() {
         return sysControllerService.selectAll();
@@ -111,6 +110,7 @@ public class MqttDynamicConsumer extends AbstractDynamicMqttConsumer {
 
         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

@@ -48,7 +48,7 @@ public class TdEngineService {
     private static final int MAX_COLUMNS_PER_INSERT = 100;
 
     // 默认 VARCHAR 字段长度限制
-    private static final int DEFAULT_VARCHAR_LENGTH = 255;
+    private static final int DEFAULT_VARCHAR_LENGTH = 128;
 
     // 东八区时区偏移（避免重复创建）
     private static final ZoneOffset ZONE_OFFSET_8 = ZoneOffset.of("+8");
@@ -328,6 +328,15 @@ public class TdEngineService {
      */
     private String buildInsertSql(String dbName, String table, String superTableName,
                                    Map<String, String> columnTypes, List<Map<String, Object>> dataList) {
+        return buildInsertSql(dbName, table, superTableName, columnTypes, dataList, null);
+    }
+
+    /**
+     * 构建批量插入 SQL（支持指定 timestamp）
+     */
+    private String buildInsertSql(String dbName, String table, String superTableName,
+                                   Map<String, String> columnTypes, List<Map<String, Object>> dataList,
+                                   Long customTs) {
         if (columnTypes.isEmpty()) {
             return null;
         }
@@ -335,6 +344,9 @@ public class TdEngineService {
         // 获取数据库中实际的列类型，用于格式化值
         Map<String, String> dbColumnTypes = getStableColumnTypes(dbName, superTableName);
 
+        // 使用统一的 timestamp，确保拆分插入时数据能合并到同一行
+        String tsValue = customTs != null ? String.valueOf(customTs) : "NOW()";
+
         StringBuilder sql = new StringBuilder();
         sql.append("INSERT INTO ").append(wrapName(dbName)).append(".").append(wrapName(table))
            .append(" (ts, surfacename");
@@ -350,7 +362,7 @@ public class TdEngineService {
                 continue;
             }
 
-            sql.append("(NOW(), '").append(escapeValue(superTableName)).append("'");
+            sql.append("(").append(tsValue).append(", '").append(escapeValue(superTableName)).append("'");
             for (Map.Entry<String, String> entry : columnTypes.entrySet()) {
                 String col = entry.getKey();
                 Object value = data.get(col);
@@ -428,6 +440,8 @@ public class TdEngineService {
             int totalCols = columnTypes.size();
             if (totalCols > MAX_COLUMNS_PER_INSERT) {
                 log.warn("列数({})超过单次插入限制({})，开始拆分插入", totalCols, MAX_COLUMNS_PER_INSERT);
+                // 生成统一的 timestamp，确保拆分插入时数据能合并到同一行
+                long unifiedTs = System.currentTimeMillis();
                 List<String> allColumns = new ArrayList<>(columnTypes.keySet());
                 int insertedCount = 0;
                 for (int i = 0; i < allColumns.size(); i += MAX_COLUMNS_PER_INSERT) {
@@ -439,13 +453,13 @@ public class TdEngineService {
                         subColumnTypes.put(col, columnTypes.get(col));
                     }
 
-                    String subSql = buildInsertSql(dbName, table, superTableName, subColumnTypes, dataList);
+                    String subSql = buildInsertSql(dbName, table, superTableName, subColumnTypes, dataList, unifiedTs);
                     if (subSql != null) {
                         stmt.executeUpdate(subSql);
                         insertedCount += dataList.size();
                     }
                 }
-                log.info("拆分插入完成 | 总列数: {} | 拆分批次数: {} | 插入行数: {}", totalCols, (totalCols + MAX_COLUMNS_PER_INSERT - 1) / MAX_COLUMNS_PER_INSERT, insertedCount);
+                log.info("拆分插入完成 | 总列数: {} | 拆分批次数: {} | 插入行数: {} | unifiedTs: {}", totalCols, (totalCols + MAX_COLUMNS_PER_INSERT - 1) / MAX_COLUMNS_PER_INSERT, insertedCount, unifiedTs);
             } else {
                 stmt.executeUpdate(sql);
             }
@@ -620,7 +634,9 @@ public class TdEngineService {
     /**
      * 确保表存在
      */
-    private void ensureTableExists(String dbName, String superTableName, String table) throws SQLException {
+    private void ensureTableExists(String dbName, String superTableName, String table)
+            throws SQLException {
+
         if (!isValidTableName(dbName) || !isValidTableName(superTableName) || !isValidTableName(table)) {
             throw new IllegalArgumentException("Invalid database or table name: dbName=" + dbName
                     + ", superTableName=" + superTableName + ", table=" + table);
@@ -687,5 +703,4 @@ public class TdEngineService {
             dataSource.close();
         }
     }
-
 }

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://localhost:6030/
+    url: jdbc:TAOS://127.0.0.1:6031/
     username: ${TDENGINE_USERNAME:}
     password: ${TDENGINE_PASSWORD:}

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

@@ -38,7 +38,7 @@ class TDengineServiceTest {
     @BeforeEach
     void setUp() {
         when(iotProperties.getTdengine()).thenReturn(tdengineConfig);
-        when(tdengineConfig.getUrl()).thenReturn("jdbc:TAOS://localhost:6030/test");
+        when(tdengineConfig.getUrl()).thenReturn("jdbc:TAOS://localhost:6031/test");
         when(tdengineConfig.getUsername()).thenReturn("root");
         when(tdengineConfig.getPassword()).thenReturn("taosdata");
     }
@@ -330,7 +330,7 @@ class TDengineServiceTest {
     @Test
     @DisplayName("getConnection: 数据源初始化失败时应抛异常")
     void getConnection_initFails_throwsException() {
-        when(tdengineConfig.getUrl()).thenReturn("jdbc:TAOS://invalid:6030/test");
+        when(tdengineConfig.getUrl()).thenReturn("jdbc:TAOS://invalid:6031/test");
 
         assertThatThrownBy(() -> tdengineService.getConnection())
                 .isInstanceOf(Throwable.class);