From dccc1ca1304dc1fcb86c8e24edd491509269b3e7 Mon Sep 17 00:00:00 2001
From: cheliequan <liequanche@126.com>
Date: 星期日, 29 一月 2023 14:44:52 +0800
Subject: [PATCH] 解决编译告警
---
util.cpp | 364 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 271 insertions(+), 93 deletions(-)
diff --git a/util.cpp b/util.cpp
index af742e0..dcfa0eb 100644
--- a/util.cpp
+++ b/util.cpp
@@ -5,16 +5,17 @@
#include "google/protobuf/util/type_resolver.h"
#include "google/protobuf/util/type_resolver_util.h"
-#include "google/protobuf/message.h"
+#include "google/protobuf/compiler/importer.h"
#include "google/protobuf/descriptor.h"
#include "google/protobuf/descriptor.pb.h"
#include "google/protobuf/dynamic_message.h"
-#include "google/protobuf/compiler/importer.h"
+#include "google/protobuf/message.h"
-#include "3rdparty/yyjson/yyjson.h"
#include "3rdparty/bus_client/cbhomeclient.h"
#include "3rdparty/bus_client/message.h"
+#include "3rdparty/yyjson/yyjson.h"
#include "proto/x86_64/sysset.pb.h"
+#include <vector>
using namespace protomsg;
using namespace std;
@@ -22,17 +23,19 @@
const char *CONTENT_TYPE_JSON = "application/json";
-bool json_to_proto(const std::string &json, google::protobuf::Message& message) {
+bool json_to_proto(const std::string &json, google::protobuf::Message &message) {
google::protobuf::util::JsonParseOptions options;
options.ignore_unknown_fields = true;
- return JsonStringToMessage(json, &message,options).ok();
+
+ return JsonStringToMessage(json, &message, options).ok();
}
-bool proto_to_json(const google::protobuf::Message& message, std::string& json) {
+bool proto_to_json(const google::protobuf::Message &message, std::string &json) {
google::protobuf::util::JsonPrintOptions options;
- options.add_whitespace = true;
+ options.add_whitespace = false;
options.always_print_primitive_fields = true;
options.preserve_proto_field_names = true;
+
return MessageToJsonString(message, &json, options).ok();
}
@@ -51,129 +54,304 @@
return json;
}
-extern "C" int bus_dbapi_get_json_data(const char * json, char ** pptr_data)
-{
- /*{
- "success": true,
- "msg": "",
- "data": {
- "alarm_ip": "192.168.20.189",
- "alarm_port": 9200,
- }
- }*/
+char *make_get_request(const char *topic, std::map<string, string> &query_params) {
+ yyjson_mut_doc *doc = yyjson_mut_doc_new(NULL);
+ yyjson_mut_val *root = yyjson_mut_obj(doc);
+ yyjson_mut_obj_add_strn(doc, root, "path", topic, strlen(topic));
+ yyjson_mut_obj_add_strn(doc, root, "method", "GET", 3);
- /*{
- "code": 200,
- "data": [
- {
- "id": "295F36D6-7489-30AC-3263-335B4660AA79",
- "name": "鍏ㄥぉ",
- "time_rule": "[{\"day\":1,\"time_range\":[{\"start\":\"05:31\",\"end\":\"21:07\"}]},{\"day\":2,\"time_range\":[{\"start\":\"01:42\",\"end\":\"23:59\"}]},{\"day\":3,\"time_range\":[{\"start\":\"00:00\",\"end\":\"23:59\"}]},{\"day\":4,\"time_range\":[{\"start\":\"00:00\",\"end\":\"23:59\"}]},{\"day\":5,\"time_range\":[{\"start\":\"00:00\",\"end\":\"23:59\"}]},{\"day\":6,\"time_range\":[{\"start\":\"00:00\",\"end\":\"23:59\"}]},{\"day\":7,\"time_range\":[{\"start\":\"00:00\",\"end\":\"23:59\"}]}]"
- },
- {
- "id": "21FA488C-2858-F366-4587-CE0661BFAD60",
- "name": "SAAS",
- "time_rule": "[{\"day\":1,\"time_range\":[{\"start\":\"00:00\",\"end\":\"17:04\"}]},{\"day\":2,\"time_range\":[{\"start\":\"00:00\",\"end\":\"17:25\"}]},{\"day\":3,\"time_range\":[{\"start\":\"00:00\",\"end\":\"17:22\"}]},{\"day\":4,\"time_range\":[{\"start\":\"00:00\",\"end\":\"15:33\"}]},{\"day\":5,\"time_range\":[{\"start\":\"00:00\",\"end\":\"17:40\"}]},{\"day\":6,\"time_range\":[{\"start\":\"00:00\",\"end\":\"18:04\"}]},{\"day\":7,\"time_range\":[{\"start\":\"00:00\",\"end\":\"13:51\"}]}]"
- },
- {
- "id": "37B82C8F-3BDB-A247-3683-F045190D2991",
- "name": "116",
- "time_rule": "[{\"day\":1,\"time_range\":[{\"start\":\"03:28\",\"end\":\"23:59\"}]},{\"day\":2,\"time_range\":[{\"start\":\"04:04\",\"end\":\"23:59\"}]},{\"day\":3,\"time_range\":[{\"start\":\"04:40\",\"end\":\"23:59\"}]},{\"day\":4,\"time_range\":[{\"start\":\"04:46\",\"end\":\"23:59\"}]},{\"day\":5,\"time_range\":[{\"start\":\"04:58\",\"end\":\"23:59\"}]},{\"day\":6,\"time_range\":[{\"start\":\"06:16\",\"end\":\"23:59\"}]},{\"day\":7,\"time_range\":[{\"start\":\"05:52\",\"end\":\"23:59\"}]}]"
+ // 濉厖璇锋眰鍙傛暟
+ if (!query_params.empty()) {
+ yyjson_mut_val *query_map = yyjson_mut_obj(doc);
+
+ // std::map<string, string> t_map = *query_params;
+ std::map<string, string>::iterator iter;
+ for (iter = query_params.begin(); iter != query_params.end(); iter++) {
+ yyjson_mut_val *_key = yyjson_mut_str(doc, iter->first.c_str());
+
+ yyjson_mut_val *param = yyjson_mut_arr(doc);
+ yyjson_mut_val *_val = yyjson_mut_str(doc, iter->second.c_str());
+ yyjson_mut_arr_append(param, _val);
+
+ yyjson_mut_obj_add(query_map, _key, param);
}
- ],
- "msg": "",
- "success": true
-}*/
+
+ yyjson_mut_val *query_map_key = yyjson_mut_str(doc, "queryMap");
+ yyjson_mut_obj_add(root, query_map_key, query_map);
+ }
+
+ yyjson_mut_doc_set_root(doc, root);
+
+ size_t jsonl = 0;
+ char *json = yyjson_mut_val_write(root, 0, &jsonl);
+
+ yyjson_mut_doc_free(doc);
+
+ return json;
+}
+
+extern "C" int bus_dbapi_get_json_data_by_key(const char *json, const char *flag_key, const char *data_key, char **pptr_data, yyjson_type *ptr_type) {
int ret = -1;
size_t data_len = 0;
- size_t success_len = 0;
- size_t total_len = 0;
- const char * ptr_data = NULL;
- const char * ptr_value = NULL;
- const char * success_name = "success";
- const char * msg_name = "msg";
- const char * data_quote_name = "\"data\"";
+ const char *ptr_value = NULL;
+ const char *success_name = flag_key;
+ const char *data_name = data_key;
+ const char *msg_name = "msg";
- if(NULL == *pptr_data)
- {
+ if (NULL == *pptr_data) {
return -1;
}
-
// Read JSON and get root
yyjson_doc *doc = yyjson_read(json, strlen(json), 0);
yyjson_val *root = yyjson_doc_get_root(doc);
- // Get root["success"]
- yyjson_val *success = yyjson_obj_get(root, success_name);
+ if (NULL != success_name) {
+ // Get root["success"]
+ yyjson_val *success = yyjson_obj_get(root, success_name);
- int success_val = yyjson_get_bool(success);
- printf("success: %d\n", success_val);
- printf("success_len:%lu\n",yyjson_get_len(success));
- if(!success_val)
- {
- yyjson_doc_free(doc);
- return -1;
+ int success_val = yyjson_get_bool(success);
+ printf("success: %d\n", success_val);
+ if (!success_val) {
+ yyjson_doc_free(doc);
+ return -1;
+ }
}
// Get root["msg"]
//yyjson_val *msg = yyjson_obj_get(root, "msg");
- yyjson_val *msg = yyjson_obj_get(root, "msg");
- printf("msg: %s\n", yyjson_get_str(msg));
+ yyjson_val *msg = yyjson_obj_get(root, "msg");
+ printf("msg: %s\n", yyjson_get_str(msg));
- total_len = strlen(json);
- ptr_data = strstr(json, data_quote_name);
- ptr_value = strchr(ptr_data, ':');
- ptr_value++;
-
- //鍘婚櫎鏈�鍚庝竴涓�"}""
- data_len = total_len - (ptr_value - json) - 1;
+ // Get root["data"]
+ //yyjson_val *msg = yyjson_obj_get(root, "data");
+ yyjson_val *data;
+ if ( NULL != data_name )
+ {
+ data = yyjson_obj_get(root, data_name);
+ }
+ else
+ {
+ data = root;
+ }
+
+
+ *ptr_type = yyjson_get_type(data);
+ ptr_value = yyjson_val_write(data, YYJSON_WRITE_NOFLAG, &data_len);
+ printf("%s: %s\n", data_name, ptr_value);
+ printf("len: %lu\n", data_len);
+
memcpy(*pptr_data, ptr_value, data_len);
ret = 0;
// Free the doc
yyjson_doc_free(doc);
-
+
// All functions accept NULL input, and return NULL on error.
return ret;
}
-bool bus_dbapi_get(void *handle, const char* topic, google::protobuf::Message& message) {
+extern "C" int bus_dbapi_get_json_data(const char *json, char **pptr_data, yyjson_type *ptr_type) {
+ /*{
+ "success": true,
+ "msg": "",
+ "data": {
+ "alarm_ip": "192.168.20.189",
+ "alarm_port": 9200,
+ }
+ }*/
+
+ /*{
+"code": 200,
+"data": [
+ {
+ "id": "295F36D6-7489-30AC-3263-335B4660AA79",
+ "name": "鍏ㄥぉ",
+ "time_rule":
+"[{\"day\":1,\"time_range\":[{\"start\":\"05:31\",\"end\":\"21:07\"}]},{\"day\":2,\"time_range\":[{\"start\":\"01:42\",\"end\":\"23:59\"}]},{\"day\":3,\"time_range\":[{\"start\":\"00:00\",\"end\":\"23:59\"}]},{\"day\":4,\"time_range\":[{\"start\":\"00:00\",\"end\":\"23:59\"}]},{\"day\":5,\"time_range\":[{\"start\":\"00:00\",\"end\":\"23:59\"}]},{\"day\":6,\"time_range\":[{\"start\":\"00:00\",\"end\":\"23:59\"}]},{\"day\":7,\"time_range\":[{\"start\":\"00:00\",\"end\":\"23:59\"}]}]"
+ },
+ {
+ "id": "21FA488C-2858-F366-4587-CE0661BFAD60",
+ "name": "SAAS",
+ "time_rule":
+"[{\"day\":1,\"time_range\":[{\"start\":\"00:00\",\"end\":\"17:04\"}]},{\"day\":2,\"time_range\":[{\"start\":\"00:00\",\"end\":\"17:25\"}]},{\"day\":3,\"time_range\":[{\"start\":\"00:00\",\"end\":\"17:22\"}]},{\"day\":4,\"time_range\":[{\"start\":\"00:00\",\"end\":\"15:33\"}]},{\"day\":5,\"time_range\":[{\"start\":\"00:00\",\"end\":\"17:40\"}]},{\"day\":6,\"time_range\":[{\"start\":\"00:00\",\"end\":\"18:04\"}]},{\"day\":7,\"time_range\":[{\"start\":\"00:00\",\"end\":\"13:51\"}]}]"
+ },
+ {
+ "id": "37B82C8F-3BDB-A247-3683-F045190D2991",
+ "name": "116",
+ "time_rule":
+"[{\"day\":1,\"time_range\":[{\"start\":\"03:28\",\"end\":\"23:59\"}]},{\"day\":2,\"time_range\":[{\"start\":\"04:04\",\"end\":\"23:59\"}]},{\"day\":3,\"time_range\":[{\"start\":\"04:40\",\"end\":\"23:59\"}]},{\"day\":4,\"time_range\":[{\"start\":\"04:46\",\"end\":\"23:59\"}]},{\"day\":5,\"time_range\":[{\"start\":\"04:58\",\"end\":\"23:59\"}]},{\"day\":6,\"time_range\":[{\"start\":\"06:16\",\"end\":\"23:59\"}]},{\"day\":7,\"time_range\":[{\"start\":\"05:52\",\"end\":\"23:59\"}]}]"
+ }
+],
+"msg": "",
+"success": true
+}*/
+ const char *success_name = "success";
+ const char *data_name = "data";
+
+ if (NULL == *pptr_data) {
+ return -1;
+ }
+
+ // All functions accept NULL input, and return NULL on error.
+ return bus_dbapi_get_json_data_by_key(json, success_name, data_name, pptr_data, ptr_type);
+}
+
+bool bus_dbapi_get_topic_data(void *handle, const char *topic, crepmsg **pptr_repmsg, size_t len) {
const auto topicl = strlen(topic);
-
auto reqData = make_get_request(topic);
-
auto reqmsg = make_req_msg(topic, topicl, reqData, strlen(reqData));
-
- crepmsg *repmsg = NULL;
- if (bus_client_request(handle, reqmsg, &repmsg)) {
- printf("======>> bus_client_reqest [%s] get [%s]\n", topic, repmsg->data);
+
+ if (bus_client_request(handle, reqmsg, pptr_repmsg)) {
+ printf("======>> bus_client_reqest [%s] get [%s]\n", topic, (*pptr_repmsg)->data);
} else {
+ free(reqData);
return false;
}
- int msglen = strlen(repmsg->data);
- char* msgdata = (char *)malloc(msglen);
- memset(msgdata, 0 , msglen);
+ len = strlen((*pptr_repmsg)->data) + 1;
- if(0 == bus_dbapi_get_json_data((const char *)repmsg->data, &msgdata))
- {
- printf("======>> protomsg: %s\n", msgdata);
- std::string jsonString = msgdata;
- if (json_to_proto(jsonString, message))
- {
- printf("======>> json_to_proto done\n");
- }
- else
- {
- printf("======>> json_to_proto fail\n");
- return false;
- }
+ free(reqData);
+ return true;
+}
+
+bool bus_dbapi_get_topic_data(void *handle, const char *topic, crepmsg **pptr_repmsg, size_t len, std::map<string, string> ¶ms) {
+ const auto topicl = strlen(topic);
+ auto reqData = make_get_request(topic, params);
+ auto reqmsg = make_req_msg(topic, topicl, reqData, strlen(reqData));
+
+ if (bus_client_request(handle, reqmsg, pptr_repmsg)) {
+ printf("======>> bus_client_reqest [%s] get [%s]\n", topic, (*pptr_repmsg)->data);
+ } else {
+ free(reqData);
+ return false;
+ }
+
+ len = strlen((*pptr_repmsg)->data) + 1;
+
+ free(reqData);
+ return true;
+}
+
+bool bus_dbapi_get(void *handle, const char *topic, google::protobuf::Message &message) {
+ yyjson_type type = YYJSON_TYPE_OBJ;
+ crepmsg *repmsg = NULL;
+ size_t len = 0;
+ bool bRet = false;
+
+ bus_dbapi_get_topic_data(handle, topic, &repmsg, len);
+
+ int msglen = strlen(repmsg->data);
+ char *msgdata = (char *)malloc(msglen);
+ memset(msgdata, 0, msglen);
+
+ if (0 ==
+ bus_dbapi_get_json_data((const char *)repmsg->data, &msgdata, &type)) {
+ printf("======>> protomsg: %s\n", msgdata);
+ }
+
+ std::string jsonString = msgdata;
+ bRet = json_to_proto(jsonString, message);
+ if (bRet) {
+ printf("======>> json_to_proto done\n");
+ } else {
+ printf("======>> json_to_proto fail\n");
}
free(msgdata);
- free_reqmsg(reqmsg);
- free(reqData);
+ free_reply_msg(repmsg);
- return true;
+ return bRet;
+}
+
+/*****************************************************************************
+ 鍑� 鏁� 鍚� : bus_dbapi_get_str
+ 鍔熻兘鎻忚堪 : 鑾峰彇璁㈤槄涓婚娑堟伅瀛楃涓诧紝杩斿洖鐨勫唴瀛樿皟鐢ㄨ�呴渶瑕佹墜宸ヨ皟鐢╢ree鍑芥暟閲婃斁
+ 杈撳叆鍙傛暟 : void *handle
+ const char* topic
+ char **pptr_str
+ 杈撳嚭鍙傛暟 : 鏃�
+ 杩� 鍥� 鍊� :
+ 璋冪敤鍑芥暟 :
+ 琚皟鍑芥暟 :
+
+ 淇敼鍘嗗彶 :
+ 1.鏃� 鏈� : 2023骞�1鏈�13鏃�
+ 浣� 鑰� : cheliequan
+ 淇敼鍐呭 : 鏂扮敓鎴愬嚱鏁�
+
+*****************************************************************************/
+bool bus_dbapi_get_str(void *handle, const char *topic, char **pptr_str) {
+ yyjson_type type = YYJSON_TYPE_OBJ;
+ crepmsg *repmsg = NULL;
+ size_t len = 0;
+ int iRet = 0;
+ bool bRet = false;
+
+ bus_dbapi_get_topic_data(handle, topic, &repmsg, len);
+
+ int msglen = strlen(repmsg->data);
+ char *msgdata = (char *)malloc(msglen);
+ memset(msgdata, 0, msglen);
+
+ iRet = bus_dbapi_get_json_data((const char *)repmsg->data, &msgdata, &type);
+ if (0 == iRet) {
+ printf("======>> protomsg: %s\n", msgdata);
+ bRet = true;
+ }
+
+ *pptr_str = msgdata;
+
+ free(msgdata);
+ free_reply_msg(repmsg);
+
+ return bRet;
+}
+
+/*****************************************************************************
+ 鍑� 鏁� 鍚� : get_value_by_key
+ 鍔熻兘鎻忚堪 : 鑾峰彇json瀛楃涓蹭腑瀛楁涓簁ey鍊肩殑value锛宲ptr_data鍐呭瓨闇�瑕佺敤鎴风敵璇峰拰閲婃斁
+ 杈撳叆鍙傛暟 : char *json
+ const char *key
+ char **pptr_data
+ 杈撳嚭鍙傛暟 : 鏃�
+ 杩� 鍥� 鍊� :
+ 璋冪敤鍑芥暟 :
+ 琚皟鍑芥暟 :
+
+ 淇敼鍘嗗彶 :
+ 1.鏃� 鏈� : 2023骞�1鏈�13鏃�
+ 浣� 鑰� : cheliequan
+ 淇敼鍐呭 : 鏂扮敓鎴愬嚱鏁�
+
+*****************************************************************************/
+int get_value_by_key(char *json, const char *key, char **pptr_data) {
+ size_t data_len = 0;
+
+ // Read JSON and get root
+ yyjson_doc *doc = yyjson_read(json, strlen(json), 0);
+ yyjson_val *root = yyjson_doc_get_root(doc);
+
+ // Get root[key]
+ yyjson_val *val = yyjson_obj_get(root, key);
+
+ char *val_str = (char *)yyjson_get_str(val);
+ printf("val: %s\n", val_str);
+ if (NULL == val_str) {
+ yyjson_doc_free(doc);
+ return -1;
+ }
+
+ char *ptr_value = yyjson_val_write(val, YYJSON_WRITE_NOFLAG, &data_len);
+ printf("data: %s\n", ptr_value);
+ printf("len: %lu\n", data_len);
+
+ *pptr_data = (char *)malloc(data_len);
+ memset(*pptr_data, 0, data_len);
+ memcpy(*pptr_data, ptr_value, data_len);
+
+ // Free the doc
+ yyjson_doc_free(doc);
+
+ return 0;
}
--
Gitblit v1.8.0