From 71156fd4aaa5f18ba9f95f9f08bc930a321e257c Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期一, 16 一月 2023 11:26:58 +0800
Subject: [PATCH] 完善摄像机接口, 增加实时轮询参数
---
dbapi.h | 7 +
main.cpp | 22 ++++-
util.cpp | 130 +++++++++++++++++---------------
util.h | 22 ++++-
camera.cpp | 21 ++---
5 files changed, 116 insertions(+), 86 deletions(-)
diff --git a/camera.cpp b/camera.cpp
index 56e85ce..638d4d2 100644
--- a/camera.cpp
+++ b/camera.cpp
@@ -56,19 +56,16 @@
using namespace protomsg;
// 鍔爂et鍙傛暟 runType 1: 瀹炴椂 0 杞
-bool dbapi_get_cameras_by_runtype(void *handle, std::vector<protomsg::Camera> &list) {
+bool dbapi_get_cameras_by_runType(void *handle, std::vector<protomsg::Camera> &list, char *runType, bool gb28181) {
const char *topic = DATA_URL_PREFIX("/camera/getCamerasByRunType");
+ if (gb28181) {
+ topic = DATA_URL_PREFIX("/gb28181/camera/getCamerasByRunType)");
+ }
- bool ret = bus_dbapi_get_list(handle, topic, list);
+ std::map<string, string> params;
+ params["runType"] = runType;
+ bool ret = bus_dbapi_get_list(handle, topic, list, params);
+ params.clear();
return ret;
-}
-
-// 鍔爂et鍙傛暟 runType 1: 瀹炴椂 0 杞
-bool dbapi_get_gb28181_cameras_by_runtype(void *handle, std::vector<protomsg::Camera> &list) {
- const char *topic = DATA_URL_PREFIX("/gb28181/camera/getCamerasByRunType");
-
- bool ret = bus_dbapi_get_list(handle, topic, list);
-
- return ret;
-}
+}
\ No newline at end of file
diff --git a/dbapi.h b/dbapi.h
index ff58ef4..65d8228 100644
--- a/dbapi.h
+++ b/dbapi.h
@@ -1,6 +1,7 @@
#ifndef C_BHOME_BUS_DBAPIS_H
#define C_BHOME_BUS_DBAPIS_H
+#include <map>
#include <vector>
#include "proto/x86_64/fileanalysis.pb.h"
@@ -13,11 +14,11 @@
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_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);
+bool dbapi_get_cameras_by_runType(void *handle, std::vector<protomsg::Camera> &list, char *runType, bool gb28181);
bool dbapi_get_gb28181_cameras_by_runtype(void *handle, std::vector<protomsg::Camera> &list);
bool dbapi_get_sdk_channel_set(void *handle, std::vector<protomsg::SdkChanSet> &list);
bool dbapi_get_sdks(void *handle, std::vector<protomsg::Sdk> &list);
diff --git a/main.cpp b/main.cpp
index 34b901d..0262e12 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,5 +1,6 @@
#include <stdio.h>
+#include <map>
#include <memory>
#include <string>
#include <thread>
@@ -44,15 +45,24 @@
// }
// 鏃堕棿瑙勫垯
- std::vector<protomsg::CameraTimerule> list;
- if (dbapi_get_time_rules(handle, list)) {
+ // std::vector<protomsg::CameraTimerule> list;
+ // if (dbapi_get_time_rules(handle, list)) {
+ // for (unsigned int i = 0; i < list.size(); i++) {
+ // printf("CameraTimerule: %s\n", list[i].id().c_str());
+ // }
+ // }
+
+ // 绯荤粺鎺堟潈淇℃伅
+ // printf("isExpired:%d\n", dbapi_get_server_get_is_sys_expired(handle));
+
+ // 鎽勫儚鏈�
+ std::vector<protomsg::Camera> list;
+ char *runType = (char *)"1"; // 1 瀹炴椂 0 杞
+ if (dbapi_get_cameras_by_runType(handle, list, runType, false)) {
for (unsigned int i = 0; i < list.size(); i++) {
- printf("CameraTimerule: %s\n", list[i].id().c_str());
+ printf("Camera: %s\n", list[i].id().c_str());
}
}
-
- //绯荤粺鎺堟潈淇℃伅
- printf("isExpired:%d\n", dbapi_get_server_get_is_sys_expired(handle));
return 0;
}
diff --git a/util.cpp b/util.cpp
index 65c265e..42e8db7 100644
--- a/util.cpp
+++ b/util.cpp
@@ -54,19 +54,19 @@
return json;
}
-char *make_get_request(const char *topic, const std::map<string, string> *query_params) {
+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);
// 濉厖璇锋眰鍙傛暟
- if (query_params != NULL) {
+ 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> t_map = *query_params;
std::map<string, string>::iterator iter;
- for (iter = t_map.begin(); iter != t_map.end(); 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);
@@ -90,61 +90,54 @@
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)
-{
+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)
- {
+ 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);
+ 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;
- }
+ 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));
// Get root["data"]
//yyjson_val *msg = yyjson_obj_get(root, "data");
- yyjson_val *data = yyjson_obj_get(root, data_name);
+ 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);
+ 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;
}
@@ -185,7 +178,7 @@
"success": true
}*/
const char *success_name = "success";
- const char * data_name = "data";
+ const char *data_name = "data";
if (NULL == *pptr_data) {
return -1;
@@ -198,6 +191,24 @@
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;
+ }
+
+ len = strlen((*pptr_repmsg)->data) + 1;
+
+ 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)) {
@@ -305,36 +316,33 @@
淇敼鍐呭 : 鏂扮敓鎴愬嚱鏁�
*****************************************************************************/
-int get_value_by_key(char *json, const char *key, char **pptr_data)
-{
+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;
- }
+ 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 *ptr_value = yyjson_val_write(val, YYJSON_WRITE_NOFLAG, &data_len);
- printf("data: %s\n", ptr_value);
- printf("len: %lu\n", data_len);
+ char *val_str = (char *)yyjson_get_str(val);
+ printf("val: %s\n", val_str);
+ if (NULL == val_str) {
+ yyjson_doc_free(doc);
+ return -1;
+ }
- *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);
+ char *ptr_value = yyjson_val_write(val, YYJSON_WRITE_NOFLAG, &data_len);
+ printf("data: %s\n", ptr_value);
+ printf("len: %lu\n", data_len);
- return 0;
+ *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;
}
diff --git a/util.h b/util.h
index 9e643b7..3cd6741 100644
--- a/util.h
+++ b/util.h
@@ -32,15 +32,14 @@
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);
+bool bus_dbapi_get_topic_data(void *handle, const char *topic, crepmsg **pptr_repmsg, size_t len, std::map<string, string> ¶ms);
+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, const char *flag_key, const char *data_key, 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
@@ -120,4 +119,19 @@
return iRet;
}
+template <class T>
+bool bus_dbapi_get_list(void *handle, const char *topic, T &list, std::map<string, string> ¶ms) {
+ 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
\ No newline at end of file
--
Gitblit v1.8.0