db_index=True,

Controller/DetectController.py

@@ -412,7 +412,7 @@ class NotificationView(View):
             uid_push_qs = UidPushModel.objects.filter(uid_set__id=uid_set_id). \
                 values('token_val', 'app_type', 'appBundleId', 'push_type', 'userID_id', 'userID__NickName', 'lang',
                        'tz')
-            if uid_set_qs.exists():
+            if uid_push_qs.exists():
                 auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
                 bucket = oss2.Bucket(auth, 'oss-cn-shenzhen.aliyuncs.com', 'apg')
                 for up in uid_push_qs:

Controller/UserController.py

@@ -1329,95 +1329,6 @@ class InitInfoView(View):
         }
         return response.json(0, res)
 
-    # 初始化设备token
-    # def init_uid22(self, request_dict, userID, response):
-    #     # 未读的系统消息
-    #     sm_count = SysMsgModel.objects.filter(userID_id=userID, status=0).count()
-    #
-    #     token_val = request_dict.get('token_val', None)
-    #     m_code = request_dict.get('m_code', None)
-    #     push_type = request_dict.get('push_type', None)
-    #     appBundleId = request_dict.get('appBundleId', None)
-    #     tz = request_dict.get('tz', None)
-    #     lang = request_dict.get('lang', '')  # 语言区域
-    #     # region = request_dict.get('region', '')  # 语言区域
-    #     nowTime = int(time.time())
-    #     if all([token_val, push_type, appBundleId]):
-    #         push_type = int(push_type)
-    #         if push_type == 0:
-    #             # ios
-    #             app_type = 1
-    #             if appBundleId not in APNS_CONFIG.keys():
-    #                 return response.json(904)
-    #         elif push_type == 1:
-    #             # android
-    #             app_type = 2
-    #             if appBundleId not in FCM_CONFIG.keys():
-    #                 return response.json(904)
-    #         elif push_type == 2:
-    #             # android
-    #             app_type = 2
-    #             if appBundleId not in JPUSH_CONFIG.keys():
-    #                 return response.json(904)
-    #         else:
-    #             return response.json(173)
-    #         uid_list = ModelService.get_uid_list(userID=userID)
-    #         if uid_list:
-    #             # 获取设备推送状态
-    #             uid_set_id_list = UidSetModel.objects.filter(uid__in=uid_list, detect_status=1).values_list('id',
-    #                                                                                                         flat=True)
-    #             if uid_set_id_list:
-    #                 # 批量绑定推送
-    #                 qs_list = []
-    #                 for uid_set_id in uid_set_id_list:
-    #                     uid_push_create_dict = {
-    #                         'uid_set_id': uid_set_id,
-    #                         'userID_id': userID,
-    #                         'appBundleId': appBundleId,
-    #                         'app_type': app_type,
-    #                         'push_type': push_type,
-    #                         'token_val': token_val,
-    #                         'm_code': m_code,
-    #                         'addTime': nowTime,
-    #                         'updTime': nowTime,
-    #                         'lang': lang,
-    #                         'tz': tz
-    #                     }
-    #                     qs_list.append(UidPushModel(**uid_push_create_dict))
-    #                 UidPushModel.objects.bulk_create(qs_list)
-    #
-    #                 update_dict = {
-    #                     'token_val': token_val,
-    #                     'push_type': push_type,
-    #                     'tz': tz,
-    #                 }
-    #                 # 更新当前用户推送设备状态
-    #                 UidPushModel.objects.filter(userID_id=userID, m_code=m_code, uid_set_id__in=uid_set_id_list). \
-    #                     update(**update_dict)
-    #         if appBundleId:
-    #             user_extend_qs = UserExtendModel.objects.filter(userID_id=userID)
-    #             if user_extend_qs.exists():
-    #                 update_dict = {
-    #                     'updTime': nowTime,
-    #                     'appBundleId': appBundleId,
-    #                     'region': lang
-    #                     # 'is_cn':
-    #                 }
-    #                 user_extend_qs.update(**update_dict)
-    #             else:
-    #                 create_dict = {
-    #                     'addTime': nowTime,
-    #                     'updTime': nowTime,
-    #                     'appBundleId': appBundleId,
-    #                     'userID_id': userID,
-    #                     'region': lang
-    #                 }
-    #                 UserExtendModel.objects.create(**create_dict)
-    #     res = {
-    #         'usmsg': sm_count
-    #     }
-    #     return response.json(0, res)
-
 
 # 获取验证码
 class verifyAuthcode(TemplateView):

Model/models.py

@@ -490,6 +490,7 @@ class Equipment_Version(models.Model):
     lang = models.CharField(blank=True, default='en', max_length=32, verbose_name=u'ota包内置语言')
     mci = models.CharField(default='', blank=True, max_length=10, verbose_name='设备类型')
     img = models.TextField(blank=True, default='', verbose_name=u'图片路径')
+
     def __str__(self):
         return self.eid
 
@@ -659,7 +660,7 @@ class SysMsgModel(models.Model):
 # 设备配置表，新
 class UidSetModel(models.Model):
     id = models.AutoField(primary_key=True, verbose_name=u'自增标记ID')
-    uid = models.CharField(max_length=20, verbose_name='设备UID')
+    uid = models.CharField(max_length=20, db_index=True, verbose_name='设备UID')
     channel = models.SmallIntegerField(default=0, verbose_name='通道数量')  #
     detect_status = models.SmallIntegerField(default=0, verbose_name='推送开关')  # 状态[0:关闭,1:开启,2:用户解绑]
     detect_interval = models.IntegerField(verbose_name='推送间隔', default=60)  # 秒