Browse Source

查询推送消息新增标签类型

zhangdongming 2 years ago
parent
commit
3f7de44c8f
1 changed files with 3 additions and 2 deletions
  1. 3 2
      Service/EquipmentInfoService.py

+ 3 - 2
Service/EquipmentInfoService.py

@@ -319,6 +319,7 @@ class EquipmentInfoService:
         """
         """
         获取设备算法组合类型
         获取设备算法组合类型
         51:移动侦测,52:传感器报警,53:影像遗失,54:PIR,55:门磁报警,56:外部发报,57:人型报警(提示:有人出现),58:车型,59:宠物,60:人脸,61:异响,
         51:移动侦测,52:传感器报警,53:影像遗失,54:PIR,55:门磁报警,56:外部发报,57:人型报警(提示:有人出现),58:车型,59:宠物,60:人脸,61:异响,
+        62:区域闯入,63:区域闯出,64:长时间无人检测,65:长时间无人检测
         0:代表空字符,702:摄像头休眠,703:摄像头唤醒,704:电量过低
         0:代表空字符,702:摄像头休眠,703:摄像头唤醒,704:电量过低
         AWS AI识别 1:人形,2:车型,3:宠物,4:包裹。云端AI类型
         AWS AI识别 1:人形,2:车型,3:宠物,4:包裹。云端AI类型
         @param event_type:
         @param event_type:
@@ -329,7 +330,7 @@ class EquipmentInfoService:
             res_type = cls.is_type_exist(event_type)
             res_type = cls.is_type_exist(event_type)
             if res_type == 0:
             if res_type == 0:
                 return types
                 return types
-            combo_types = [51, 57, 58, 60, 59, 61]
+            combo_types = [51, 57, 58, 60, 59, 61, 62, 63, 64, 65]
             event_type = str(event_type)
             event_type = str(event_type)
             len_type = len(event_type)
             len_type = len(event_type)
             for i in range(0, len_type):
             for i in range(0, len_type):
@@ -364,7 +365,7 @@ class EquipmentInfoService:
         """
         """
         arr_list = []
         arr_list = []
         event_arr = []
         event_arr = []
-        resource_list = [1, 2, 4, 8, 16, 32]
+        resource_list = [1, 2, 4, 8, 16, 32, 64, 128, 256, 512]
         for i in range(2, len(resource_list) + 1):
         for i in range(2, len(resource_list) + 1):
             arr_list += list(itertools.combinations(resource_list, i))  # 表示从 [1,2,3,4] 中选出 3个元素的组合情况
             arr_list += list(itertools.combinations(resource_list, i))  # 表示从 [1,2,3,4] 中选出 3个元素的组合情况
         for i in arr_list:
         for i in arr_list: