locky před 3 roky
rodič
revize
4ac3197baa
1 změnil soubory, kde provedl 6 přidání a 14 odebrání
  1. 6 14
      Controller/DetectControllerV2.py

+ 6 - 14
Controller/DetectControllerV2.py

@@ -123,7 +123,7 @@ class NotificationView(View):
                                'push_type', 'userID_id', 'userID__NickName',
                                'lang', 'm_code', 'tz', 'uid_set__nickname', 'uid_set__detect_interval', 'uid_set__detect_group',
                                'uid_set__channel')
-                    print(uid_push_qs)
+                    logger.info(uid_push_qs)
                     # 新建一个list接收数据
                     redis_list = []
                     # 把数据库数据追加进redis_list
@@ -131,9 +131,6 @@ class NotificationView(View):
                         redis_list.append(qs)
                     # 修改redis数据,并设置过期时间为10分钟
                     redisObj.set_data(key=ykey, val=str(redis_list), expire=600)
-                    if not redis_list:
-                        res_data = {'code': 404, 'msg': 'error !'}
-                        return JsonResponse(status=200, data=res_data)
             else:
                 # 从数据库查询出来
                 uid_push_qs = UidPushModel.objects.filter(uid_set__uid=uid,uid_set__detect_status=1). \
@@ -141,7 +138,7 @@ class NotificationView(View):
                            'push_type', 'userID_id', 'userID__NickName',
                            'lang', 'm_code', 'tz', 'uid_set__nickname', 'uid_set__detect_interval', 'uid_set__detect_group',
                            'uid_set__channel')
-                print(uid_push_qs)
+                logger.info(uid_push_qs)
                 # 新建一个list接收数据
                 redis_list = []
                 # 把数据库数据追加进redis_list
@@ -149,17 +146,12 @@ class NotificationView(View):
                     redis_list.append(qs)
                 # 修改redis数据,并设置过期时间为10分钟
                 redisObj.set_data(key=ykey, val=str(redis_list), expire=600)
-                if not redis_list:
-                    res_data = {'code': 404, 'msg': 'error !'}
-                    return JsonResponse(status=200, data=res_data)
 
             if not redis_list:
-                print("没有redi_list")
-                res_data = {'code': 0, 'msg': 'no redi_list success!'}
-                return JsonResponse(status=200, data=res_data)
-            logger.info("(当前设备从数据库中获取的所有信息)redis_list:")
-            logger.info(redis_list)
-            # is_sys_msg = self.is_sys_msg(int(event_type))
+                logger.info('no redis_list')
+                return JsonResponse(status=200, data={'code': 404, 'msg': 'no redis_list'})
+            logger.info('redis_list: {}'.format(redis_list))
+
             nickname = redis_list[0]['uid_set__nickname']
             detect_interval = redis_list[0]['uid_set__detect_interval']
             detect_group = redis_list[0]['uid_set__detect_group']