init

opencv-motion-detect/evcloudsvc.cpp

@@ -587,6 +587,7 @@ private:
                         if(ipcStatus["issues"].count(selfId) != 0) {
                             ipcStatus["issues"].erase(selfId);
                         }
+                        spdlog::info("update status to online = true");
                         ipcStatus["mgrTerminal"]["online"] = true;
                     }
                 }
@@ -666,6 +667,11 @@ private:
 
                 if(peerData["ipcStatus"].count(ipcSn) != 0) {
                     auto &ipcStatus = peerData["ipcStatus"][ipcSn];
+                    if(ipcStatus.count("mgrTerminal") == 0){
+                        ipcStatus["mgrTerminal"] = json();
+                        ipcStatus["mgrTerminal"]["sn"] = peerId;
+                        ipcStatus["mgrTerminal"]["online"] = true;
+                    }
                     // log report, filter out ping
                     if(catId == EV_MSG_REPORT_CATID_AVMODOFFLINE && status == "recover") {
                         // nop

opencv-yolo/web/web.py

@@ -20,6 +20,7 @@ import string
 import pdb
 import traceback
 import sys
+import shutil
 
 random.seed(datetime.datetime.now())
 
@@ -75,6 +76,7 @@ RABBITMQ_EXHANGE = os.getenv("RABBITMQ_EXHANGE", "video")
 AI_QUEUE_TASK = os.getenv('AI_TASK', 'videoai.v1.task')
 AI_QUEUE_RESULT = os.getenv('AI_RESULT', 'videoai.v1.result')
 AI_EXCHANGE = os.getenv('AI_XHG', 'videoai')
+VIDEO_FILES_MOUNT_DIR = os.getenv('MOUNT_DIR', '/data/pre-data/')
 
 CAMERA_CONFIG_MAP = {}
 
@@ -144,14 +146,21 @@ print("CONFIG: \n\tMQTT: {}:{}\n\tBIN_NAME: {}".format(
     MQTT_HOST, MQTT_PORT, binName))
 
 def downloadFile(ipcSn, dirName, fileName, destDir):
-    file_path = ipcSn + '/'+dirName+'/'+fileName
-    destDir = destDir + '/' + fileName
-    print("downloading {}: {} {} {}".format(
-        destDir, ipcSn, dirName, file_path))
-    with ShareFileClient.from_connection_string(conn_str=CONNSTR, share_name=SHARENAME, file_path=file_path) as fc:
-        with open(destDir, "wb") as f:
-            data = fc.download_file()
-            data.readinto(f)
+    if False: # azure
+        file_path = ipcSn + '/'+dirName+'/'+fileName
+        destDir = destDir + '/' + fileName
+        print("downloading {}: {} {} {}".format(
+            destDir, ipcSn, dirName, file_path))
+        with ShareFileClient.from_connection_string(conn_str=CONNSTR, share_name=SHARENAME, file_path=file_path) as fc:
+            with open(destDir, "wb") as f:
+                data = fc.download_file()
+                data.readinto(f)
+    else:
+        file_path = VIDEO_FILES_MOUNT_DIR + ipcSn + '/' + dirName + '/' + fileName
+        destDir = destDir + '/' + fileName
+        print("copying {}: {} {} {}".format(
+            destDir, ipcSn, dirName, file_path))
+        shutil.copyfile(file_path, destDir)
 
 
 def uploadFile(ipcSn, dirName, fileName, srcPath):