V1.2.5

1、修改了WebAPI的返回值，不为0都是报错

CMakeLists.txt

@@ -154,6 +154,7 @@ file(GLOB GLOBAL_SRC
 
 add_subdirectory(TransmitterSwitch)
 add_subdirectory(show1)
+# add_subdirectory(show2)
 
 
 

TransmitterSwitch/WebAPI/FromWebAPI.cpp

@@ -53,15 +53,15 @@ bool FromWebAPI::initWebApi(const QString& url, const QString& serverID, const Q
     LH_WRITE_LOG_DEBUG(QString("ServerID:%1").arg(serverID));
     LH_WRITE_LOG_DEBUG(QString("ServerKey:%1").arg(serverKey));
 
-    auto pHttp = m_httpApi->DBInit(url.toStdString().c_str());
+    auto pHttp = m_httpApi->DBInit(url.toStdString().c_str(), true);
     
     int ret = 0;
 
 #ifdef QT_DEBUG
     /* 获取服务器列表 */
-    char serverList[8192];
-    ret = m_httpApi->DBGetServerList(serverList, 8192);
-    if(ret < 0)
+    char serverList[8192]={0};
+    ret = m_httpApi->DBGetServerList(serverList, 8192-1);
+    if(ret != 0)
     {
         LH_WRITE_ERROR(QString("Get server list failed:%1, error info:%2").arg(ret).arg(m_httpApi->DoGetLastError(&ret)));
         return false;
@@ -70,8 +70,9 @@ bool FromWebAPI::initWebApi(const QString& url, const QString& serverID, const Q
 #endif
 
     /* 登录，第二个参数是限制的服务 */
-    ret = m_httpApi->DBLogin("", serverID, serverKey, m_userToken, true, pHttp);
-    if(ret < 0)
+    // ret = m_httpApi->DBLogin("", serverID, serverKey, m_userToken, true, pHttp);
+    ret = m_httpApi->DBLogin("", serverID, "ESM8C", m_userToken, true, pHttp);
+    if(ret != 0)
     {
         LH_WRITE_ERROR(QString("Login failed:%1, error info:%2").arg(ret).arg(m_httpApi->DoGetLastError(&ret)));
         return false;
@@ -95,7 +96,7 @@ bool FromWebAPI::getDeviceInfo(QMap<QString, DeviceInfo>& mapDevice)
     QString strCmd = QString::fromStdString(json0.dump());
     QString strRet;
     auto ret = m_httpApi->DBDoInterface(enDBOperatorType::EDBOT_Select, strCmd, strRet, true);
-    if(ret < 0)
+    if(ret != 0)
     {
         LH_WRITE_ERROR(QString("从数据库获取设备失败:%1, 错误信息:%2").arg(ret).arg(m_httpApi->DoGetLastError(&ret)));
         return false;
@@ -257,7 +258,7 @@ bool FromWebAPI::insertData(QList<ExecPlanItemInfo>& list)
     QString strCmd = QString::fromStdString(json0.dump());
     QString strRet;
     auto ret = m_httpApi->DBDoInterface(enDBOperatorType::EDBOT_BatchTransAction, strCmd, strRet, true);
-    if(ret < 0)
+    if(ret != 0)
     {
         LH_WRITE_ERROR(QString("写入EQM数据库失败:%1, 错误信息:%2").arg(ret).arg(m_httpApi->DoGetLastError(&ret)));
         return false;
@@ -287,7 +288,7 @@ bool FromWebAPI::getExecPlanData(QList<ExecPlanItemInfo>& list)
     QString strCmd = QString::fromStdString(json0.dump());
     QString strRet;
     auto ret = m_httpApi->DBDoInterface(enDBOperatorType::EDBOT_Select, strCmd, strRet, true);
-    if(ret < 0)
+    if(ret != 0)
     {
         LH_WRITE_ERROR(QString("从EQM获取tExecPlan表格数据失败:%1, 错误信息:%2").arg(ret).arg(m_httpApi->DoGetLastError(&ret)));
         return false;
@@ -400,7 +401,7 @@ bool FromWebAPI::insertConfigData(QMap<int, ConfigData>& list)
     QString strCmd = QString::fromStdString(json0.dump());
     QString strRet;
     auto ret = m_httpApi->DBDoInterface(enDBOperatorType::EDBOT_BatchTransAction, strCmd, strRet, true);
-    if(ret < 0)
+    if(ret != 0)
     {
         LH_WRITE_ERROR(QString("写入tExecPlanConfig失败:%1, 错误信息:%2").arg(ret).arg(m_httpApi->DoGetLastError(&ret)));
         return false;
@@ -450,7 +451,7 @@ bool FromWebAPI::deleteConfigData(QMap<int, ConfigData>& list)
     QString strCmd = QString::fromStdString(json0.dump());
     QString strRet;
     auto ret = m_httpApi->DBDoInterface(enDBOperatorType::EDBOT_BatchTransAction, strCmd, strRet, true);
-    if(ret < 0)
+    if(ret != 0)
     {
         LH_WRITE_ERROR(QString("删除tExecPlanConfig表格数据失败:%1, 错误信息:%2").arg(ret).arg(m_httpApi->DoGetLastError(&ret)));
         return false;
@@ -473,12 +474,13 @@ bool FromWebAPI::getConfigData(QMap<int, ConfigData>& list)
     QString strCmd = QString::fromStdString(json0.dump());
     QString strRet;
     auto ret = m_httpApi->DBDoInterface(enDBOperatorType::EDBOT_Select, strCmd, strRet, true);
-    if(ret < 0)
+    if(ret != 0)
     {
         LH_WRITE_ERROR(QString("获取tExecPlanConfig表格数据失败:%1, 错误信息:%2").arg(ret).arg(m_httpApi->DoGetLastError(&ret)));
         return false;
     }
     /* 解析获取到的JSON数据 */
+    LH_WRITE_LOG_DEBUG(QString("Ret:%1").arg(ret));
     LH_WRITE_LOG_DEBUG(strRet);
     try{
         nJson json1 = nJson::parse(strRet.toStdString());
@@ -536,7 +538,7 @@ bool FromWebAPI::getConfigData(int key, ConfigData& data)
     QString strCmd = QString::fromStdString(json0.dump());
     QString strRet;
     auto ret = m_httpApi->DBDoInterface(enDBOperatorType::EDBOT_Select, strCmd, strRet, true);
-    if(ret < 0)
+    if(ret != 0)
     {
         LH_WRITE_ERROR(QString("获取tExecPlanConfig表格数据失败:%1, 错误信息:%2").arg(ret).arg(m_httpApi->DoGetLastError(&ret)));
         return false;
@@ -603,7 +605,7 @@ bool FromWebAPI::getEQMTemplateID(QList<int>& listId)
     QString strCmd = QString::fromStdString(json0.dump());
     QString strRet;
     auto ret = m_httpApi->DBDoInterface(enDBOperatorType::EDBOT_Select, strCmd, strRet, true);
-    if(ret < 0)
+    if(ret != 0)
     {
         LH_WRITE_ERROR(QString("从EQM获取模版编号失败:%1, 错误信息:%2").arg(ret).arg(m_httpApi->DoGetLastError(&ret)));
         return false;
@@ -667,7 +669,7 @@ bool FromWebAPI::deleteAllRow()
     QString strCmd = QString::fromStdString(json0.dump());
     QString strRet;
     auto ret = m_httpApi->DBDoInterface(enDBOperatorType::EDBOT_Delete, strCmd, strRet, true);
-    if(ret < 0)
+    if(ret != 0)
     {
         LH_WRITE_ERROR(QString("删除所有行失败:%1, 错误信息:%2").arg(ret).arg(m_httpApi->DoGetLastError(&ret)));
         return false;
@@ -702,7 +704,7 @@ bool FromWebAPI::deleteAllTransmitterPlan()
         QString strCmd = QString::fromStdString(json0.dump());
         QString strRet;
         auto ret = m_httpApi->DBDoInterface(enDBOperatorType::EDBOT_Delete, strCmd, strRet, true);
-        if(ret < 0)
+        if(ret != 0)
         {
             LH_WRITE_ERROR(QString("删除发射机(%3)计划失败:%1, 错误信息:%2").arg(ret).arg(m_httpApi->DoGetLastError(&ret)).arg(it));
         }else {
@@ -751,7 +753,7 @@ bool FromWebAPI::saveTemplate(const QString& templateName, const int type, QList
     QString strCmd = QString::fromStdString(json0.dump());
     QString strRet;
     auto ret = m_httpApi->DBDoInterface(enDBOperatorType::EDBOT_BatchTransAction, strCmd, strRet, true);
-    if(ret < 0)
+    if(ret != 0)
     {
         LH_WRITE_ERROR(QString("保存到模板失败:%1, 错误信息:%2").arg(ret).arg(m_httpApi->DoGetLastError(&ret)));
         return false;
@@ -779,7 +781,7 @@ bool FromWebAPI::getTemplate(QString templateName, QList<ExecPlanItemInfo>& list
     QString strCmd = QString::fromStdString(json0.dump());
     QString strRet;
     auto ret = m_httpApi->DBDoInterface(enDBOperatorType::EDBOT_Select, strCmd, strRet, true);
-    if(ret < 0)
+    if(ret != 0)
     {
         LH_WRITE_ERROR(QString("获取模板失败:%1, 错误信息:%2").arg(ret).arg(m_httpApi->DoGetLastError(&ret)));
         return false;
@@ -851,7 +853,7 @@ bool FromWebAPI::getTemplateList(QMap<QString, int>& list)
     QString strCmd = QString::fromStdString(json0.dump());
     QString strRet;
     auto ret = m_httpApi->DBDoInterface(enDBOperatorType::EDBOT_Select, strCmd, strRet, true);
-    if(ret < 0)
+    if(ret != 0)
     {
         LH_WRITE_ERROR(QString("获取模板列表失败:%1, 错误信息:%2").arg(ret).arg(m_httpApi->DoGetLastError(&ret)));
         return false;
@@ -924,7 +926,7 @@ bool FromWebAPI::deleteTemplate(const QString& name)
     QString strCmd = QString::fromStdString(json0.dump());
     QString strRet;
     auto ret = m_httpApi->DBDoInterface(enDBOperatorType::EDBOT_Delete, strCmd, strRet, true);
-    if(ret < 0)
+    if(ret != 0)
     {
         LH_WRITE_ERROR(QString("删除模板失败:%1, 错误信息:%2").arg(ret).arg(m_httpApi->DoGetLastError(&ret)));
         return false;

TransmitterSwitch/common/LHHTTPAPI/src/lhhttpapi.cpp

@@ -268,6 +268,7 @@ void lhhttpapi::OnWorkerFinished()
 int lhhttpapi::DBDoInterface(int nOperatorType, const QString &strParamXml, QString &strRetXml, bool bismulti)
 {
     if(fnDBDoInterface == nullptr) return -1;
+    if(m_phttpip == nullptr) return -1;
     int ret = 0;
     if(bismulti)
     {