Merge remote-tracking branch 'origin/main' into main

# Conflicts:
#	engine/DetectDivideEngine/ContainerDivideEngine.cpp

engine/DetectDivideEngine/ContainerDivideEngine.h

@@ -51,8 +51,6 @@ private:
     std::vector<VSelectBestData> vecContainerFail_;
     // 存储识别到的满足校验规则的箱号数据
     std::vector<VSelectBestData> vecContainer_;
-
-    bool bLastIsEnd = true;
 };
 
 ENGINE_REGIST(ContainerDivideEngine)

engine/SelectBestEngine/SelectBestEngine.cpp

@@ -50,8 +50,7 @@ void SelectBestEngine::sendWSServer(DetectResultData &detectResultData)
     Json::Value jsonData;
     for (int i = 0; i < detectResultData.vecImage.size(); ++i)
     {
-        jsonData["bestImgSid" + std::to_string(i)] = detectResultData.vecImage[i];
+        strImage += (detectResultData.strDetectDate + "/" + ai_matrix::StringUtil::getins()->replace_all_distinct(detectResultData.strDetectTime, ":", "-") + "/" + detectResultData.vecImage[i]);
-        strImage += detectResultData.vecImage[i];
         if (i < detectResultData.vecImage.size() - 1)
         {
             strImage += ",";
@@ -68,6 +67,8 @@ void SelectBestEngine::sendWSServer(DetectResultData &detectResultData)
             strContainerNo += ",";
         }
     }
+    jsonData["detectDate"] = detectResultData.strDetectDate;
+    jsonData["detectTime"] = detectResultData.strDetectTime;
     jsonData["containerNo"] = strContainerNo;
     jsonData["images"] = strImage;
     jsonData["status"] = "normal";