From c5b9ce0c0cf973575a936df3aa928d4b7a7fa7d2 Mon Sep 17 00:00:00 2001
From: xuxiuxi <554325746@qq.com>
Date: 星期五, 08 三月 2019 13:09:26 +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/vss/dao/CamDevSqliteDao.h |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/QiaoJiaSystem/DataManagerServer/vss/dao/CamDevSqliteDao.h b/QiaoJiaSystem/DataManagerServer/vss/dao/CamDevSqliteDao.h
index b7f3873..89df109 100755
--- a/QiaoJiaSystem/DataManagerServer/vss/dao/CamDevSqliteDao.h
+++ b/QiaoJiaSystem/DataManagerServer/vss/dao/CamDevSqliteDao.h
@@ -26,6 +26,14 @@
         Json::Value responseJsonValue;
         responseJsonValue["message"] = "娣诲姞澶辫触锛�";
         responseJsonValue["success"] = "false";
+
+        std::map<std::string, std::string> whereKeyValues;
+        whereKeyValues["cam_dev_id"] = keyValuesToAdd["cam_dev_id"];
+        if (this->findCamDevList(whereKeyValues)["data"].size() > 0) {
+            responseJsonValue["message"] = "cam_dev_id exist锛�";
+            return responseJsonValue;
+        }
+
         QMutexLocker mutexLocker(m_mutexVisit);//TODO
         QSqlTableModel pModel(NULL, *m_db);
 
@@ -39,11 +47,11 @@
         rec.setGenerated("id", false);
 
         pModel.insertRecord(-1, rec);//TODO
-
         m_db->transaction();//寮�濮嬩簨鍔℃搷浣�
-
+        auto id1 = pModel.query().lastInsertId();
         if (pModel.submitAll()) {
             m_db->commit();//鎻愪氦
+            responseJsonValue["id"] = pModel.query().lastInsertId().toString().toStdString();
             responseJsonValue["success"] = "true";
             responseJsonValue["message"] = "娣诲姞鎴愬姛锛�";
         } else {

--
Gitblit v1.8.0