lnk/microser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modify for ledgerupdate

Browse Source
This commit is contained in:
lnk
2025-01-16 19:16:26 +08:00
parent c078194a8d
commit 040b1bd5f6
3 changed files with 43 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
json/save2json.cpp
View File

@@ -46,6 +46,7 @@ extern std::string intToString(int number);
int StringToInt(const std::string& str);
extern pthread_mutex_t mtx;//lnk20250115
#ifdef __cplusplus
extern "C" {
#include "../mms/rdb_client.h"
@@ -59,6 +60,7 @@ extern "C" {
extern int comtrade_remain_file_num;
extern node_t* g_node; //lnk20241223
extern LD_info_t* find_LD_info_only_from_mp_id(char* mp_id);//lnk20241223
extern void print_terminal(const terminal* tmnl);
#ifdef __cplusplus
}
#endif
@@ -1126,14 +1128,16 @@ std::string prepare_update(const std::string& code_str, const terminal& json_dat
// <20><><EFBFBD><EFBFBD> modify <20><> add <20><>ǩ
if (code_str == "ledger_modify") {
indentLevel--;
add_indent(xmlStream, indentLevel);
xmlStream << "</modify>" << std::endl;
indentLevel--;
}
else {
indentLevel--;
add_indent(xmlStream, indentLevel);
xmlStream << "</add>" << std::endl;
indentLevel--;
}
} else if (code_str == "delete_terminal") {
@@ -1350,16 +1354,18 @@ void parse_control(const std::string& json_str, const std::string& output_dir) {
else
std::strncpy(monitor_data.status, "N/A", sizeof(monitor_data.status) - 1);
cJSON* lineNo = cJSON_GetObjectItem(item, "lineNo"); // logical_device_seq
cJSON* lineNo = cJSON_GetObjectItem(monitor_item, "lineNo"); // logical_device_seq
if (lineNo && lineNo->type == cJSON_String)
std::strncpy(monitor_data.logical_device_seq, lineNo->valuestring, sizeof(monitor_data.logical_device_seq) - 1);
else
else
std::strncpy(monitor_data.logical_device_seq, "N/A", sizeof(monitor_data.logical_device_seq) - 1);
cJSON* ptType = cJSON_GetObjectItem(item, "ptType"); // terminal_connect
cJSON* ptType = cJSON_GetObjectItem(monitor_item, "ptType"); // terminal_connect
if (ptType && ptType->type == cJSON_String)
std::strncpy(monitor_data.terminal_connect, ptType->valuestring, sizeof(monitor_data.terminal_connect) - 1);
else
else
std::strncpy(monitor_data.terminal_connect, "N/A", sizeof(monitor_data.terminal_connect) - 1);
std::strncpy(monitor_data.timestamp, json_data.timestamp, sizeof(monitor_data.timestamp) - 1);
@@ -1370,6 +1376,8 @@ void parse_control(const std::string& json_str, const std::string& output_dir) {
}
}
print_terminal(&json_data);
// ׼<><D7BC> XML <20><><EFBFBD>ݲ<EFBFBD>д<EFBFBD><D0B4><EFBFBD>ļ<EFBFBD>
std::string xmlContent = prepare_update(code_str, json_data);
if (xmlContent != "") {