From 4d1c2ee860222138fc7932225ea6d91e7483646a Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期一, 22 四月 2019 11:18:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.3nsq' into 1.3nsq

---
 QiaoJiaSystem/DataManagerServer/vss/controller/CamDevController.h |   64 ++++++++++++++++++++++++++-----
 1 files changed, 53 insertions(+), 11 deletions(-)

diff --git a/QiaoJiaSystem/DataManagerServer/vss/controller/CamDevController.h b/QiaoJiaSystem/DataManagerServer/vss/controller/CamDevController.h
index 77462e1..2656b88 100755
--- a/QiaoJiaSystem/DataManagerServer/vss/controller/CamDevController.h
+++ b/QiaoJiaSystem/DataManagerServer/vss/controller/CamDevController.h
@@ -8,6 +8,7 @@
 #include "vss/model/CamDev.h"
 #include "VssBaseController.h"
 #include <mysql++.h>
+#include <NsqMsgTool.hpp>
 
 using namespace std;
 
@@ -18,15 +19,25 @@
 private:
     /** 鎽勫儚澶磋澶囨瀯閫犲嚱鏁� */
     CamDevController() {}
+
 public:
     /** 鎽勫儚澶磋澶囧崟渚嬫ā寮� */
-    static CamDevController* instance() {
+    static CamDevController *instance() {
         static CamDevController instance;
         return &instance;
     }
+
+private:
+    //shared_ptr
+    BasicMsg::Nsq::NsqMsgProducer  *_nsqMsgProducer;
+public:
+    void nsqMsgProducerSet(BasicMsg::Nsq::NsqMsgProducer *nsqMsgProducer){
+        _nsqMsgProducer = nsqMsgProducer;
+    }
+
 public:
     /** 娉ㄥ唽{label}http鏈嶅姟 */
-    void registerHttpServices(HttpSrvRetRecieve& _HttpSrvRetRecieve) {
+    void registerHttpServices(HttpSrvRetRecieve &_HttpSrvRetRecieve) {
 
         _HttpSrvRetRecieve.setInfo("^/addCamDev$", "POST",
                                    std::bind(&CamDevController::addCamDev, this,
@@ -54,6 +65,7 @@
                                              std::placeholders::_3, std::placeholders::_4));
 
     }
+
 public:
     /** 娣诲姞鎽勫儚澶磋澶� */
     std::string addCamDev(std::string ip, unsigned int port, std::string content, PResponse &response) {
@@ -68,11 +80,17 @@
             Json::Value idJsonValue = requestJsonValue[CamDev_id];
             if (idJsonValue.type() != Json::ValueType::nullValue) {
                 camDevBuilder.addid(std::stoi((idJsonValue.asString())));
+            } else {
+                ERR("CamDev_id is null " << " is null");
+//                return responseJsonValue.toStyledString();
             }
 
             Json::Value cam_dev_idJsonValue = requestJsonValue[CamDev_cam_dev_id];
             if (cam_dev_idJsonValue.type() != Json::ValueType::nullValue) {
                 camDevBuilder.addcam_dev_id((cam_dev_idJsonValue.asString()));
+            } else {
+                ERR(CamDev_cam_dev_id << " is null");
+                return responseJsonValue.toStyledString();
             }
 
             Json::Value nameJsonValue = requestJsonValue[CamDev_name];
@@ -128,13 +146,12 @@
             Json::Value typeJsonValue = requestJsonValue[CamDev_type];
             if (typeJsonValue.type() != Json::ValueType::nullValue) {
                 camDevBuilder.addtype((typeJsonValue.asString()));
+            } else {
+                camDevBuilder.addtype("1");
             }
             auto keyValuesToAdd = camDevBuilder.buildCamDevMap();
             if (keyValuesToAdd.size() > 0) {
-                auto keyValuesToAdd = camDevBuilder.buildCamDevMap();
-                if (keyValuesToAdd.size() > 0) {
-                    responseJsonValue = CamDevSqliteDao::instance()->addCamDev(keyValuesToAdd);
-                }
+                responseJsonValue = CamDevSqliteDao::instance()->addCamDev(keyValuesToAdd);
             }
         }
         return responseJsonValue.toStyledString();
@@ -155,6 +172,18 @@
             }
 
         }
+
+        {
+            std::string topic = "VideoToImageMulth";
+            std::string topic1 = "VideoAnalysFromHC";
+            Json::Value json_cfg;
+            json_cfg["cam_del"] = content;
+            std::string msg = json_cfg.toStyledString();
+            DBG("msg:" << msg);
+            _nsqMsgProducer->Publish(topic, (void *) (&msg));
+            _nsqMsgProducer->Publish(topic1, (void *) (&msg));
+        }
+
         return responseJsonValue.toStyledString();
     }
 
@@ -233,9 +262,22 @@
                 camDevBuilder.addtype((typeJsonValue.asString()));
             }
             if (idJsonValue.type() != Json::ValueType::nullValue) {
-                responseJsonValue = CamDevSqliteDao::instance()->updateCamDev(camDevBuilder.buildCamDevMap(), "id", idJsonValue.asString());
+                responseJsonValue = CamDevSqliteDao::instance()->updateCamDev(camDevBuilder.buildCamDevMap(), "id",
+                                                                              idJsonValue.asString());
             }
         }
+
+        {
+            std::string topic = "VideoToImageMulth";
+            std::string topic1 = "VideoAnalysFromHC";
+            Json::Value json_cfg;
+            json_cfg["cam_edit"] = content;
+            std::string msg = json_cfg.toStyledString();
+            DBG("msg:" << msg);
+            _nsqMsgProducer->Publish(topic, (void *) (&msg));
+            _nsqMsgProducer->Publish(topic1, (void *) (&msg));
+        }
+
         return responseJsonValue.toStyledString();
     }
 
@@ -312,6 +354,8 @@
             Json::Value typeJsonValue = requestJsonValue[CamDev_type];
             if (typeJsonValue.type() != Json::ValueType::nullValue) {
                 camDevBuilder.addtype((typeJsonValue.asString()));
+            } else {
+                camDevBuilder.addtype("1");
             }
             responseJsonValue["message"] = "鏌ヨ鎴愬姛锛�";
             responseJsonValue["success"] = "true";
@@ -393,6 +437,8 @@
             Json::Value typeJsonValue = requestJsonValue[CamDev_type];
             if (typeJsonValue.type() != Json::ValueType::nullValue) {
                 camDevBuilder.addtype((typeJsonValue.asString()));
+            } else {
+                camDevBuilder.addtype("1");
             }
             responseJsonValue["message"] = "鏌ヨ鎴愬姛锛�";
             responseJsonValue["success"] = "true";
@@ -402,10 +448,6 @@
         return responseJsonValue.toStyledString();
     }
 };
-
-
-
-
 
 
 #endif //CAMDEV_CONTROLLER_H

--
Gitblit v1.8.0