From 439a23896bda9c4e954092816354914e645579b6 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 10 六月 2019 09:37:13 +0800
Subject: [PATCH] 替换这个文件
---
QiaoJiaSystem/DataManagerServer/http_configserver.cpp | 171 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 121 insertions(+), 50 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
index 3f32428..691641e 100644
--- a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
+++ b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
@@ -262,6 +262,8 @@
VssDomainUnitTblController::instance()->registerHttpServices(_HttpSrvRetRecieve);
VssLocalSettingTblController::instance()->registerHttpServices(_HttpSrvRetRecieve);
CamDevController::instance()->registerHttpServices(_HttpSrvRetRecieve);
+ //todo
+ CamDevController::instance()->nsqMsgProducerSet(nsqMsgProducer);
VssUpperSvrTblController::instance()->registerHttpServices(_HttpSrvRetRecieve);
@@ -1164,11 +1166,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 +1220,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) +
@@ -1294,6 +1296,7 @@
if (m_rtmp[ip].userCounter == 0) {
m_rtmp[ip].appPC->stop();
m_rtmp[ip].appPC->wait();
+ delete m_rtmp[ip].appPC;
m_rtmp.erase(ip);
}
}
@@ -1318,28 +1321,41 @@
}
Json::Value value;
if (value_reader.isMember("id")) {
- if (value_reader["id"].isNull()) return "{\"ret_status\": \"id鍐呭鏈夎锛岃妫�鏌ワ紒\"}";
- value["connect_status"] = "True";
- std::string rtmp_url = appConfig.getStringProperty("srsAddr");
- rtmp_url.append("cam").append(value_reader["id"].asCString());
- value["video_url"] = rtmp_url;
- out = value.toStyledString();
-
- } else {
- //TODO
- //璋冪敤rtsp娴乺tsp://admin:a1234567@192.168.1.215:554/h264/ch1/main/av_stream
+ if (value_reader["id"].isNull()) {
+ //鏈湴瑙嗛婧� 绗竴娆℃祴璇曡繛鎺�
+ //TODO
+ //璋冪敤rtsp娴乺tsp://admin:a1234567@192.168.1.215:554/h264/ch1/main/av_stream
// std::string rtsp_url = "rtsp://" + username + ":" + passwd + "@" + ip + ":" + std::to_string(port) + "/h264/ch1/main/av_stream";
- bool ret = cam_connect_video_start(value_reader["str_ip"].asString(), value_reader["n_port"].asInt(), \
+ bool ret = cam_connect_video_start(value_reader["str_ip"].asString(), value_reader["n_port"].asInt(), \
value_reader["str_username"].asString(), value_reader["str_password"].asString(), \
value_reader["str_brand"].asString());
- if (!ret) {
+ if (!ret) {
+ return "{\"ret_status\": \"鍐呭鏈夎锛岃妫�鏌ワ紒\"}";
+ }
+ std::string rtmp_url = m_rtmp[value_reader["str_ip"].asCString()].appPC->getRtmp();
+ value["connect_status"] = "True";
+ value["video_url"] = rtmp_url;
+ out = value.toStyledString();
+ } else if (!value_reader["type"].isNull()) {
+
+ value["connect_status"] = "True";
+ std::string rtmp_url = appConfig.getStringProperty("srsAddr");
+ rtmp_url.append("cam").append(value_reader["id"].asCString());
+ value["video_url"] = rtmp_url;
+ out = value.toStyledString();
+ {
+ std::string topic = "VideoToImageMulth";
+ Json::Value json_cfg;
+ json_cfg["cam_startPublish"] = content;
+ std::string msg = json_cfg.toStyledString();
+ DBG("msg:" << msg);
+ nsqMsgProducer->Publish(topic, (void *) (&msg));
+ }
+ } else {
return "{\"ret_status\": \"鍐呭鏈夎锛岃妫�鏌ワ紒\"}";
}
-
- std::string rtmp_url = m_rtmp[value_reader["str_ip"].asCString()].appPC->getRtmp();
- value["connect_status"] = "True";
- value["video_url"] = rtmp_url;
- out = value.toStyledString();
+ } else {
+ return "{\"ret_status\": \"鍐呭鏈夎锛岃妫�鏌ワ紒\"}";
}
return out;
@@ -1357,19 +1373,32 @@
if (!reader.parse(content, value_reader)) {
return "{\"ret_status\": \"浼犺緭閿欒锛岃妫�鏌ワ紒\"}";
}
-
- //TODO
- //璋冪敤rtsp娴乺tsp://admin:a1234567@192.168.1.215:554/h264/ch1/main/av_stream
-// std::string rtsp_url = "rtsp://" + username + ":" + passwd + "@" + ip + ":" + std::to_string(port) + "/h264/ch1/main/av_stream";
- DBG("cam_connect_video_stop begin");
- bool ret = cam_connect_video_stop(value_reader["str_ip"].asString());
- if (!ret) {
- return "{\"ret_status\": \"浼犺緭閿欒锛岃妫�鏌ワ紒\"}";
- }
- DBG("cam_connect_video_stop end");
-
Json::Value value;
- value["ret_status"] = "ok_ack";
+ if (value_reader.isMember("id")) {
+ value["ret_status"] = "ok_ack";
+ cam_connect_video_stop(value_reader["str_ip"].asString());
+ {
+ std::string topic = "VideoToImageMulth";
+ Json::Value json_cfg;
+ json_cfg["cam_stopPublish"] = content;
+ std::string msg = json_cfg.toStyledString();
+ DBG("msg:" << msg);
+ nsqMsgProducer->Publish(topic, (void *) (&msg));
+ }
+ } else {
+ //TODO
+ //璋冪敤rtsp娴乺tsp://admin:a1234567@192.168.1.215:554/h264/ch1/main/av_stream
+// std::string rtsp_url = "rtsp://" + username + ":" + passwd + "@" + ip + ":" + std::to_string(port) + "/h264/ch1/main/av_stream";
+ DBG("cam_connect_video_stop begin");
+ bool ret = cam_connect_video_stop(value_reader["str_ip"].asString());
+ if (!ret) {
+ return "{\"ret_status\": \"浼犺緭閿欒锛岃妫�鏌ワ紒\"}";
+ }
+ DBG("cam_connect_video_stop end");
+
+ value["ret_status"] = "ok_ack";
+ }
+
std::string out = value.toStyledString();
@@ -1734,6 +1763,13 @@
return out;
}
+//{
+// "cookie": "abc", //闆嗙兢cookie
+// "fatherNodeName": "main@192.168.1.186", //寮曞鑺傜偣鍚嶇О,娣诲姞寮曞鑺傜偣鏃惰鍊间负" "(鍐呬负绌烘牸)
+// "culID" : "uuid", //闆嗙兢id
+// "culName" : "name", //闆嗙兢鍚嶇О
+// "devID" : "uuid" //璁惧id
+//}
std::string devHttpServer_c::addNode(std::string ip, unsigned int port, std::string content, PResponse &response) {
DBG("ip:" << ip << "; port:" << port);
DBG("content: " << content);
@@ -1746,25 +1782,32 @@
//#todo nodes have counter?
//#todo nodeName Automatic generated?
//#todo devId+num
+ // 鐢熸垚鑺傜偣id - uuid
std::string uuid = GetUUId::getUUID();
+ // 鑾峰彇褰撳墠鏈哄櫒ip
unsigned char ip_old[15] = {0};
std::string str_netIfName = appConfig.getStringProperty("netIfName");
GetIpAddress(str_netIfName.c_str(), ip_old);
std::string str_ip((char *) ip_old);
+ // 鑺傜偣鍚嶇О
std::string nodeName = uuid.append("@" + str_ip);
std::string cookie = value["cookie"].asString();
+ // 寮曞鑺傜偣
std::string FatherNodeName = value["fatherNodeName"].asString();
//#todo ClusterID ClusterName
+ // 闆嗙兢id
std::string clusterID = value["culID"].asString();
+ // 涓虹┖鍒欑敓鎴�,鍚﹀垯鐩存帴浣跨敤
clusterID = clusterID.size() > 0 ? clusterID : GetUUId::getUUID();
std::string clusterName = value["culName"].asString();
+
std::string devID = value["devID"].asString();
std::string devName = value["devName"].asString();
-
+ // erlang鑺傜偣淇濆瓨璺緞/opt/erlang/${uuid}
std::string path = std::string("/opt/erlang/").append(nodeName.substr(0, nodeName.find("@")));
if (erlangDbTool != nullptr) {
//gaunbi node
@@ -1776,6 +1819,7 @@
if (cookie.size() > 0 && (clusterID.size() > 0 || clusterName.size() > 0)) {
// erlangDbTool = new ErlangTool::ErlangDbTool(path, nodeName, cookie);
+ // #todo 杩涚▼鍚� -> get from argv[0]
string str_tmp = "DataWebserver";
erlangDbTool = new ErlangTool::ErlangDbTool(path, nodeName, cookie, clusterID, clusterName, str_tmp);
bool ret = erlangDbTool->initErlang();
@@ -1784,6 +1828,7 @@
ret = erlangDbTool->startNodeDb(FatherNodeName, devID);
if (ret) {
+ //濡傛灉鎴愬姛鍒欐洿鏂伴厤缃枃浠�
appConfig.setStringProperty("erlNode", nodeName);
appConfig.setStringProperty("erlCookie", cookie);
appConfig.setStringProperty("erlPath", path);
@@ -1796,6 +1841,7 @@
runAllApp();
// sleep(4);
} else {
+ // 鍚﹀垯鍒欑疆绌洪厤缃枃浠�
appConfig.setStringProperty("erlNode", "");
appConfig.setStringProperty("erlCookie", "");
appConfig.setStringProperty("erlPath", "");
@@ -1828,6 +1874,7 @@
ret = erlangDbTool->removeNode();
+ // 缃┖閰嶇疆鏂囦欢
appConfig.setStringProperty("erlNode", "");
appConfig.setStringProperty("erlCookie", "");
appConfig.setStringProperty("erlPath", "");
@@ -1945,15 +1992,20 @@
std::string Uuid = value["uuid"].asString();
std::string TableType = value["TableType"].asString();
std::string TableName = value["TableName"].asString();
+ // 闆嗙兢鍐呭悓姝�
int SyncType = atoi(value["SyncType"].asCString());
std::string BwType = value["BwType"].asString();
std::string StartTime = value["StartTime"].asString();
std::string EndTime = value["EndTime"].asString();
+ // 鏄惁涓婁紶
std::string UploadFlag = value["IsSync"].asString();
UploadFlag = UploadFlag.empty() ? "0" : UploadFlag;
+
+ // 搴曞簱闃堝��
std::string CmpThreshold = value["threshold"].asString();
CmpThreshold = CmpThreshold.empty() ? "60" : CmpThreshold;
+ // 鏄惁鍚敤
std::string Enabled = value["enabled"].asString();
Enabled = Enabled.empty() ? "1" : Enabled;
@@ -1985,9 +2037,7 @@
fieldValues.insert(std::make_pair("bwType", BwType));
fieldValues.insert(std::make_pair("startTime", StartTime));
fieldValues.insert(std::make_pair("endTime", EndTime));
-// #todo
fieldValues.insert(std::make_pair("create_by", createBy));
-
fieldValues.insert(std::make_pair("uploadFlag", UploadFlag));
fieldValues.insert(std::make_pair("cmpThreshold", CmpThreshold));
fieldValues.insert(std::make_pair("enabled", Enabled));
@@ -2012,7 +2062,6 @@
return "";
}
-
//// #todo 涓婁紶銆備粎榛戝悕鍗曘��
//// #TODO 鏍规嵁createBy鍒ゆ柇鏄惁闇�瑕佷笂浼�
// if (createBy == "analyDev" && BwType == "1") {
@@ -2023,7 +2072,7 @@
// Enabled);
// }
-
+ // send message to other CNode
erlangDbTool->sendMessage();
std::string str_result = std::string("{\"result\":").append("\"" + std::to_string(ret) + "\"}");
return str_result;
@@ -2093,9 +2142,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 + "\",");
@@ -2980,8 +3032,19 @@
}
}
- if (videoStVec.size() >= 1) {
- std::string strVideoName = strPath + videoStVec[0].ToVideoName();
+ std::vector<VideoName_s_t> videoStVec_;
+ auto imgTm_ = AppUtil::ParseFromHypenTimeStr(imgSt.m_timeStamp);
+ for (auto &item : videoStVec) {
+ auto resTime_ = AppUtil::ParseFromHypenTimeStr(item.m_timeStamp);
+ auto timeRes = difftime(mktime(&resTime_), mktime(&imgTm_));
+ if ((timeRes < 0 && difftime(mktime(&imgTm_), mktime(&resTime_)) >= 30) || (timeRes / 60 >= 3)) {
+ continue;
+ }
+ videoStVec_.emplace_back(item);
+ }
+
+ if (videoStVec_.size() >= 1) {
+ std::string strVideoName = strPath + videoStVec_[0].ToVideoName();
INFO("ImageName: " << imgKey << " SingleMatchVideo: " << strVideoName);
return strVideoName;
} else {
@@ -3309,11 +3372,19 @@
if (db_c.updateSdkRule(rule)) {
// if(rule.nIsRun==1)
- killVideoAnalysFromHCApp();
- sleep(1);
- runAllApp();
+// killVideoAnalysFromHCApp();
+// sleep(1);
+// runAllApp();
-
+ {
+ std::string topic = "VideoAnalysFromHC";
+ Json::Value json_cfg;
+ json_cfg["editSdkRule"] = content;
+ std::string msg = json_cfg.toStyledString();
+ DBG("msg:" << msg);
+ usleep(1000);
+ nsqMsgProducer->Publish(topic, (void *) (&msg));
+ }
return "{\"ret_status\": \"ok_ack\"}";
} else {
return "{\"ret_status\":\"鍐呭鏈夎锛岃妫�鏌ワ紒\"}";
--
Gitblit v1.8.0