From 93304b15aca04937c80dbb3cb64ab4b0c692f50d Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期六, 09 三月 2019 18:15:22 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ into yw.1.2.fixbug
---
QiaoJiaSystem/DataManagerServer/vss/controller/VssDevTblController.h | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/vss/controller/VssDevTblController.h b/QiaoJiaSystem/DataManagerServer/vss/controller/VssDevTblController.h
index 5051d0f..586f0a1 100755
--- a/QiaoJiaSystem/DataManagerServer/vss/controller/VssDevTblController.h
+++ b/QiaoJiaSystem/DataManagerServer/vss/controller/VssDevTblController.h
@@ -364,7 +364,22 @@
}
responseJsonValue["message"] = "鏌ヨ鎴愬姛锛�";
responseJsonValue["success"] = "true";
- responseJsonValue["data"] = VssDevTblDao::instance()->findJsonArray(string("select * from ") + VSSDevTbl_TABLE_NAME + " where 1 = 1", vssDevTblBuilder.buildVssDevTblMap());
+ auto devDataList = VssDevTblDao::instance()->findJsonArray(string("select * from ") + VSSDevTbl_TABLE_NAME
+ + " where 1 = 1", vssDevTblBuilder.buildVssDevTblMap());
+ for (int i = 0; i < devDataList.size(); i++) {
+ auto& devData = devDataList[i];
+ auto DevPubID = devData[VssDevTbl_DevPubID];
+ std::map<std::string, std::string> whereKeyValues;
+ whereKeyValues[CamDev_cam_dev_id] = DevPubID.asString();
+ auto camDevDataList = CamDevSqliteDao::instance()->findCamDevList(whereKeyValues)["data"];
+ devData["RemarkName"] = "";
+ if (camDevDataList.size() > 0) {
+ auto camDevData = camDevDataList[0];
+ devData["RemarkName"] = camDevData[CamDev_name].asString();
+ }
+ }
+ responseJsonValue["data"] = devDataList;
+
}
return responseJsonValue.toStyledString();
--
Gitblit v1.8.0