Jelajahi Sumber

删除旧推送分表写入数据代码

locky 1 tahun lalu
induk
melakukan
f9921da6d8
2 mengubah file dengan 2 tambahan dan 138 penghapusan
  1. 1 66
      Controller/EquipmentInfo.py
  2. 1 72
      Service/EquipmentInfoService.py

+ 1 - 66
Controller/EquipmentInfo.py

@@ -57,72 +57,7 @@ class EquipmentInfo(View):
             return response.json(444, {"parm": "operation"})
 
     def add_info(self, request_dict, userID, response):
-        devUid = request_dict.get('devUid', None)
-        Channel = request_dict.get('Channel', None)
-        eventType = request_dict.get('eventType', None)
-        eventTime = request_dict.get('eventTime', None)
-        receiveTime = request_dict.get('receiveTime', None)
-        alarm = request_dict.get('alarm', None)
-        if not devUid or not Channel or not eventType or not eventTime or not alarm or not receiveTime:
-            return response.json(444, 'devUid, Channel, eventType, eventTime, alarm, receiveTime')
-        own_device = ModelService.check_own_device(userID, UID=devUid)
-        if own_device is not True:
-            return response.json(14)
-        device_info = Device_Info.objects.filter(UID=devUid, userID_id=userID)
-        if not device_info.exists():
-            return response.json(14)
-        try:
-
-            nowTime = int(time.time())
-            equipment_info = Equipment_Info(
-                userID_id=userID,
-                devUid=devUid,
-                Channel=Channel,
-                eventType=eventType,
-                receiveTime=receiveTime,
-                eventTime=eventTime,
-                devNickName=device_info[0].NickName,
-                addTime=nowTime,
-                alarm=alarm)
-            equipment_info.save()
-            uid_push_qs = UidPushModel.objects.filter(uid_set__uid=devUid, uid_set__detect_status=1). \
-                values('token_val', 'app_type', 'appBundleId', 'm_code', 'push_type', 'userID_id', 'userID__NickName',
-                       'lang', 'm_code', 'tz', 'uid_set__nickname', 'uid_set__detect_interval', 'uid_set__detect_group',
-                       'uid_set__channel')
-            tz = '0'
-            if uid_push_qs.exists():
-                tz = uid_push_qs.first().tz
-            local_date_time = CommonService.get_now_time_str(n_time=nowTime, tz=tz, lang='cn')
-            local_date_time = local_date_time[0:10]
-            equipment_info_vo = EquipmentInfoService.get_equipment_info_obj(
-                local_date_time,
-                device_user_id=userID,
-                event_time=nowTime,
-                event_type=eventType,
-                device_uid=devUid,
-                device_nick_name=device_info[0].NickName,
-                channel=Channel,
-                alarm=alarm,
-                receive_time=receiveTime,
-                add_time=nowTime,
-            )
-            equipment_info_vo.save()
-        except Exception:
-            errorInfo = traceback.format_exc()
-            print(errorInfo)
-            return response.json(500, errorInfo)
-        else:
-            if equipment_info.id:
-                return response.json(0, {'infoID': equipment_info.id,
-                                         'devUid': devUid,
-                                         'Channel': Channel,
-                                         'alarm': alarm,
-                                         'eventType': eventType,
-                                         'eventTime': eventTime,
-                                         'receiveTime': receiveTime,
-                                         'devNickName': equipment_info.devNickName})
-            else:
-                return response.json(500)
+        return response.json(0)
 
     def query_info(self, request_dict, userID, response):
         page = int(request_dict.get('page', None))

+ 1 - 72
Service/EquipmentInfoService.py

@@ -8,10 +8,9 @@
 """
 import datetime
 import itertools
-import logging
 import time
 
-from django.db.models import Value, CharField, Q, F
+from django.db.models import Value, CharField, Q
 
 from Model.models import EquipmentInfoMonday, EquipmentInfoTuesday, EquipmentInfoWednesday, EquipmentInfoThursday, \
     EquipmentInfoFriday, EquipmentInfoSaturday, EquipmentInfoSunday, EquipmentInfo1, EquipmentInfo2, EquipmentInfo3, \
@@ -300,36 +299,6 @@ class EquipmentInfoService:
             regroup_list.append(int(val))
         return regroup_list
 
-    @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)
-        logger.info('本周{}'.format(str(week)))
-        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(equipment_info)
-        return equipment_info
-
     @classmethod
     def get_combo_types(cls, event_type, event_tag):
         """
@@ -470,46 +439,6 @@ class EquipmentInfoService:
         else:
             return ',' + str(event_type) + ','
 
-    @staticmethod
-    def update_equipment_answer_status(user_id, uid, event_time):
-        """
-        更新一键通话消息状态
-        @param user_id: 用户id
-        @param uid: uid
-        @param event_time: 事件时间
-        @return updated_flag: bool
-        """
-        updated_flag = False
-        updated = EquipmentInfoMonday.objects.filter(device_user_id=user_id, device_uid=uid, event_time=event_time,
-                                                     event_type__in=[606, 607]).update(answer_status=1)
-        if updated:
-            updated_flag = True
-        updated = EquipmentInfoTuesday.objects.filter(device_user_id=user_id, device_uid=uid, event_time=event_time,
-                                                      event_type__in=[606, 607]).update(answer_status=1)
-        if updated:
-            updated_flag = True
-        updated = EquipmentInfoWednesday.objects.filter(device_user_id=user_id, device_uid=uid, event_time=event_time,
-                                                        event_type__in=[606, 607]).update(answer_status=1)
-        if updated:
-            updated_flag = True
-        updated = EquipmentInfoThursday.objects.filter(device_user_id=user_id, device_uid=uid, event_time=event_time,
-                                                       event_type__in=[606, 607]).update(answer_status=1)
-        if updated:
-            updated_flag = True
-        updated = EquipmentInfoFriday.objects.filter(device_user_id=user_id, device_uid=uid, event_time=event_time,
-                                                     event_type__in=[606, 607]).update(answer_status=1)
-        if updated:
-            updated_flag = True
-        updated = EquipmentInfoSaturday.objects.filter(device_user_id=user_id, device_uid=uid, event_time=event_time,
-                                                       event_type__in=[606, 607]).update(answer_status=1)
-        if updated:
-            updated_flag = True
-        updated = EquipmentInfoSunday.objects.filter(device_user_id=user_id, device_uid=uid, event_time=event_time,
-                                                     event_type__in=[606, 607]).update(answer_status=1)
-        if updated:
-            updated_flag = True
-        return updated_flag
-
     @classmethod
     def union_equipment_info(cls, user_id, uid_list, event_type, start_time, end_time, page, line):
         """