From 5d7a39622179e93f34e252b924cbf560ea45096e Mon Sep 17 00:00:00 2001 From: GuanYuankai Date: Tue, 14 Oct 2025 17:47:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3deviceManager=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E7=9A=84=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 2 +- docker/Dockerfile | 1 + src/{ => deviceManager}/device_manager.cc | 2 +- src/{ => deviceManager}/device_manager.h | 2 +- src/main.cpp | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) rename src/{ => deviceManager}/device_manager.cc (98%) rename src/{ => deviceManager}/device_manager.h (94%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 609ec12..fe5de1b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,7 @@ add_library(edge_proxy_lib STATIC src/network/tcp_server.cc # --- 设备管理模块 --- - src/device_manager.cc + src/deviceManager/device_manager.cc # 小工具 src/utils/mqtt_topic_matcher.cpp diff --git a/docker/Dockerfile b/docker/Dockerfile index 26dc444..ead337e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -24,6 +24,7 @@ RUN apt-get update && \ # 开发库 libssl-dev \ libspdlog-dev \ + libsqlite3-dev \ libboost-all-dev && \ \ # --- 用户和组创建 --- diff --git a/src/device_manager.cc b/src/deviceManager/device_manager.cc similarity index 98% rename from src/device_manager.cc rename to src/deviceManager/device_manager.cc index b50c3b9..8532eed 100644 --- a/src/device_manager.cc +++ b/src/deviceManager/device_manager.cc @@ -1,4 +1,4 @@ -// 文件名: src/device_manager.cc +// 文件名: src/deviceManager/device_manager.cc #include "device_manager.h" #include "modbus/modbus_common.h" #include "spdlog/spdlog.h" diff --git a/src/device_manager.h b/src/deviceManager/device_manager.h similarity index 94% rename from src/device_manager.h rename to src/deviceManager/device_manager.h index 0151c9c..e1effb3 100644 --- a/src/device_manager.h +++ b/src/deviceManager/device_manager.h @@ -1,4 +1,4 @@ -// 文件名: src/device_manager.h +// 文件名: src/deviceManager/device_manager.h #ifndef DEVICE_MANAGER_H #define DEVICE_MANAGER_H diff --git a/src/main.cpp b/src/main.cpp index cc7e1b3..e08de3b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -5,7 +5,7 @@ #include "mqtt/mqtt_router.h" #include "systemMonitor/system_monitor.h" #include "spdlog/spdlog.h" -#include "device_manager.h" // <<< MODIFIED: 包含新的设备管理器头文件 +#include "deviceManager/device_manager.h" // <<< MODIFIED: 包含新的设备管理器头文件 #include #include