V0.4

1、更新了WebAPI动态库

CMakeLists.txt

@@ -29,10 +29,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 #*************  设置可执行文件的名称和输出位置 *************
 #=========================================================
 
-#设置可执行文件名称
-set(execName1 SecurePlayAuxServer)
-set(execName2 Show1)
-
 
 #设置可执行文件和库位置，可能是qt tools的bug，选择32位依旧是64位编译器
 if(CMAKE_SYSTEM_NAME MATCHES "Linux")
@@ -133,7 +129,7 @@ find_package(Qt5 COMPONENTS
     Widgets
     Core
     Network
-    Sql
+    # Sql
     REQUIRED
 )
 
@@ -156,7 +152,5 @@ file(GLOB GLOBAL_SRC
 
 
 add_subdirectory(SecurePlayAuxServer)
-# add_subdirectory(ShowFlowChart)
-# add_subdirectory(show2)
 
 

External

@@ -1 +1 @@
-Subproject commit 7a7fe00c70bf60e094972317235f51c1321547bd
+Subproject commit 8e9c815b5703fc317068f8c4b60557ed9c9a6430

SecurePlayAuxServer/CMakeLists.txt

@@ -1,6 +1,8 @@
 cmake_minimum_required(VERSION 3.12)
 
 
+set(loaclExeName "SecurePlayAuxServer")
+
 #包含源文件
 file(GLOB LOCAL_SRC
     ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp
@@ -8,10 +10,9 @@ file(GLOB LOCAL_SRC
     ${CMAKE_CURRENT_SOURCE_DIR}/communication/*.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/GlobalInfo/*.cpp
 
-    ${CMAKE_SOURCE_DIR}/External/common/CurlFtp/*.cpp
     ${CMAKE_SOURCE_DIR}/External/common/Thread/*.cpp
-    ${CMAKE_SOURCE_DIR}/External/common/CurlHttp/*.cpp
-    ${CMAKE_SOURCE_DIR}/External/common/ThreadPool/*.cpp
+    ${CMAKE_SOURCE_DIR}/External/module/CurlHttp/*.cpp
+    ${CMAKE_SOURCE_DIR}/External/module/ThreadPool/*.cpp
     
     ${LHQLog_SOURCE_DIRS}/*.cpp
     ${LHHTTPAPI_SOURCE_DIRS}/*.cpp
@@ -19,43 +20,46 @@ file(GLOB LOCAL_SRC
 )
 
 #生成可执行程序
-add_executable(${execName1} ${LOCAL_SRC})
+add_executable(${loaclExeName} ${LOCAL_SRC})
 
 
 #添加头文件
-target_include_directories(${execName1} PRIVATE
+target_include_directories(${loaclExeName} PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/common/LHLog
     ${CMAKE_CURRENT_SOURCE_DIR}/communication
     ${CMAKE_CURRENT_SOURCE_DIR}/GlobalInfo
 
     ${CMAKE_SOURCE_DIR}/External/common
-    ${CMAKE_SOURCE_DIR}/External/common/FmtLog
-    ${CMAKE_SOURCE_DIR}/External/common/CurlFtp
     ${CMAKE_SOURCE_DIR}/External/common/Thread
-    ${CMAKE_SOURCE_DIR}/External/common/CurlHttp
-    ${CMAKE_SOURCE_DIR}/External/common/RingQueue
-    ${CMAKE_SOURCE_DIR}/External/common/ThreadPool
+
+    ${CMAKE_SOURCE_DIR}/External/module
+    ${CMAKE_SOURCE_DIR}/External/module/FmtLog
+    ${CMAKE_SOURCE_DIR}/External/module/CurlHttp
+    ${CMAKE_SOURCE_DIR}/External/module/RingQueue
+    ${CMAKE_SOURCE_DIR}/External/module/ThreadPool
 
     ${LHQLog_INCLUDE_DIRS}
     ${LHHTTPAPI_SOURCE_DIRS}
     ${SM_INCLUDE_DIR}
     ${CURL_INCLUDE_DIR}
+    ${spdlog_INCLUDE_DIR}
+    ${hiredis_INCLUDE_DIR}
 )
+
+
 #链接Qt库
-target_link_libraries(${execName1} PRIVATE
+target_link_libraries(${loaclExeName} PRIVATE
     Qt5::Widgets
     Qt5::Core
     Qt5::Network
-    Qt5::Sql
+    # Qt5::Sql
 )
 #链接外部库
-target_link_libraries(${execName1} PRIVATE
-    fmt::fmt
-    spdlog::spdlog
-    # CURL::libcurl
+target_link_libraries(${loaclExeName} PRIVATE
+    ${spdlog_LIBRARY}
     ${SM_LIBRARY}
-    hiredis::hiredis
+    ${hiredis_LIBRARY}
     ${CURL_LIBRARY}
 )
 
@@ -63,6 +67,6 @@ target_link_libraries(${execName1} PRIVATE
 #GCC9.0以上包含进了标准库
 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0)
-        target_link_libraries(${execName1} PRIVATE stdc++fs)
+        target_link_libraries(${loaclExeName} PRIVATE stdc++fs)
     endif()
 endif()

SecurePlayAuxServer/GlobalInfo/GlobalInfo.cpp

@@ -286,7 +286,7 @@ RoomFaceInfo* ListRoomFaceInfo::findRoomFaceInfo(int ChannelID, int RoomID, int
     return nullptr;
 }
 
-IllegalInvasionInfo::IllegalInvasionInfo(IllegalInvasionInfo& other)
+IllegalInvasionInfo::IllegalInvasionInfo(const IllegalInvasionInfo& other)
 {
     isInsertEQM = other.isInsertEQM;
     PKID = other.PKID;
@@ -299,7 +299,7 @@ IllegalInvasionInfo::IllegalInvasionInfo(IllegalInvasionInfo& other)
     strImageInfo = other.strImageInfo;
 }
 
-IllegalInvasionInfo& IllegalInvasionInfo::operator=(IllegalInvasionInfo& other)
+IllegalInvasionInfo& IllegalInvasionInfo::operator=(const IllegalInvasionInfo& other)
 {
     if(this != &other)
     {
@@ -380,7 +380,7 @@ void ListIllegalInvasionInfo::deleteIllInfo(int roomID, int roomType)
 }
 
 
-RoomIllegalInvasionInfo::RoomIllegalInvasionInfo(RoomIllegalInvasionInfo& o)
+RoomIllegalInvasionInfo::RoomIllegalInvasionInfo(const RoomIllegalInvasionInfo& o)
 {
     isAlarm = o.isAlarm;
     RoomID = o.RoomID;
@@ -392,7 +392,7 @@ RoomIllegalInvasionInfo::RoomIllegalInvasionInfo(RoomIllegalInvasionInfo& o)
     strImage = o.strImage;
     CameraID = o.CameraID;
 }
-RoomIllegalInvasionInfo& RoomIllegalInvasionInfo::operator=(RoomIllegalInvasionInfo& o)
+RoomIllegalInvasionInfo& RoomIllegalInvasionInfo::operator=(const RoomIllegalInvasionInfo& o)
 {
     if(this != &o) {
         isAlarm = o.isAlarm;

SecurePlayAuxServer/GlobalInfo/GlobalInfo.h

@@ -339,8 +339,8 @@ struct IllegalInvasionInfo
     std::string strImageInfo;           /* 图片信息 */
 
     IllegalInvasionInfo() = default;
-    IllegalInvasionInfo(IllegalInvasionInfo& other);
-    IllegalInvasionInfo& operator=(IllegalInvasionInfo& other);
+    IllegalInvasionInfo(const IllegalInvasionInfo& other);
+    IllegalInvasionInfo& operator=(const IllegalInvasionInfo& other);
 };
 
 /**
@@ -381,8 +381,8 @@ struct RoomIllegalInvasionInfo
     std::vector<PersonInfo> vecPersonInfo;  /* 人员信息 */
 
     RoomIllegalInvasionInfo() = default;
-    RoomIllegalInvasionInfo(RoomIllegalInvasionInfo& o);
-    RoomIllegalInvasionInfo& operator=(RoomIllegalInvasionInfo& o);
+    RoomIllegalInvasionInfo(const RoomIllegalInvasionInfo& o);
+    RoomIllegalInvasionInfo& operator=(const RoomIllegalInvasionInfo& o);
 };
 
 /**

SecurePlayAuxServer/SPAServer.cpp

@@ -1130,7 +1130,7 @@ void SPAServer::threadActIllegalInvasion(FuncActionInfo* RFAInfo)
                         {
                             std::string actionName = g_actionList.getActionName(ai.ActionID);
                             SPDLOG_LOGGER_INFO(m_logger, "☆ 新增报警信息，频道[{}]，房间[{}]，摄像头[{}]，{}，{}，有{}个区域，有{}个人脸，{}", 
-                            pIll->ChannelID, pIll->RoomID, pIll->CameraID, actionName, ai.ActionDes, ai.listBbox, ai.FaceIDList.size(), ai.ImageInfo);
+                            pIll->ChannelID, pIll->RoomID, pIll->CameraID, actionName, ai.ActionDes, ai.listBbox.size(), ai.FaceIDList.size(), ai.ImageInfo);
                         }
                     }
                     /* 删除这个非法入侵信息 */

SecurePlayAuxServer/communication/FromRedis.h

@@ -2,7 +2,7 @@
 #define FROMREDIS_H
 
 #include <string>
-#include "hiredis/hiredis.h"
+#include "hiredis.h"
 
 
 class FromRedis

SecurePlayAuxServer/communication/FromSuperBrain.cpp

@@ -2,7 +2,7 @@
 
 
 #include "CurlHttp.h"
-#include "fmt/format.h"
+#include "fmt.h"
 #include "GlobalInfo.h"
 
 

SecurePlayAuxServer/communication/ToEQMDataBase.cpp

@@ -34,24 +34,31 @@ bool ToEQMDataBase::initWebApi(const QString& url, const QString& serverIP, cons
     }
     int ret = 0;
 
-    ret = m_httpApi->DBQInit(url);
-    if(ret < 0)
+    if(!m_httpApi->Load())
     {
-        SPDLOG_LOGGER_ERROR(m_logger,"Init WebApi failed:{}, error Info:{}",ret,m_httpApi->DoGetLastError(&ret).toStdString());
+        SPDLOG_LOGGER_ERROR(m_logger,"Load WebApi failed!");
         return false;
     }
+
+    m_httpApi->DBInit(url.toStdString().c_str());
+    // if(ret < 0)
+    // {
+    //     SPDLOG_LOGGER_ERROR(m_logger,"Init WebApi failed:{}, error Info:{}",ret,m_httpApi->DoGetLastError(&ret).toStdString());
+    //     return false;
+    // }
     // SPDLOG_LOGGER_TRACE(m_logger,"初始化WebApi成功!");
-    QString serverList;
-    ret = m_httpApi->DBQGetServerList(serverList);
+    /* 获取服务器列表 */
+    char serverList[8192];
+    ret = m_httpApi->DBGetServerList(serverList, 8192);
     if(ret < 0)
     {
-        SPDLOG_LOGGER_DEBUG(m_logger,"Get server list failed:{}, error info:{}",ret,m_httpApi->DoGetLastError(&ret).toStdString());
+        SPDLOG_LOGGER_DEBUG(m_logger,"Get server list failed:{}, error info:{}",ret, m_httpApi->DoGetLastError(&ret).toStdString());
         return false;
     }
-    SPDLOG_LOGGER_TRACE(m_logger,"Server list:{}",serverList.toStdString());
+    SPDLOG_LOGGER_TRACE(m_logger,"Server list:{}", serverList);
     SPDLOG_LOGGER_DEBUG(m_logger,"WebAPI Sucess!");
     /* 登录，第二个参数是限制的服务 */
-    ret = m_httpApi->DBQLogin(serverIP, serID, "SPSS", m_userToken);
+    ret = m_httpApi->DBLogin(serverIP, serID, "SPSS", m_userToken);
     if(ret < 0)
     {
         SPDLOG_LOGGER_ERROR(m_logger,"Login failed:{}, error info:{}",ret,m_httpApi->DoGetLastError(&ret).toStdString());
@@ -106,7 +113,7 @@ bool ToEQMDataBase::writeAlgorithmInfo(std::vector<AlgorithmInfo>& vecInfo)
         json1["actionTaskID"] = it.ActionTaskID;            /* 算法类型 */
         json0["paramList"] = json1;
         QString strCmd = QString::fromStdString(json0.dump());
-        int ret = m_httpApi->DBQDoInterface(enDBOperatorType::EDBOT_Insert, strCmd, retStr);
+        int ret = m_httpApi->DBDoInterface(enDBOperatorType::EDBOT_Insert, strCmd, retStr);
         if(ret < 0)
         {
             SPDLOG_LOGGER_DEBUG(m_logger,"写入tAction失败:{}, 错误信息:{}",ret,m_httpApi->DoGetLastError(&ret).toStdString());
@@ -135,7 +142,7 @@ bool ToEQMDataBase::deleteAlgorithmInfo(std::vector<AlgorithmInfo>& vecDeleteInf
         json0["paramList"] = json1;
         QString strCmd = QString::fromStdString(json0.dump());
         QString strRet;
-        int ret = m_httpApi->DBQDoInterface(enDBOperatorType::EDBOT_Delete, strCmd, strRet);
+        int ret = m_httpApi->DBDoInterface(enDBOperatorType::EDBOT_Delete, strCmd, strRet);
         if(ret < 0)
         {
             SPDLOG_LOGGER_DEBUG(m_logger,"删除tAction失败:{}, 错误信息:{}",ret,m_httpApi->DoGetLastError(&ret).toStdString());
@@ -162,7 +169,7 @@ bool ToEQMDataBase::getAlgorithmInfo(std::vector<AlgorithmInfo>& vecInfo)
     json0["opName"] = "SPSS_SelectFromAction";
     QString strCmd = QString::fromStdString(json0.dump());
     QString strRet;
-    auto ret = m_httpApi->DBQDoInterface(enDBOperatorType::EDBOT_Select, strCmd, strRet);
+    auto ret = m_httpApi->DBDoInterface(enDBOperatorType::EDBOT_Select, strCmd, strRet);
     if(ret < 0)
     {
         SPDLOG_LOGGER_DEBUG(m_logger,"获取tAction失败:{}, 错误信息:{}",ret,m_httpApi->DoGetLastError(&ret).toStdString());
@@ -230,7 +237,7 @@ bool ToEQMDataBase::insertDeviceInfo(std::vector<DeviceInfo>& vecInfo)
         json0["paramList"] = json1;
         QString strCmd = QString::fromStdString(json0.dump());
         QString strRet;
-        auto ret = m_httpApi->DBQDoInterface(enDBOperatorType::EDBOT_Insert, strCmd, strRet);
+        auto ret = m_httpApi->DBDoInterface(enDBOperatorType::EDBOT_Insert, strCmd, strRet);
         if(ret < 0)
         {
             SPDLOG_LOGGER_DEBUG(m_logger,"插入设备信息失败:{}, 错误信息:{}",ret,m_httpApi->DoGetLastError(&ret).toStdString());
@@ -251,7 +258,7 @@ bool ToEQMDataBase::insertDeviceInfo(std::vector<DeviceInfo>& vecInfo)
             json0["paramList"] = json1;
             QString strCmd = QString::fromStdString(json0.dump());
             QString strRet;
-            auto ret = m_httpApi->DBQDoInterface(enDBOperatorType::EDBOT_Insert, strCmd, strRet);
+            auto ret = m_httpApi->DBDoInterface(enDBOperatorType::EDBOT_Insert, strCmd, strRet);
             if(ret < 0)
             {
                 SPDLOG_LOGGER_DEBUG(m_logger,"插入设备信息到tActionCamer失败:{}, 错误信息:{}",ret,m_httpApi->DoGetLastError(&ret).toStdString());
@@ -298,7 +305,7 @@ bool ToEQMDataBase::updateDeviceInfo(std::vector<DeviceInfo>& vecUpdateInfo)
         json0["paramList"] = json1;
         QString strCmd = QString::fromStdString(json0.dump());
         QString strRet;
-        auto ret = m_httpApi->DBQDoInterface(enDBOperatorType::EDBOT_Update, strCmd, strRet);
+        auto ret = m_httpApi->DBDoInterface(enDBOperatorType::EDBOT_Update, strCmd, strRet);
         if(ret < 0)
         {
             SPDLOG_LOGGER_DEBUG(m_logger,"更新设备信息失败:{}, 错误信息:{}",ret,m_httpApi->DoGetLastError(&ret).toStdString());
@@ -336,7 +343,7 @@ bool ToEQMDataBase::deleteDeviceInfo(std::vector<DeviceInfo>& vecDeleteInfo)
         json0["paramList"] = json1;
         QString strCmd = QString::fromStdString(json0.dump());
         QString strRet;
-        auto ret = m_httpApi->DBQDoInterface(enDBOperatorType::EDBOT_Delete, strCmd, strRet);
+        auto ret = m_httpApi->DBDoInterface(enDBOperatorType::EDBOT_Delete, strCmd, strRet);
         if(ret < 0)
         {
             SPDLOG_LOGGER_DEBUG(m_logger,"删除设备信息失败:{}, 错误信息:{}",ret,m_httpApi->DoGetLastError(&ret).toStdString());
@@ -362,7 +369,7 @@ bool ToEQMDataBase::getDeviceInfo(std::vector<DeviceInfo>& vecInfo)
     json0["opName"] = "SPSS_SelectFromCamerInfo";
     QString strCmd = QString::fromStdString(json0.dump());
     QString strRet;
-    auto ret = m_httpApi->DBQDoInterface(enDBOperatorType::EDBOT_Select, strCmd, strRet);
+    auto ret = m_httpApi->DBDoInterface(enDBOperatorType::EDBOT_Select, strCmd, strRet);
     if(ret < 0)
     {
         SPDLOG_LOGGER_DEBUG(m_logger,"获取CamerInfo失败:{}, 错误信息:{}",ret,m_httpApi->DoGetLastError(&ret).toStdString());
@@ -435,7 +442,7 @@ bool ToEQMDataBase::insertDeviceAlgorithmInfo(std::vector<DeviceInfo>& vecInfo)
             json0["paramList"] = json1;
             QString strCmd = QString::fromStdString(json0.dump());
             QString strRet;
-            auto ret = m_httpApi->DBQDoInterface(enDBOperatorType::EDBOT_Insert, strCmd, strRet);
+            auto ret = m_httpApi->DBDoInterface(enDBOperatorType::EDBOT_Insert, strCmd, strRet);
             if(ret < 0)
             {
                 SPDLOG_LOGGER_DEBUG(m_logger,"插入设备信息到tActionCamer失败:{}, 错误信息:{}",ret,m_httpApi->DoGetLastError(&ret).toStdString());
@@ -466,7 +473,7 @@ bool ToEQMDataBase::updateDeviceAlgorithmInfo(std::vector<DeviceInfo>& vecInfo)
         json0["paramList"] = json1;
         QString strCmd = QString::fromStdString(json0.dump());
         QString strRet;
-        auto ret = m_httpApi->DBQDoInterface(enDBOperatorType::EDBOT_Delete, strCmd, strRet);
+        auto ret = m_httpApi->DBDoInterface(enDBOperatorType::EDBOT_Delete, strCmd, strRet);
         if(ret < 0)
         {
             SPDLOG_LOGGER_DEBUG(m_logger,"删除设备信息到tActionCamer失败:{}, 错误信息:{}",ret,m_httpApi->DoGetLastError(&ret).toStdString());
@@ -488,7 +495,7 @@ bool ToEQMDataBase::updateDeviceAlgorithmInfo(std::vector<DeviceInfo>& vecInfo)
             json0["paramList"] = json1;
             QString strCmd = QString::fromStdString(json0.dump());
             QString strRet;
-            auto ret = m_httpApi->DBQDoInterface(enDBOperatorType::EDBOT_Insert, strCmd, strRet);
+            auto ret = m_httpApi->DBDoInterface(enDBOperatorType::EDBOT_Insert, strCmd, strRet);
             if(ret < 0)
             {
                 SPDLOG_LOGGER_DEBUG(m_logger,"插入设备信息到tActionCamer失败:{}, 错误信息:{}",ret,m_httpApi->DoGetLastError(&ret).toStdString());
@@ -521,7 +528,7 @@ bool ToEQMDataBase::deleteDeviceAlgorithmInfo(std::vector<DeviceInfo>& vecInfo)
         json0["paramList"] = json1;
         QString strCmd = QString::fromStdString(json0.dump());
         QString strRet;
-        auto ret = m_httpApi->DBQDoInterface(enDBOperatorType::EDBOT_Delete, strCmd, strRet);
+        auto ret = m_httpApi->DBDoInterface(enDBOperatorType::EDBOT_Delete, strCmd, strRet);
         if(ret < 0)
         {
             SPDLOG_LOGGER_DEBUG(m_logger,"删除设备信息到tActionCamer失败:{}, 错误信息:{}",ret,m_httpApi->DoGetLastError(&ret).toStdString());
@@ -554,7 +561,7 @@ bool ToEQMDataBase::deleteDeviceAlgorithmInfo(std::list<int>& vecID)
         json0["paramList"] = json1;
         QString strCmd = QString::fromStdString(json0.dump());
         QString strRet;
-        auto ret = m_httpApi->DBQDoInterface(enDBOperatorType::EDBOT_Delete, strCmd, strRet);
+        auto ret = m_httpApi->DBDoInterface(enDBOperatorType::EDBOT_Delete, strCmd, strRet);
         if(ret < 0)
         {
             SPDLOG_LOGGER_DEBUG(m_logger,"删除设备信息到tActionCamer失败:{}, 错误信息:{}",ret,m_httpApi->DoGetLastError(&ret).toStdString());
@@ -586,7 +593,7 @@ bool ToEQMDataBase::getDeviceAlgorithmInfo(std::vector<DeviceInfo>& vecInfo, std
     json0["opName"] = "SPSS_SelectFromActionCamer";
     QString strCmd = QString::fromStdString(json0.dump());
     QString strRet;
-    auto ret = m_httpApi->DBQDoInterface(enDBOperatorType::EDBOT_Select, strCmd, strRet);
+    auto ret = m_httpApi->DBDoInterface(enDBOperatorType::EDBOT_Select, strCmd, strRet);
     if(ret < 0)
     {
         SPDLOG_LOGGER_DEBUG(m_logger,"获取ActionCamer失败:{}, 错误信息:{}",ret,m_httpApi->DoGetLastError(&ret).toStdString());
@@ -684,7 +691,7 @@ bool ToEQMDataBase::getActionInfo(ListActionInfo& listInfo)
     json0["opName"] = "SPSS_SelectFromActionInfo";
     QString strCmd = QString::fromStdString(json0.dump());
     QString strRet;
-    auto ret = m_httpApi->DBQDoInterface(enDBOperatorType::EDBOT_Select, strCmd, strRet);
+    auto ret = m_httpApi->DBDoInterface(enDBOperatorType::EDBOT_Select, strCmd, strRet);
     if(ret < 0)
     {
         SPDLOG_LOGGER_DEBUG(m_logger,"获取ActionCamer失败:{}, 错误信息:{}",ret,m_httpApi->DoGetLastError(&ret).toStdString());
@@ -744,7 +751,7 @@ bool ToEQMDataBase::getRoomCameraInfo(std::list<RoomCameraInfo>& vecInfo)
     json0["opName"] = "SPSS_SelectRoomCamer";
     QString strCmd = QString::fromStdString(json0.dump());
     QString strRet;
-    auto ret = m_httpApi->DBQDoInterface(enDBOperatorType::EDBOT_Select, strCmd, strRet);
+    auto ret = m_httpApi->DBDoInterface(enDBOperatorType::EDBOT_Select, strCmd, strRet);
     if(ret < 0)
     {
         SPDLOG_LOGGER_DEBUG(m_logger,"获取RoomCamer失败:{}, 错误信息:{}",ret,m_httpApi->DoGetLastError(&ret).toStdString());
@@ -849,7 +856,7 @@ bool ToEQMDataBase::insertAlarmInfo(const AlarmInfo& alarmInfo)
     json0["paramList"] = json1;
     QString strCmd = QString::fromStdString(json0.dump());
     QString strRet;
-    auto ret = m_httpApi->DBQDoInterface(enDBOperatorType::EDBOT_Insert, strCmd, strRet);
+    auto ret = m_httpApi->DBDoInterface(enDBOperatorType::EDBOT_Insert, strCmd, strRet);
     if(ret < 0)
     {
         SPDLOG_LOGGER_WARN(m_logger,"插入报警信息失败:{}, 错误信息:{}",ret,m_httpApi->DoGetLastError(&ret).toStdString());
@@ -880,7 +887,7 @@ bool ToEQMDataBase::updateAlarmEndTime(const AlarmInfo& alarmInfo)
 
     QString strCmd = QString::fromStdString(json0.dump());
     QString strRet;
-    int ret = m_httpApi->DBQDoInterface(enDBOperatorType::EDBOT_Update, strCmd, strRet);
+    int ret = m_httpApi->DBDoInterface(enDBOperatorType::EDBOT_Update, strCmd, strRet);
     if(ret < 0)
     {
         SPDLOG_LOGGER_WARN(m_logger,"更新报警结束时间失败:{}, 错误信息:{}",ret,m_httpApi->DoGetLastError(&ret).toStdString());
@@ -897,7 +904,7 @@ bool ToEQMDataBase::getAlarmRuleInfo(std::vector<AlarmRuleInfo>& vecInfo)
     json0["opName"] = "SPSS_SelectFromAlarmRule";
     QString strCmd = QString::fromStdString(json0.dump());
     QString strRet;
-    auto ret = m_httpApi->DBQDoInterface(enDBOperatorType::EDBOT_Select, strCmd, strRet);
+    auto ret = m_httpApi->DBDoInterface(enDBOperatorType::EDBOT_Select, strCmd, strRet);
     if(ret < 0)
     {
         SPDLOG_LOGGER_DEBUG(m_logger,"获取AlarmRule失败:{}, 错误信息:{}",ret,m_httpApi->DoGetLastError(&ret).toStdString());
@@ -956,7 +963,7 @@ bool ToEQMDataBase::getAlarmAppInfo(std::list<AppAndTimeInfo>& listInfo)
     json0["opName"] = "SPSS_SelectPeriod";
     QString strCmd = QString::fromStdString(json0.dump());
     QString strRet;
-    auto ret = m_httpApi->DBQDoInterface(enDBOperatorType::EDBOT_Select, strCmd, strRet);
+    auto ret = m_httpApi->DBDoInterface(enDBOperatorType::EDBOT_Select, strCmd, strRet);
     if(ret < 0)
     {
         SPDLOG_LOGGER_DEBUG(m_logger,"获取AlarmApp失败:{}, 错误信息:{}",ret,m_httpApi->DoGetLastError(&ret).toStdString());
@@ -1045,7 +1052,7 @@ bool ToEQMDataBase::insertOnWorkInfo(const RoomFaceInfo& onWorkInfo)
 
     QString strCmd = QString::fromStdString(json0.dump());
     QString strRet;
-    auto ret = m_httpApi->DBQDoInterface(enDBOperatorType::EDBOT_Insert, strCmd, strRet);
+    auto ret = m_httpApi->DBDoInterface(enDBOperatorType::EDBOT_Insert, strCmd, strRet);
     if(ret < 0)
     {
         SPDLOG_LOGGER_WARN(m_logger,"插入在岗信息失败:{}, 错误信息:{}",ret,m_httpApi->DoGetLastError(&ret).toStdString());