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

---
 dbapi.h |   37 +++++++++++++++++++++----------------
 1 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/dbapi.h b/dbapi.h
index adcdbc4..7bcf746 100644
--- a/dbapi.h
+++ b/dbapi.h
@@ -1,27 +1,32 @@
 #ifndef C_BHOME_BUS_DBAPIS_H
 #define C_BHOME_BUS_DBAPIS_H
 
+#include <map>
 #include <vector>
 
-#include "proto/x86_64/sysset.pb.h"
-#include "proto/x86_64/protomsg.pb.h"
-#include "proto/x86_64/fileanalysis.pb.h"
+#include "fileanalysis.pb.h"
+#include "protomsg.pb.h"
+#include "sysset.pb.h"
 
 using namespace std;
 
-bool dbapi_get_server_info(void *handle, protomsg::LocalConfig & message);
-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_camera_rules(void *handle, std::vector<protomsg::CameraAndRules> & list);
+bool dbapi_get_server_info(void *handle, protomsg::LocalConfig &message);
+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);
-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);
+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);
 
-bool dbapi_get_doing_stacks(void *handle, std::vector<protomsg::FileStack> & list);
-bool dbapi_get_polygons(void *handle, std::vector<protomsg::CameraPolygon> & list);
-bool dbapi_get_polygon_relations(void *handle, std::vector<protomsg::CameraPolygonRelation> & list);
+bool dbapi_get_doing_stacks(void *handle, std::vector<protomsg::FileStack> &list);
+bool dbapi_get_polygons(void *handle, std::vector<protomsg::CameraPolygon> &list);
+bool dbapi_get_polygon_relations(void *handle, std::vector<protomsg::CameraPolygonRelation> &list);
 bool dbapi_get_server_get_is_sys_expired(void *handle);
-#endif
\ No newline at end of file
+bool dbapi_get_json_by_cameralist(std::vector<protomsg::Camera> &list, string &json);
+
+#endif

--
Gitblit v1.8.0