前置新增了装置心跳传输流程，每30秒自动发送一次心跳报文

2026-03-05 13:53:17 +08:00
parent d460816195
commit 852245f8ac
5 changed files with 53 additions and 2 deletions
--- a/LFtid1056/PQSMsg.cpp
+++ b/LFtid1056/PQSMsg.cpp
@@ -765,4 +765,16 @@ std::vector<uint8_t> generate_recallevent_message(const std::tm& Time1, const st

    // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>е<EFBFBD>GetMsg<73><67><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ģ<EFBFBD><C4A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>0x0D(<28>¼<EFBFBD><C2BC><EFBFBD><EFBFBD>й<EFBFBD><D0B9><EFBFBD><EFBFBD><EFBFBD>)
    return GetMsg(DataBuf, static_cast<unsigned char>(MsgRequestType::Request_Read_Event));
+}
+
+/**
+ * @brief <20><><EFBFBD><EFBFBD>װ<EFBFBD><D7B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+ * @return <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ĵ<EFBFBD><C4B5>ֽ<EFBFBD><D6BD><EFBFBD><EFBFBD><EFBFBD>
+ */
+std::vector<unsigned char> generate_requestHeartBeat_message() {
+    // <20><><EFBFBD><EFBFBD>3<EFBFBD>ֽڻ<D6BD><DABB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʼ<EFBFBD><CABC>
+    std::vector<unsigned char> DataBuf(3, 0x00);
+
+    // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+    return GetMsg(DataBuf, static_cast<unsigned char>(MsgRequestType::Request_HeartBeat));
 }
