From f80951fdc3f37653fca8e0c9a21cb53b4397039b Mon Sep 17 00:00:00 2001
From: cheliequan <liequanche@126.com>
Date: 星期四, 12 一月 2023 21:08:35 +0800
Subject: [PATCH] 增加返回protobuf结构体是vector类型处理方法，还需要封装优化
---
rule.cpp | 68 ++++++++++++++++++++++
util.cpp | 71 ++++++++++++++---------
util.h | 4 +
3 files changed, 115 insertions(+), 28 deletions(-)
diff --git a/rule.cpp b/rule.cpp
index df571c1..5d23f2c 100644
--- a/rule.cpp
+++ b/rule.cpp
@@ -1,10 +1,78 @@
#include "rule.h"
#include "util.h"
+#include "3rdparty/yyjson/yyjson.h"
using namespace protomsg;
bool dbapi_get_time_rules(void *handle, vector<protomsg::CameraTimerule> & list) {
const char *topic = DATA_URL_PREFIX("/cameraTimerule/findAll");
+ char * ptr_value = NULL;
+ size_t data_len = 0;
+ //get the topic json data
+ yyjson_type type = YYJSON_TYPE_OBJ;
+ crepmsg *repmsg = NULL;
+ size_t len = 0;
+ protomsg::CameraTimerule CameraTimeRule;
+ int ret = 0;
+
+ ret = bus_dbapi_get_topic_data(handle, topic, &repmsg, len);
+ if ( ret < 0 || NULL == repmsg)
+ {
+ return false;
+ }
+
+ //parse the json to get value of the key "data"
+ 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);
+ }
+
+ //iterate the array to get the protobuf message
+ if (YYJSON_TYPE_ARR == type)
+ {
+
+ printf("======>> deal the ARRAY\n");
+ // Read JSON and get root
+ yyjson_doc *doc = yyjson_read(msgdata, strlen(msgdata), 0);
+ yyjson_val *arr = yyjson_doc_get_root(doc);
+
+ //yyjson_val *arr = yyjson_obj_get(root, "data");
+ yyjson_val *val;
+ yyjson_arr_iter iter;
+ yyjson_arr_iter_init(arr, &iter);
+ while ((val = yyjson_arr_iter_next(&iter)))
+ {
+ data_len = 0;
+ ptr_value = yyjson_val_write(val, YYJSON_WRITE_NOFLAG, &data_len);
+ printf("data: %s\n", ptr_value);
+ printf("len: %lu\n", data_len);
+
+ std::string jsonString = ptr_value;
+ if (json_to_proto(jsonString, CameraTimeRule))
+ {
+ printf("======>> json_to_proto done\n");
+ list.push_back(CameraTimeRule);
+ }
+ else
+ {
+ printf("======>> json_to_proto fail\n");
+ yyjson_doc_free(doc);
+ free(msgdata);
+ return false;
+ }
+ }
+
+ // Free the doc
+ yyjson_doc_free(doc);
+ }
+
+ free(msgdata);
+ free_reply_msg(repmsg);
+
return true;
}
diff --git a/util.cpp b/util.cpp
index 6f7b235..9eedab4 100644
--- a/util.cpp
+++ b/util.cpp
@@ -15,6 +15,7 @@
#include "3rdparty/bus_client/cbhomeclient.h"
#include "3rdparty/bus_client/message.h"
#include "proto/x86_64/sysset.pb.h"
+#include <vector>
using namespace protomsg;
using namespace std;
@@ -51,7 +52,7 @@
return json;
}
-extern "C" int bus_dbapi_get_json_data(const char * json, char ** pptr_data)
+extern "C" int bus_dbapi_get_json_data(const char * json, char ** pptr_data, yyjson_type *ptr_type)
{
/*{
"success": true,
@@ -118,7 +119,9 @@
// Get root["data"]
//yyjson_val *msg = yyjson_obj_get(root, "data");
- yyjson_val *data = yyjson_obj_get(root, "data");
+ yyjson_val *data = yyjson_obj_get(root, "data");
+
+ *ptr_type = yyjson_get_type(data);
ptr_value = yyjson_val_write(data, YYJSON_WRITE_NOFLAG, &data_len);
printf("data: %s\n", ptr_value);
printf("len: %lu\n", data_len);
@@ -133,42 +136,54 @@
return ret;
}
+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));
+
+ if (bus_client_request(handle, reqmsg, pptr_repmsg)) {
+ printf("======>> bus_client_reqest [%s] get [%s]\n", topic, (*pptr_repmsg)->data);
+ } else {
+ return false;
+ }
+
+ len = strlen((*pptr_repmsg)->data) + 1;
+
+ free(reqData);
+}
+
+
bool bus_dbapi_get(void *handle, const char* topic, google::protobuf::Message& message) {
- 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);
- } else {
- return false;
- }
+ yyjson_type type = YYJSON_TYPE_OBJ;
+ crepmsg *repmsg = NULL;
+ size_t len = 0;
+
+ 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))
+ if(0 == bus_dbapi_get_json_data((const char *)repmsg->data, &msgdata, &type))
{
- 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;
- }
+ 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(msgdata);
- free_reqmsg(reqmsg);
- free(reqData);
+ free_reply_msg(repmsg);
return true;
}
+
diff --git a/util.h b/util.h
index 85a077c..77298c1 100644
--- a/util.h
+++ b/util.h
@@ -2,9 +2,13 @@
#define C_BHOMEBUS_API_UTIL_H
#define DATA_URL_PREFIX(x) "/data/api-v" x
+#include "3rdparty/bus_client/message.h"
+#include <vector>
bool json_to_proto(const std::string &json, google::protobuf::Message& message);
bool proto_to_json(const google::protobuf::Message& message, std::string& json);
char *make_get_request(const char *topic);
bool bus_dbapi_get(void *handle, const char* topic, google::protobuf::Message& message);
+bool bus_dbapi_get_topic_data(void *handle, const char* topic, crepmsg **pptr_repmsg, size_t len);
+extern "C" int bus_dbapi_get_json_data(const char * json, char ** pptr_data, uint8_t *ptr_type);
#endif
\ No newline at end of file
--
Gitblit v1.8.0