From 051c6863dd418c9cfbca787e449fbdeadde977c7 Mon Sep 17 00:00:00 2001
From: pans <pansen626@sina.com>
Date: 星期二, 16 四月 2019 17:17:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.3nsq' into 1.3nsq
---
QiaoJiaSystem/DataManagerServer/http_configserver.cpp | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
index 5840b92..18c9627 100644
--- a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
+++ b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
@@ -1164,11 +1164,11 @@
std::string brand) const {
if (brand == "haikang") {
- bool ret = getHKDevSerialNumber(ip.c_str(), port, username.c_str(), passwd.c_str());
- if (!ret) {
- ERR("getHKDevSerialNumber ERR");
- return false;
- }
+// bool ret = getHKDevSerialNumber(ip.c_str(), port, username.c_str(), passwd.c_str());
+// if (!ret) {
+// ERR("getHKDevSerialNumber ERR");
+// return false;
+// }
//璋冪敤rtsp娴乺tsp://admin:a1234567@192.168.1.215:554/h264/ch1/main/av_stream
port = 554;//TODO
// std::string rtsp_url = "rtsp://" + username + ":" + passwd + "@" + ip + ":" + std::to_string(port) +
@@ -1218,11 +1218,11 @@
return false;//TODO
} else if (brand == "yushi") {
// rtsp://admin:admin@192.168.8.8:554/video1
- bool ret = getUVDevSerialNumber(ip.c_str(), username.c_str(), passwd.c_str());
- if (!ret) {
- ERR("getUVDevSerialNumber ERR");
- return false;
- }
+// bool ret = getUVDevSerialNumber(ip.c_str(), username.c_str(), passwd.c_str());
+// if (!ret) {
+// ERR("getUVDevSerialNumber ERR");
+// return false;
+// }
port = 554;
// std::string rtsp_url = "rtsp://" + username + ":" + passwd + "@" + ip + ":" + std::to_string(port) +
@@ -2140,9 +2140,12 @@
// auto resType = erlangDbTool->findAllTypeInfo();
string json = "[";
for (auto &item : resDB) {
+ //-------------------maybe delete ?------------------------
if (item.second.tableName.find("lt_") == 0) {
continue;
}
+ //-------------------maybe delete end----------------------
+
string subJson = "{ ";
subJson.append("\"uuid\":\"" + item.second.uuid + "\",");
subJson.append("\"tableName\":\"" + item.second.tableName + "\",");
@@ -3334,8 +3337,7 @@
rule.strLine = value["strLine"].asCString();
rule.strExLine = value["strExLine"].asCString();
- if(!value["strPerimeterObjType"].empty())
- {
+ if (!value["strPerimeterObjType"].empty()) {
rule.strPerimeterObjType = value["strPerimeterObjType"].asCString();
}
if (rule.strCamId.isEmpty()) {
--
Gitblit v1.8.0