From a7d60d69ae76ae39b6feba4c55f94bc180f24417 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 13 Feb 2023 16:09:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=97=E6=B3=95=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/ai/main.py       | 17 +++++++++--------
 apps/develop/views.py |  6 ++++--
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/apps/ai/main.py b/apps/ai/main.py
index c3117ef9..ef9a38f8 100644
--- a/apps/ai/main.py
+++ b/apps/ai/main.py
@@ -53,7 +53,6 @@ def ai_analyse(codes: list, global_img: str, face_img: str = '', is_dahua_pic: b
                         is_happend, res = getattr(m, 'helmet2')(ip=settings.AI_IP, pic_url=global_img)
                 else:
                     is_happend, res = f(ip=settings.AI_IP, pic_url=global_img)
-                myLogger.info(res)
                 if i in ['fire1', 'jingjiedai', 'qiping']:  # 如果是这3类算法就无需再识别，都在一个算法里处理了
                     has_fire = False  # 默认没有灭火器
                     has_jingjiedai = False  # 默认没有警戒带
@@ -72,7 +71,6 @@ def ai_analyse(codes: list, global_img: str, face_img: str = '', is_dahua_pic: b
                         results.update({i: rectangle_dict.get(i, [])})
                 if is_happend and (i not in results):
                     results.update({i: rectangle_dict.get(i, [])})
-                myLogger.info(results)
             except Exception:
                 myLogger.error('算法处理错误', exc_info=True)
     if global_img_path:
@@ -91,12 +89,15 @@ def ai_analyse_2(codes: list, global_img: str, face_img: str = '', is_dahua_pic:
         face_img (str): 人脸图片url地址
     """
     results = ai_analyse(codes, global_img, face_img, is_dahua_pic)
-    if results and is_dahua_pic:  # 如果触发事件且是大华图片先保存下来
-        from apps.ecm.service import save_dahua_pic
-        global_img_path = save_dahua_pic(global_img)
-        global_img_local = settings.BASE_DIR + global_img_path
-        draw(global_img_local, results)  # 绘制矩形框
-        results.update({'global_img': global_img_path})
+    try:
+        if results and is_dahua_pic:  # 如果触发事件且是大华图片先保存下来
+            from apps.ecm.service import save_dahua_pic
+            global_img_path = save_dahua_pic(global_img)
+            global_img_local = settings.BASE_DIR + global_img_path
+            draw(global_img_local, results)  # 绘制矩形框
+            results.update({'global_img': global_img_path})
+    except Exception as e:
+        myLogger.error('算法返回信息处理错误', exc_info=True)
     return results
 
 
diff --git a/apps/develop/views.py b/apps/develop/views.py
index a3611abb..ce7c6e68 100755
--- a/apps/develop/views.py
+++ b/apps/develop/views.py
@@ -250,9 +250,11 @@ class TestViewSet(CustomGenericViewSet):
         测试抓图识别
         """
         code = request.data['code']
+        codes = request.data['codes']
+        opl_id = request.data['opl']
         vc = TDevice.objects.get(code=code)
-        snap_and_analyse(vc, ['fire1', 'helmet'],
-                         Opl.objects.get(id='1572195171456651264'))
+        snap_and_analyse(vc, codes,
+                         Opl.objects.get(id=opl_id))
         return Response()
 
     @action(methods=['post'], detail=False, serializer_class=Serializer)