From 4e15ffff067c921d5f573407f32f1a94d5406dcd Mon Sep 17 00:00:00 2001 From: lnk Date: Tue, 14 Oct 2025 10:46:30 +0800 Subject: [PATCH] fix ledger update --- LFtid1056/cloudfront/code/rocketmq.cpp | 96 ++++++++++++++++---------- 1 file changed, 59 insertions(+), 37 deletions(-) diff --git a/LFtid1056/cloudfront/code/rocketmq.cpp b/LFtid1056/cloudfront/code/rocketmq.cpp index 389a7dd..4fafc91 100644 --- a/LFtid1056/cloudfront/code/rocketmq.cpp +++ b/LFtid1056/cloudfront/code/rocketmq.cpp @@ -771,6 +771,10 @@ bool parseJsonMessageUD(const std::string& json_str, const std::string& output_d "终端 id: " + json_data.terminal_id + " 已存在该装置，修改这个装置的台账");*/ if(erase_one_terminals_by_id(json_data.terminal_id) == 1){ + //删除旧的 + ClientManager::instance().remove_device(json_data.terminal_id); + + init_loggers_bydevid(json_data.terminal_id); terminal_devlist.push_back(json_data); @@ -781,13 +785,13 @@ bool parseJsonMessageUD(const std::string& json_str, const std::string& output_d /*send_reply_to_queue(json_data.guid, static_cast(ResponseCode::OK), "终端 id: " + json_data.terminal_id + " 台账修改成功");*/ one.code = static_cast(ResponseCode::OK); - one.result = "台账修改成功"; + one.result = "装置已存在，台账修改成功"; } else{ /*send_reply_to_queue(json_data.guid, static_cast(ResponseCode::BAD_REQUEST), "终端 id: " + json_data.terminal_id + " 台账修改失败");*/ one.code = static_cast(ResponseCode::BAD_REQUEST); - one.result = "台账修改失败"; + one.result = "装置已存在，但是无法擦除旧数据，台账修改失败"; } } reply_list.push_back(std::move(one)); @@ -820,29 +824,33 @@ bool parseJsonMessageUD(const std::string& json_str, const std::string& output_d /*send_reply_to_queue(json_data.guid, static_cast(ResponseCode::OK), "终端 id: " + json_data.terminal_id + " 台账添加成功");*/ one.code = static_cast(ResponseCode::OK); - one.result = "台账添加成功"; - reply_list.push_back(std::move(one)); - continue;//修改下一个 - } - - if(erase_one_terminals_by_id(json_data.terminal_id) == 1){ - init_loggers_bydevid(json_data.terminal_id); - terminal_devlist.push_back(json_data); - - //调用接口添加到通讯列表 - DeviceInfo device = make_device_from_terminal(json_data); - ClientManager::instance().add_device(device); - - /*send_reply_to_queue(json_data.guid, static_cast(ResponseCode::OK), - "终端 id: " + json_data.terminal_id + " 台账修改成功");*/ - one.code = static_cast(ResponseCode::OK); - one.result = "台账修改成功"; + one.result = "装置不存在，台账添加成功"; + } else{ - /*send_reply_to_queue(json_data.guid, static_cast(ResponseCode::BAD_REQUEST), - "终端 id: " + json_data.terminal_id + " 台账修改失败");*/ - one.code = static_cast(ResponseCode::BAD_REQUEST); - one.result = "台账修改失败"; + if(erase_one_terminals_by_id(json_data.terminal_id) == 1){ + //删除旧的 + ClientManager::instance().remove_device(json_data.terminal_id); + + init_loggers_bydevid(json_data.terminal_id); + terminal_devlist.push_back(json_data); + + //调用接口添加到通讯列表 + DeviceInfo device = make_device_from_terminal(json_data); + ClientManager::instance().add_device(device); + + /*send_reply_to_queue(json_data.guid, static_cast(ResponseCode::OK), + "终端 id: " + json_data.terminal_id + " 台账修改成功");*/ + one.code = static_cast(ResponseCode::OK); + one.result = "台账修改成功"; + } + else{ + /*send_reply_to_queue(json_data.guid, static_cast(ResponseCode::BAD_REQUEST), + "终端 id: " + json_data.terminal_id + " 台账修改失败");*/ + one.code = static_cast(ResponseCode::BAD_REQUEST); + one.result = "无法擦除旧数据，台账修改失败"; + } + } reply_list.push_back(std::move(one)); } @@ -871,21 +879,35 @@ bool parseJsonMessageUD(const std::string& json_str, const std::string& output_d //直接加锁删除 std::lock_guard lock(ledgermtx); - if(erase_one_terminals_by_id(json_data.terminal_id) == 1){ - ClientManager::instance().remove_device(json_data.terminal_id); - /*send_reply_to_queue(json_data.guid, static_cast(ResponseCode::OK), - "终端 id: " + json_data.terminal_id + " 台账删除成功");*/ - one.code = static_cast(ResponseCode::OK); - one.result = "台账删除成功"; - } - else{ - /*send_reply_to_queue(json_data.guid, static_cast(ResponseCode::BAD_REQUEST), - "终端 id: " + json_data.terminal_id + " 台账删除失败");*/ - one.code = static_cast(ResponseCode::BAD_REQUEST); - one.result = "台账删除失败"; - } - reply_list.push_back(std::move(one)); + // ① 先判断 json_data.terminal_id 是否已在当前进程维护的终端列表中 + const std::string& tid = json_data.terminal_id; + auto it = std::find_if(terminal_devlist.begin(), terminal_devlist.end(), + [&](const terminal_dev& d){ return d.terminal_id == tid; }); + + if (it == terminal_devlist.end()) { + // 终端 id 不存在于当前进程维护的终端列表中 + one.code = static_cast(ResponseCode::OK); + one.result = "装置不存在，无法删除台账"; + + } + else { + // 终端 id 存在于当前进程维护的终端列表中 + if(erase_one_terminals_by_id(json_data.terminal_id) == 1){ + ClientManager::instance().remove_device(json_data.terminal_id); + /*send_reply_to_queue(json_data.guid, static_cast(ResponseCode::OK), + "终端 id: " + json_data.terminal_id + " 台账删除成功");*/ + one.code = static_cast(ResponseCode::OK); + one.result = "台账删除成功"; + } + else{ + /*send_reply_to_queue(json_data.guid, static_cast(ResponseCode::BAD_REQUEST), + "终端 id: " + json_data.terminal_id + " 台账删除失败");*/ + one.code = static_cast(ResponseCode::BAD_REQUEST); + one.result = "无法擦除旧数据，台账删除失败"; + } + } + reply_list.push_back(std::move(one)); } } } else {