From 6e1fff143f2669f7771301d583fff99de7995cdd Mon Sep 17 00:00:00 2001
From: xuxiuxi <554325746@qq.com>
Date: 星期二, 05 三月 2019 09:21:02 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c++ into yw.1.2.fixbug

---
 QiaoJiaSystem/DataManagerServer/http_configserver.cpp |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
index 6d83ede..8aea381 100644
--- a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
+++ b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
@@ -28,6 +28,7 @@
 #include "vss/controller/VssDomainUnitTblController.h"
 #include "vss/controller/VssLocalSettingTblController.h"
 #include "vss/controller/VssUpperSvrTblController.h"
+#include "vss/controller/CamDevController.h"
 
 using namespace std;
 
@@ -250,12 +251,14 @@
 
 
     BaseDao::initConnection();
-    VssLocalSettingTblSqliteDao::instance()->setLDBTool(&db_c);
+    BaseSqliteDao::setLDBTool(&db_c);
     VssDevTblController::instance()->registerHttpServices(_HttpSrvRetRecieve);
     VssChannelTblController::instance()->registerHttpServices(_HttpSrvRetRecieve);
     VssDomainUnitTblController::instance()->registerHttpServices(_HttpSrvRetRecieve);
     VssLocalSettingTblController::instance()->registerHttpServices(_HttpSrvRetRecieve);
+    CamDevController::instance()->registerHttpServices(_HttpSrvRetRecieve);
     VssUpperSvrTblController::instance()->registerHttpServices(_HttpSrvRetRecieve);
+
 
     _HttpSrvRetRecieve.start();
     _HttpSrvRetRecieve.waitForShutDown();
@@ -1060,6 +1063,7 @@
         rec.str_username = QString::fromStdString(value["str_username"].asString());
         rec.str_password = QString::fromStdString(value["str_password"].asString());
         rec.str_brand = QString::fromStdString(value["str_brand"].asString());
+        rec.str_reserved = QString::fromStdString(value["str_reserved"].asString());
         type = value["n_type"].asInt();
 //        rec_sdk_old = db_c.searchCamSdkTableByCamId(rec.str_cam_dev_id);
 
@@ -1859,7 +1863,8 @@
 }
 
 std::string devHttpServer_c::createDatabase(std::string ip, unsigned int port, std::string content,
-                                            PResponse &response) {    DBG("ip:" << ip << "; port:" << port);
+                                            PResponse &response) {
+    DBG("ip:" << ip << "; port:" << port);
     DBG("content: " << content);
     if (erlangDbTool == nullptr) {
         response->write(SimpleWeb::StatusCode::server_error_not_implemented, "{\"error\":\"鑺傜偣涓嶅瓨鍦� \"}");

--
Gitblit v1.8.0