From e783dc858cbf3370c80a46b6bfef6d14580b6764 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期五, 13 一月 2023 18:07:14 +0800
Subject: [PATCH] code format
---
util.cpp | 239 +++++++++++++++++++++++++++++------------------------------
1 files changed, 117 insertions(+), 122 deletions(-)
diff --git a/util.cpp b/util.cpp
index 744ea88..d823797 100644
--- a/util.cpp
+++ b/util.cpp
@@ -5,15 +5,15 @@
#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>
@@ -23,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.always_print_primitive_fields = true;
options.preserve_proto_field_names = true;
+
return MessageToJsonString(message, &json, options).ok();
}
@@ -52,50 +54,50 @@
return json;
}
-extern "C" int bus_dbapi_get_json_data(const char * json, char ** pptr_data, yyjson_type *ptr_type)
-{
+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,
- }
- }*/
+ "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
+ /*{
+"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
}*/
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 *ptr_value = NULL;
+ const char *success_name = "success";
+ 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);
@@ -104,88 +106,82 @@
// Get root["success"]
yyjson_val *success = yyjson_obj_get(root, success_name);
- int success_val = yyjson_get_bool(success);
+ int success_val = yyjson_get_bool(success);
printf("success: %d\n", success_val);
- if(!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");
+ 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");
+ // 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);
+ 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;
}
-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 {
- free(reqData);
- return false;
- }
+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));
- 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);
+ 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;
}
- 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");
- }
+ 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_reply_msg(repmsg);
+ free_reply_msg(repmsg);
return bRet;
}
@@ -193,44 +189,43 @@
/*****************************************************************************
鍑� 鏁� 鍚� : bus_dbapi_get_str
鍔熻兘鎻忚堪 : 鑾峰彇璁㈤槄涓婚娑堟伅瀛楃涓诧紝杩斿洖鐨勫唴瀛樿皟鐢ㄨ�呴渶瑕佹墜宸ヨ皟鐢╢ree鍑芥暟閲婃斁
- 杈撳叆鍙傛暟 : void *handle
- const char* topic
- char **pptr_str
+ 杈撳叆鍙傛暟 : 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;
+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 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);
+ 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;
- }
+ if (0 == iRet) {
+ printf("======>> protomsg: %s\n", msgdata);
+ bRet = true;
+ }
- *pptr_str = msgdata;
+ *pptr_str = msgdata;
free(msgdata);
- free_reply_msg(repmsg);
+ free_reply_msg(repmsg);
return bRet;
}
--
Gitblit v1.8.0