From dccc1ca1304dc1fcb86c8e24edd491509269b3e7 Mon Sep 17 00:00:00 2001
From: cheliequan <liequanche@126.com>
Date: 星期日, 29 一月 2023 14:44:52 +0800
Subject: [PATCH] 解决编译告警

---
 util.h |   83 ++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 80 insertions(+), 3 deletions(-)

diff --git a/util.h b/util.h
index 1533e90..e7b8702 100644
--- a/util.h
+++ b/util.h
@@ -26,14 +26,49 @@
 
 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);
+char *make_get_request(const char *topic, const std::map<string, string> *query_params);
+
 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);
+bool bus_dbapi_get_topic_data(void *handle, const char *topic, crepmsg **pptr_repmsg, size_t len, std::map<string, string> &params);
+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_json( T &list, string &json) 
+{
+    using TMPT = typename std::remove_reference<decltype(*list.begin())>::type;
+    TMPT t;
+    string jsonString;
+    int len = list.size();
+    bool bRet = false;
+    jsonString += "[";
+	
+    for ( int i= 0 ; i < len ; i++ )
+    {
+     	string tmpjsonString;
+        bRet = proto_to_json(list[i], tmpjsonString);
+		if ( (len > 1) &&(i < len - 1))
+		{
+		    tmpjsonString += ",";
+		}
+		jsonString += tmpjsonString;
+    }	
+
+    jsonString += "]";
+
+    json = jsonString;
+    return bRet;
+}
+
+
+template <class T>
+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
@@ -47,7 +82,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);
     }
 
@@ -91,6 +126,32 @@
 }
 
 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(char *json, bool is_array, T &list) {
+    char *success_name = NULL;
+    char *data_name = NULL;   
+    if ( is_array )
+    {
+	    success_name = NULL;
+	    data_name = NULL;        
+    }
+	else
+	{
+	    success_name = (char *)"success";
+	    data_name = (char *)"data";   	    
+	}
+
+    return bus_dbapi_get_list(json, (const char *)success_name, (const char *)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;
@@ -104,4 +165,20 @@
     free_reply_msg(repmsg);
     return iRet;
 }
-#endif
\ No newline at end of file
+
+template <class T>
+bool bus_dbapi_get_list(void *handle, const char *topic, T &list, std::map<string, string> &params) {
+    crepmsg *repmsg = NULL;
+    size_t len = 0;
+    bool iRet = false;
+    iRet = bus_dbapi_get_topic_data(handle, topic, &repmsg, len, params);
+    if ((false == iRet) || (NULL == repmsg)) {
+        return false;
+    }
+
+    iRet = bus_dbapi_get_list(repmsg->data, list);
+    free_reply_msg(repmsg);
+    return iRet;
+}
+
+#endif

--
Gitblit v1.8.0