Explorar el Código

新推送数据表存储数据

locky hace 1 año
padre
commit
f8b8c3c0ec
Se han modificado 2 ficheros con 38 adiciones y 1 borrados
  1. 19 0
      Service/DevicePushService.py
  2. 19 1
      Service/EquipmentInfoService.py

+ 19 - 0
Service/DevicePushService.py

@@ -200,6 +200,7 @@ class DevicePushService:
                         # push_permission = DevicePushService.check_share_permission(userID_id,
                         # params['channel'],params['uid'])
                         new_device_info_list.append(cls.created_device_vo(local_date_time, **params))
+                        new_device_info_list.append(cls.get_equipment_info_obj(**params))
                     userID_ids.append(userID_id)
                 params['appBundleId'] = appBundleId
                 params['token_val'] = token_val
@@ -374,6 +375,24 @@ class DevicePushService:
             answer_status=True if params['dealings_type'] == 1 else False
         )
 
+    @staticmethod
+    def get_equipment_info_obj(**params):
+        kwargs = {
+            'device_user_id': params['userID_id'],
+            'event_time': params['n_time'],
+            'event_type': params['event_type'],
+            'device_uid': params['uid'],
+            'device_nick_name': params['nickname'],
+            'channel': params['channel'],
+            'alarm': 'Motion \tChannel:{}'.format(params['channel']),
+            'is_st': params['is_st'],
+            'add_time': int(time.time()),
+            'storage_location': params['storage_location'],
+            'event_tag': params['event_tag'],
+            'answer_status': True if params['dealings_type'] == 1 else False
+        }
+        return EquipmentInfoService.random_get_equipment_info_obj(**kwargs)
+
     @staticmethod
     def get_msg_title(nickname):
         """

+ 19 - 1
Service/EquipmentInfoService.py

@@ -7,11 +7,15 @@
 @Software: PyCharm
 """
 import logging
+import random
 
 from django.db import transaction
 
 from Model.models import EquipmentInfoMonday, EquipmentInfoTuesday, EquipmentInfoWednesday, EquipmentInfoThursday, \
-    EquipmentInfoFriday, EquipmentInfoSaturday, EquipmentInfoSunday
+    EquipmentInfoFriday, EquipmentInfoSaturday, EquipmentInfoSunday, EquipmentInfo1, EquipmentInfo2, EquipmentInfo3, \
+    EquipmentInfo4, EquipmentInfo5, EquipmentInfo6, EquipmentInfo7, EquipmentInfo8, EquipmentInfo9, EquipmentInfo10, \
+    EquipmentInfo11, EquipmentInfo12, EquipmentInfo13, EquipmentInfo14, EquipmentInfo15, EquipmentInfo16, \
+    EquipmentInfo17, EquipmentInfo18, EquipmentInfo19, EquipmentInfo20
 from Object.utils import LocalDateTimeUtil
 
 
@@ -80,3 +84,17 @@ class EquipmentInfoService:
             er_log.exception(repr(e))
             er_log.error(repr(e))
             return False
+
+    @staticmethod
+    def random_get_equipment_info_obj(**kwargs):
+        """
+        随机返回一个推送数据表对象
+        """
+        equipment_info_list = [
+            EquipmentInfo1(**kwargs), EquipmentInfo2(**kwargs), EquipmentInfo3(**kwargs), EquipmentInfo4(**kwargs),
+            EquipmentInfo5(**kwargs), EquipmentInfo6(**kwargs), EquipmentInfo7(**kwargs), EquipmentInfo8(**kwargs),
+            EquipmentInfo9(**kwargs), EquipmentInfo10(**kwargs),
+            EquipmentInfo11(**kwargs), EquipmentInfo12(**kwargs), EquipmentInfo13(**kwargs), EquipmentInfo14(**kwargs),
+            EquipmentInfo15(**kwargs), EquipmentInfo16(**kwargs), EquipmentInfo17(**kwargs), EquipmentInfo18(**kwargs),
+            EquipmentInfo19(**kwargs), EquipmentInfo20(**kwargs)]
+        return random.choice(equipment_info_list)