xuxiuxi
2019-03-09 08d77311888e30eb63e19e53890037d4a95818d9
Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c++ into yw.1.2.fixbug

# Conflicts:
# QiaoJiaSystem/DataManagerServer/http_configserver.cpp
add remarkname to findDevList
1个文件已修改
17 ■■■■■ 已修改文件
QiaoJiaSystem/DataManagerServer/vss/controller/VssDevTblController.h 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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();