zhangjixing

2019-01-15 abd9036f024a77d22b47a108bc88b27b9732e3c5

 QiaoJiaSystem/DataManagerServer/http_configserver.cpp

@@ -997,7 +997,8 @@
    std::string out = value.size() > 0 ? value.toStyledString() : "[]";
    return out;
}

#define ADD_CAMERA 0
#define EDIT_CAMERA 1
//编辑摄像机
std::string devHttpServer_c::cam_edit(std::string ip, unsigned int port, std::string content, PResponse &response) {
    DBG("ip:" << ip << "; port:" << port);
@@ -1009,13 +1010,14 @@
    Record_Cam_Dev rec;
    Record_Cam_Sdk rec_sdk_old;
    Record_Cam_Sdk rec_sdk;

    int type=-1;
    int dev_type = db_c.searchDevTypeFromConfigTable();
    if (DEV_STORAGE == dev_type) {
        return "{\"ret_status\": \"内容有误，请检查！\"}";
    }

    if (reader.parse(content, value)) {

        unsigned char serialnumber[SERIALNO_LEN] = {0};
        ret = getDevSerialNumber(value["str_ip"].asCString(), value["n_port"].asInt(),
                                 value["str_username"].asCString(), \
@@ -1034,18 +1036,48 @@
        rec.str_username = QString::fromStdString(value["str_username"].asString());
        rec.str_password = QString::fromStdString(value["str_password"].asString());
        rec.str_brand = QString::fromStdString(value["str_brand"].asString());

        type=value["n_type"].asInt();
//        rec_sdk_old = db_c.searchCamSdkTableByCamId(rec.str_cam_dev_id);

//        rec_sdk.str_cam_dev_id = rec.str_cam_dev_id;
//        rec_sdk.str_sdks = QString::fromStdString(value["str_sdks"].asString());
//        rec_sdk.str_det_thr = QString::fromStdString(value["str_det_thr"].asString());
//        rec_sdk.str_cmp_thr = QString::fromStdString(value["str_cmp_thr"].asString());

        ret = db_c.updateCamAndSdkTable(rec, rec_sdk);
        if (!ret) {
            return "err_db_content";
        bool is_exist=db_c.searchCamDevByCamId(rec.str_cam_dev_id);
        if(ADD_CAMERA == type )
        {
           if(is_exist)
           {
               return "{\"ret_status\": \"内容有误，请检查！\"}";
           }
           else
           {
               ret =db_c.insertCamDevTable(rec);
               if (!ret) {
                   return "err_db_content";
               }
           }
        }
        else if(EDIT_CAMERA == type )
        {
            if(is_exist)
            {
                ret = db_c.updateCamDevTable(rec);
                if (!ret) {
                    return "err_db_content";
                }
            }
            else
            {
                 return "{\"ret_status\": \"内容有误，请检查！\"}";
            }
        }
        else
        {
             return "{\"ret_status\": \"内容有误，请检查！\"}";
        }


    } else {
        return "{\"ret_status\": \"传输错误，请检查！\"}";
    }
@@ -1055,13 +1087,14 @@
        runAllApp();
    }
    //edit camera's sdks
//    else/* if ((rec_sdk_old.str_sdks != rec_sdk.str_sdks) ||
//             (rec_sdk_old.str_det_thr != rec_sdk.str_det_thr) ||
//             (rec_sdk_old.str_cmp_thr != rec_sdk.str_cmp_thr)) */{
//        killVideoAnalysFromHCApp();
//        sleep(1);
//        runAllApp();
//    }
    else/* if ((rec_sdk_old.str_sdks != rec_sdk.str_sdks) ||
             (rec_sdk_old.str_det_thr != rec_sdk.str_det_thr) ||
             (rec_sdk_old.str_cmp_thr != rec_sdk.str_cmp_thr)) */
    {
        killVideoAnalysFromHCApp();
        sleep(1);
        runAllApp();
    }

    Json::Value value_out;
    value_out["str_cam_dev_id"] = rec.str_cam_dev_id.toStdString();
@@ -1673,6 +1706,7 @@
                appConfig.setStringProperty("erlCookie", cookie);
                appConfig.setStringProperty("erlPath", path);
                appConfig.setStringProperty("erlFatherNode", FatherNodeName);
                appConfig.setStringProperty("clusterID", clusterID);
                appConfig.save();
//                erlangDbTool->findAllNode();
                //face search server reboot
@@ -1684,6 +1718,7 @@
                appConfig.setStringProperty("erlCookie", "");
                appConfig.setStringProperty("erlPath", "");
                appConfig.setStringProperty("erlFatherNode", "");
                appConfig.setStringProperty("clusterID", "");
                appConfig.save();
                delete erlangDbTool;
                erlangDbTool = nullptr;