From 946823215bac2c859df843f7b01636f5fda34ed4 Mon Sep 17 00:00:00 2001
From: cheliequan <liequanche@126.com>
Date: 星期五, 13 一月 2023 20:32:23 +0800
Subject: [PATCH] 重构util接口，支持按照key查找json，并转换vector list
---
rule.cpp | 24 ++++++++
dbapi.h | 2
util.cpp | 100 ++++++++++++++++++++-------------
util.h | 16 ++++
4 files changed, 101 insertions(+), 41 deletions(-)
diff --git a/dbapi.h b/dbapi.h
index 291f1bc..ff58ef4 100644
--- a/dbapi.h
+++ b/dbapi.h
@@ -13,6 +13,8 @@
bool dbapi_get_poll_config(void *handle, protomsg::PollConfig &message);
bool dbapi_get_stack_config(void *handle, protomsg::FileAnalysisSetting &message);
bool dbapi_get_time_rules(void *handle, std::vector<protomsg::CameraTimerule> &list);
+bool dbapi_get_dayctls(char *timeRules, std::vector<protomsg::DayCtl> & list);
+bool dbapi_get_timeranges(char *datactls, std::vector<protomsg::TimeRange> & list);
bool dbapi_get_camera_rules(void *handle, std::vector<protomsg::CameraAndRules> &list);
bool dbapi_get_cameras_by_runtype(void *handle, std::vector<protomsg::Camera> &list);
diff --git a/rule.cpp b/rule.cpp
index 23abaff..9215e4a 100644
--- a/rule.cpp
+++ b/rule.cpp
@@ -12,6 +12,30 @@
return ret;
}
+bool dbapi_get_dayctls(char *timeRules, std::vector<protomsg::DayCtl> & list)
+{
+ const char * flag_key = NULL;
+
+ const char * data_key = "time_rule";
+
+ bool ret = bus_dbapi_get_list(timeRules, flag_key, data_key, list);
+
+ return ret;
+
+}
+
+bool dbapi_get_timeranges(char *datactls, std::vector<protomsg::TimeRange> & list)
+{
+ const char * flag_key = NULL;
+
+ const char * data_key = "time_range";
+
+ bool ret = bus_dbapi_get_list(datactls, flag_key, data_key, list);
+
+ return ret;
+
+}
+
bool dbapi_get_camera_rules(void *handle, std::vector<protomsg::CameraAndRules> &list) {
const char *topic = DATA_URL_PREFIX("/camera/rule/findAll");
diff --git a/util.cpp b/util.cpp
index 50803e1..65c265e 100644
--- a/util.cpp
+++ b/util.cpp
@@ -90,6 +90,65 @@
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;
+ 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)
+ {
+ return -1;
+ }
+
+
+ // Read JSON and get root
+ yyjson_doc *doc = yyjson_read(json, strlen(json), 0);
+ yyjson_val *root = yyjson_doc_get_root(doc);
+
+ 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);
+ 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));
+
+ // Get root["data"]
+ //yyjson_val *msg = yyjson_obj_get(root, "data");
+ yyjson_val *data = yyjson_obj_get(root, data_name);
+
+ *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;
+}
+
extern "C" int bus_dbapi_get_json_data(const char *json, char **pptr_data, yyjson_type *ptr_type) {
/*{
"success": true,
@@ -125,52 +184,15 @@
"msg": "",
"success": true
}*/
- int ret = -1;
- size_t data_len = 0;
- const char *ptr_value = NULL;
const char *success_name = "success";
- const char *msg_name = "msg";
+ const char * data_name = "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);
-
- 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));
-
- // Get root["data"]
- // yyjson_val *msg = 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);
-
- 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;
+ 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) {
diff --git a/util.h b/util.h
index 93bc335..9e643b7 100644
--- a/util.h
+++ b/util.h
@@ -32,12 +32,15 @@
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_by_key(const char * json, const char *flag_key,
+ const char *data_key, char ** pptr_data,
+ yyjson_type *ptr_type);
extern "C" int bus_dbapi_get_json_data(const char *json, char **pptr_data, uint8_t *ptr_type);
bool bus_dbapi_get_str(void *handle, const char *topic, char **pptr_str);
int get_value_by_key(char *json, const char *key, char **pptr_data);
template <class T>
-bool bus_dbapi_get_list(char *json, T &list) {
+bool bus_dbapi_get_list(char *json, const char *flag_key, const char *data_key, T &list) {
char *ptr_value = NULL;
size_t data_len = 0;
//get the topic json data
@@ -51,7 +54,7 @@
char *msgdata = (char *)malloc(msglen);
memset(msgdata, 0, msglen);
- if (0 == bus_dbapi_get_json_data(json, &msgdata, &type)) {
+ if (0 == bus_dbapi_get_json_data_by_key(json, flag_key, data_key, &msgdata, &type)) {
printf("======>> protomsg: %s\n", msgdata);
}
@@ -95,6 +98,14 @@
}
template <class T>
+bool bus_dbapi_get_list(char *json, T &list) {
+ const char *success_name = "success";
+ const char *data_name = "data";
+
+ return bus_dbapi_get_list(json, success_name, data_name, list);
+}
+
+template <class T>
bool bus_dbapi_get_list(void *handle, const char *topic, T &list) {
crepmsg *repmsg = NULL;
size_t len = 0;
@@ -108,4 +119,5 @@
free_reply_msg(repmsg);
return iRet;
}
+
#endif
\ No newline at end of file
--
Gitblit v1.8.0