删除星期推送分表不用函数

Service/DevicePushService.py

@@ -305,7 +305,7 @@ class DevicePushService:
         try:
             push_kwargs = param['push_kwargs']
             push_result = False
-            LOGGING.info('准备推送的数据:{}'.format(param))
+
             # is_st为1或3,且推送类型为apns,gcm,华为,异步推送图片
             if (param['is_st'] == 1 or param['is_st'] == 3) and \
                     (push_type == 0 or push_type == 1 or push_type == 3):
@@ -367,47 +367,6 @@ class DevicePushService:
             LOGGING.info('发送推送异常,error_line:{},error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
             return False
 
-    @classmethod
-    def created_device_vo(cls, local_date_time, **params):
-        """
-        获取设备推送表对象
-        """
-        return EquipmentInfoService.get_equipment_info_obj(
-            local_date_time,
-            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:{channel}'.format(channel=params['channel']),
-            is_st=params['is_st'],
-            receive_time=params['n_time'],
-            add_time=int(time.time()),
-            storage_location=params['storage_location'],
-            border_coords='',
-            event_tag=params['event_tag'],
-            answer_status=True if params['dealings_type'] == 1 else False
-        )
-
-    @staticmethod
-    def save_equipment_info(**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
-        }
-        EquipmentInfoService.randoms_insert_equipment_info(**kwargs)
-
     @staticmethod
     def get_msg_title(nickname):
         """

Service/EquipmentInfoService.py

@@ -6,18 +6,13 @@
 @Email   : zhangdongming@asj6.wecom.work
 @Software: PyCharm
 """
-import logging
 import random
 
-from django.db import transaction
-
-from Model.models import EquipmentInfoMonday, EquipmentInfoTuesday, EquipmentInfoWednesday, EquipmentInfoThursday, \
-    EquipmentInfoFriday, EquipmentInfoSaturday, EquipmentInfoSunday, EquipmentInfo1, EquipmentInfo2, EquipmentInfo3, \
+from AnsjerPush.config import LOGGER
+from Model.models import 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
-from AnsjerPush.config import LOGGER
 
 EQUIPMENT_INFO_LIST = [
     EquipmentInfo1, EquipmentInfo2, EquipmentInfo3, EquipmentInfo4, EquipmentInfo5, EquipmentInfo6,
@@ -28,70 +23,6 @@ EQUIPMENT_INFO_LIST = [
 
 class EquipmentInfoService:
 
-    @staticmethod
-    def get_equipment_info_obj(dt, **kwargs):
-        """
-        根据日期判断是星期几，返回相应的对象实例
-        @param dt: 日期 例：2022-03-03
-        @param kwargs: 设备信息属性值
-        @return: 星期一至星期天equipment_info对象实例
-        """
-        logger = logging.getLogger('info')
-        week = LocalDateTimeUtil.date_to_week(dt)
-        equipment_info = None
-        if week == 1:
-            equipment_info = EquipmentInfoMonday(**kwargs)
-        elif week == 2:
-            equipment_info = EquipmentInfoTuesday(**kwargs)
-        elif week == 3:
-            equipment_info = EquipmentInfoWednesday(**kwargs)
-        elif week == 4:
-            equipment_info = EquipmentInfoThursday(**kwargs)
-        elif week == 5:
-            equipment_info = EquipmentInfoFriday(**kwargs)
-        elif week == 6:
-            equipment_info = EquipmentInfoSaturday(**kwargs)
-        elif week == 7:
-            equipment_info = EquipmentInfoSunday(**kwargs)
-        logger.info(type(equipment_info))
-        logger.info('model数据为：'.format(equipment_info))
-        return equipment_info
-
-    @staticmethod
-    def equipment_info_bulk_create(week_val, equipment_info_list):
-        """
-        根据week_val判断，进行表对象选择存储
-        @param week_val: 星期一至星期天，int类型
-        @param equipment_info_list: 设备信息实例列表
-        @return: True or False
-        """
-        try:
-            with transaction.atomic():
-                if equipment_info_list and len(equipment_info_list) > 0:
-                    if week_val == 0:
-                        return False
-                    if week_val == 1:
-                        EquipmentInfoMonday.objects.bulk_create(equipment_info_list)
-                    elif week_val == 2:
-                        EquipmentInfoTuesday.objects.bulk_create(equipment_info_list)
-                    elif week_val == 3:
-                        EquipmentInfoWednesday.objects.bulk_create(equipment_info_list)
-                    elif week_val == 4:
-                        EquipmentInfoThursday.objects.bulk_create(equipment_info_list)
-                    elif week_val == 5:
-                        EquipmentInfoFriday.objects.bulk_create(equipment_info_list)
-                    elif week_val == 6:
-                        EquipmentInfoSaturday.objects.bulk_create(equipment_info_list)
-                    elif week_val == 7:
-                        EquipmentInfoSunday.objects.bulk_create(equipment_info_list)
-                    return True
-                return False
-        except Exception as e:
-            er_log = logging.getLogger('django')
-            er_log.exception(repr(e))
-            er_log.error(repr(e))
-            return False
-
     @staticmethod
     def randoms_insert_equipment_info(**kwargs):
         """