Merge branch 'dev' of http://192.168.136.99:3000/servers/ASJServer into dev

Controller/AiController.py

@@ -548,7 +548,7 @@ class AiView(View):
             # photo = open(r'E:\test---------------\test\snipaste20220121_215952.jpg', 'rb')
             #识别合成图片
             maxLabels = 50
-            minConfidence = 96
+            minConfidence = 70
 
             ai_start_time = int(time.time())
             client = boto3.client(
@@ -686,6 +686,7 @@ class AiView(View):
                                                                    picUploadEndTime = endTime, endTime=endTime)
                 #删除临时文件
                 delf = os.path.join(BASE_DIR, 'static/ai')
+                logger.info(f"删除目录：{delf}下得文件")
                 self.delfile(path=delf)
                 return JsonResponse(status=200, data='success', safe=False)
             return JsonResponse(status=500, data='fail', safe=False)
@@ -803,6 +804,7 @@ class AiView(View):
 
     def do_fcm(self, uid, channel, appBundleId, token_val, event_type, n_time, msg_title, msg_text, msg_id=0):
         try:
+
             serverKey = FCM_CONFIG[appBundleId]
             push_service = FCMNotification(api_key=serverKey)
             data = {"alert": "Motion ", "event_time": n_time, "event_type": event_type, "msg": "",

Controller/EquipmentInfo.py

@@ -296,7 +296,7 @@ def deleteExpireEquipmentInfo(request):
     nowTime = int(time.time())
     try:
         for i in range(10):
-            ei = Equipment_Info.objects.filter(eventTime__lte=str(nowTime - 3600 * 24 * 7))[0:10000]
+            ei = Equipment_Info.objects.filter(addTime__lte=str(nowTime - 3600 * 24 * 7))[0:10000]
             id_list = list(ei.values_list("id", flat=True))
             Equipment_Info.objects.filter(id__in=id_list).delete()
         return response.json(0)