--- a/LFtid1056/PQSMsg.h
+++ b/LFtid1056/PQSMsg.h
@@ -18,6 +18,8 @@ float ShorToFloat1000(short num);
 float ShorToFloat10000(short num);
 // <20><><EFBFBD>ͱ<EFBFBD><CDB1>Ĺ<EFBFBD><C4B9><EFBFBD><EFBFBD><EFBFBD>ö<EFBFBD><C3B6>
 enum class MsgRequestType : unsigned char {
+    //ѯ<><D1AF>װ<EFBFBD><D7B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+    Request_HeartBeat = 0x01,
    //ѯ<><D1AF>ͳ<EFBFBD><CDB3><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1>
    Request_StatTime = 0x8b,
    //ѯ<><D1AF>ͳ<EFBFBD><CDB3><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@@ -49,6 +51,8 @@ enum class MsgRequestType : unsigned char {
 };
 // <20><><EFBFBD>ձ<EFBFBD><D5B1>Ĺ<EFBFBD><C4B9><EFBFBD><EFBFBD><EFBFBD>ö<EFBFBD><C3B6>
 enum class MsgResponseType : unsigned char {
+    //ѯ<><D1AF>װ<EFBFBD><D7B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ӧ<EFBFBD><D3A6>
+    Response_HeartBeat = 0x81,
    //ѯ<><D1AF>ͳ<EFBFBD><CDB3><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1>
    Response_StatTime = 0x27,
    //ѯ<><D1AF>ͳ<EFBFBD><CDB3><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@@ -2417,4 +2421,9 @@ std::vector<uint8_t> generate_righttime_message(const std::tm& time);
 * @param monitorPoint <20><><EFBFBD><EFBFBD><EFBFBD>㣬Ĭ<E3A3AC><C4AC>1-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>1 1-6 <20><>Ӧ<EFBFBD><D3A6><EFBFBD><EFBFBD>
 * @return <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ĵ<EFBFBD><C4B5>ֽ<EFBFBD><D6BD><EFBFBD><EFBFBD><EFBFBD>
 */
-std::vector<uint8_t> generate_recallevent_message(const std::tm& Time1, const std::tm& Time2, uint8_t eventType = 2, uint8_t monitorPoint = 1);
+std::vector<uint8_t> generate_recallevent_message(const std::tm& Time1, const std::tm& Time2, uint8_t eventType = 2, uint8_t monitorPoint = 1);
+/**
+ * @brief <20><><EFBFBD><EFBFBD>װ<EFBFBD><D7B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+ * @return <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ĵ<EFBFBD><C4B5>ֽ<EFBFBD><D6BD><EFBFBD><EFBFBD><EFBFBD>
+ */
+std::vector<unsigned char> generate_requestHeartBeat_message();
--- a/LFtid1056/client2.cpp
+++ b/LFtid1056/client2.cpp
@@ -479,6 +479,17 @@ void on_timer(uv_timer_t* handle) {
            auto sendbuff = generate_statequerytime_message();//组装询问统计数据时间报文
            ctx->add_action(DeviceState::READING_STATS_TIME, sendbuff);//将该状态以及待发送报文存入队列
        }
+
+        //30秒一次 执行询问装置心跳
+        now = uv_now(ctx->loop);
+        if (ctx->current_state_ == DeviceState::IDLE && now - ctx->heartbeat_time >= 30000) {
+            //更新装置心跳最新发送时间
+            ctx->heartbeat_time = now;
+
+            auto sendbuff = generate_requestHeartBeat_message();//组装装置心跳报文
+            ctx->add_action(DeviceState::HEART_BEAT, sendbuff);//将该状态以及待发送报文存入队列
+        }
+
        //一秒一次 执行实时数据询问 仅执行指定次数
        now = uv_now(ctx->loop);
        if (ctx->current_state_ == DeviceState::IDLE && now - ctx->real_state_query_time_ >= 1000 && ctx->real_state_count > 0) {
@@ -489,6 +500,7 @@ void on_timer(uv_timer_t* handle) {
            auto sendbuff = generate_realstat_message(static_cast<unsigned char>(ctx->real_point_id_), static_cast<unsigned char>(0x01), static_cast<unsigned char>(0x01));//组装询问实时数据报文
            ctx->add_action(DeviceState::READING_REALSTAT, sendbuff);//将该状态以及待发送报文存入队列
        }
+
        //30分钟一次 读取装置运行信息
        now = uv_now(ctx->loop);
        if (ctx->current_state_ == DeviceState::IDLE && now - ctx->read_runninginformationMsg >= 60000 * 30)
@@ -499,7 +511,8 @@ void on_timer(uv_timer_t* handle) {
            auto sendbuff = generate_machinestatus_message();//组装读取装置运行信息报文
            ctx->add_action(DeviceState::READING_RUNNINGINFORMATION_2, sendbuff);//将该状态以及待发送报文存入队列
        }
-        //30分钟一次 启动装置对时 仅在台账开启对时且云协议版本大于1.5时开启对时 60000 * 30
+
+        //30分钟一次 启动装置对时 仅在台账开启对时且云协议版本大于等于1.5时开启对时 60000 * 30
        now = uv_now(ctx->loop);
        if (ctx->current_state_ == DeviceState::IDLE && now - ctx->right_time >= 60000 * 30 && ctx->device_info.righttime && isVersionGreaterOrEqual(ctx->dev_CloudProtocolVer,"V1.5"))
        {
@@ -515,6 +528,7 @@ void on_timer(uv_timer_t* handle) {
            //auto sendbuff = generate_machinestatus_message();//组装读取装置运行信息报文
            //ctx->add_action(DeviceState::READING_RUNNINGINFORMATION_2, sendbuff);//将该状态以及待发送报文存入队列
        }
+
        //处理后续工作队列的工作 取出一个并执行
        if (ctx->current_state_ == DeviceState::IDLE) {
            ctx->process_next_action();
@@ -717,6 +731,7 @@ void on_connect(uv_connect_t* req, int status) {
    ctx->state = ConnectionState::CONNECTED;
    ctx->reconnect_attempts = 0;
    // 新增：初始化各个计时时间戳
+    ctx->heartbeat_time = uv_now(ctx->loop);//初始化心跳报文时间戳
    ctx->last_state_query_time_ = uv_now(ctx->loop);//初始化统计数据时间戳
    ctx->real_state_query_time_ = uv_now(ctx->loop);//初始化实时数据时间戳
    ctx->read_runninginformationMsg = uv_now(ctx->loop);//初始化读取装置运行信息时间戳
--- a/LFtid1056/client2.h
+++ b/LFtid1056/client2.h
@@ -44,6 +44,7 @@ enum class ConnectionState {
 // <20><><EFBFBD>ӵ<EFBFBD>״̬ö<CCAC><C3B6>
 enum class DeviceState {
    IDLE,                        // <20><><EFBFBD><EFBFBD>״̬
+    HEART_BEAT,                  // װ<><D7B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
    READING_STATS,               // <20><>ȡͳ<C8A1><CDB3><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
    READING_STATS_TIME,          // <20><>ȡͳ<C8A1><CDB3>ʱ<EFBFBD><CAB1>
    READING_REALSTAT,            // <20><>ȡʵʱ<CAB5><CAB1><EFBFBD><EFBFBD>
@@ -83,6 +84,7 @@ public:
    ConnectionState state;
    int reconnect_attempts;
    volatile bool shutdown;
+    uint64_t heartbeat_time = 0;// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD>ʱʱ<CAB1><CAB1><EFBFBD><EFBFBD>
    uint64_t last_state_query_time_ = 0; // ͳ<><CDB3><EFBFBD><EFBFBD><EFBFBD>ݼ<EFBFBD>ʱʱ<CAB1><CAB1><EFBFBD><EFBFBD>
    uint64_t real_state_query_time_ = 0; // ʵʱ<CAB5><CAB1><EFBFBD>ݼ<EFBFBD>ʱʱ<CAB1><CAB1><EFBFBD><EFBFBD>
    std::atomic<int> real_state_count{ 0 };//ʵʱ<CAB5><CAB1><EFBFBD><EFBFBD><EFBFBD>շ<EFBFBD><D5B7><EFBFBD><EFBFBD><EFBFBD> ԭ<>Ӳ<EFBFBD><D3B2><EFBFBD><EFBFBD><EFBFBD>֤<EFBFBD>̰߳<DFB3>ȫ
--- a/LFtid1056/dealMsg.cpp
+++ b/LFtid1056/dealMsg.cpp
@@ -398,6 +398,19 @@ void process_received_message(string mac, string id,const char* data, size_t len
                // 这里可以添加处理主动上报数据的逻辑
                break;

+            case DeviceState::HEART_BEAT:
+                //接收到心跳报文应答
+                if (udata[8] == static_cast<unsigned char>(MsgResponseType::Response_HeartBeat)) {
+                    std::cout << "heartbeat success" << mac << std::endl;
+                    //心跳设置成功，调整为空闲，处理后续工作。
+                    ClientManager::instance().change_device_state(id, DeviceState::IDLE);
+                }
+                else {
+                    // 装置答非所问异常
+                    // 接收心跳报文错误，调整为空闲状态，处理下一项工作。
+                    ClientManager::instance().change_device_state(id, DeviceState::IDLE);
+                }
+
            case DeviceState::READING_STATS:
                // 读取统计数据状态
                if (udata[8] == static_cast<unsigned char>(MsgResponseType::Response_Stat)) {