Merge branch 'test' into pzb

Ansjer/test/test.py

@@ -1,35 +1,24 @@
-class Stack(object):
-    """栈"""
-    def __init__(self):
-         self.items = []
+# https://www.now.cn/user/to_register.php?&ajax_code=1&types=mobile&mobile=13119458542
+import random
 
-    def is_empty(self):
-        """判断是否为空"""
-        return self.items == []
 
-    def push(self, item):
-        """加入元素"""
-        self.items.append(item)
+def create_phone():
+    # 第二位数字
+    second = [3, 4, 5, 7, 8][random.randint(0, 4)]
 
-    def pop(self):
-        """弹出元素"""
-        return self.items.pop()
+    # 第三位数字
+    third = {
+        3: random.randint(0, 9),
+        4: [5, 7, 9][random.randint(0, 2)],
+        5: [i for i in range(10) if i != 4][random.randint(0, 8)],
+        7: [i for i in range(10) if i not in [4, 9]][random.randint(0, 7)],
+        8: random.randint(0, 9),
+    }[second]
 
-    def peek(self):
-        """返回栈顶元素"""
-        return self.items[len(self.items)-1]
+    # 最后八位数字
+    suffix = random.randint(9999999,100000000)
 
-    def size(self):
-        """返回栈的大小"""
-        return len(self.items)
-
-if __name__ == "__main__":
-    stack = Stack()
-    stack.push("hello")
-    stack.push("world")
-    stack.push("itcast")
-    print(stack.size())
-    print(stack.peek())
-    print(stack.pop())
-    print(stack.pop())
-    print(stack.pop())
+    # 拼接手机号
+    return "1{}{}{}".format(second, third, suffix)
+print(create_phone())
+# 生成手机号

Controller/DetectController.py

@@ -81,7 +81,7 @@ class DetectControllerView(View):
         if not qs.exists():
             return response.json(0, {'datas': [], 'count': 0})
         qs = qs.values('id', 'devUid', 'devNickName', 'Channel', 'eventType', 'status', 'alarm', 'eventTime',
-                       'receiveTime','is_st')
+                       'receiveTime', 'is_st')
         count = qs.count()
         qr = qs[(page - 1) * line:page * line]
         # send_json = CommonService.qs_to_dict(res)
@@ -92,8 +92,8 @@ class DetectControllerView(View):
         for p in qr:
             if p['is_st'] == '1':
                 p['img'] = bucket.sign_url('GET',
-                                       '{uid}/{channel}/{time}.jpeg'.format(uid=p['devUid'], channel=p['Channel'],
-                                                                            time=p['eventTime']), 300)
+                                           '{uid}/{channel}/{time}.jpeg'.format(uid=p['devUid'], channel=p['Channel'],
+                                                                                time=p['eventTime']), 300)
             res.append(p)
         return response.json(0, {'datas': res, 'count': count})
 
@@ -104,31 +104,31 @@ class DetectControllerView(View):
         app_type = request_dict.get('app_type', None)
         push_type = request_dict.get('push_type', None)
         status = request_dict.get('status', None)
-        m_code = request_dict.get('m_code',None)
+        m_code = request_dict.get('m_code', None)
         print('status')
         print(status)
         if not status:
-            return response.json(444,'status')
+            return response.json(444, 'status')
         if status == '0':
-            if not all([app_type,appBundleId,uid,m_code]):
-                return response.json(444,'app_type,appBundleId,uid,m_code')
+            if not all([app_type, appBundleId, uid, m_code]):
+                return response.json(444, 'app_type,appBundleId,uid,m_code')
             uid_app_qs = UID_App.objects.filter(appBundleId=appBundleId, userID_id=userID, m_code=m_code,
-                                                uid=uid,app_type=app_type)
+                                                uid=uid, app_type=app_type)
             if uid_app_qs.exists():
                 uid_app_qs.update(status=0)
                 return response.json(0)
             else:
                 return response.json(173)
         elif status == '1':
-            if not all([appBundleId,app_type,token_val,uid,m_code]):
-                return response.json(444,'appBundleId,app_type,token_val,uid,m_code')
+            if not all([appBundleId, app_type, token_val, uid, m_code]):
+                return response.json(444, 'appBundleId,app_type,token_val,uid,m_code')
             dvqs = Device_Info.objects.filter(userID_id=userID, UID=uid)
 
             if dvqs.exists():
                 now_time = int(time.time())
                 try:
                     uid_app_qs = UID_App.objects.filter(appBundleId=appBundleId, userID_id=userID, token_val=token_val,
-                                                        uid=uid,m_code=m_code)
+                                                        uid=uid, m_code=m_code)
                     print(uid_app_qs)
                     if uid_app_qs.exists():
                         uid_app_qs.update(status=1)
@@ -141,6 +141,7 @@ class DetectControllerView(View):
                             push_type=push_type,
                             token_val=token_val,
                             status=1,
+                            m_code=m_code,
                             addTime=now_time,
                             updTime=now_time)
                 except Exception as e:
@@ -179,7 +180,7 @@ class NotificationView(View):
         event_type = request_dict.get('event_type', None)
         is_st = request_dict.get('is_st', None)
         if not all([uidToken, channel, n_time]):
-            return JsonResponse(status=404,data={})
+            return JsonResponse(status=404, data={})
             # return response.json(444)
         utko = UidTokenObject(uidToken)
         uid = utko.UID
@@ -197,7 +198,7 @@ class NotificationView(View):
                 # android jpush
                 elif push_type == 2:
                     self.do_jpush(request_dict, ua, response)
-                self.do_save_equipment_info(ua, n_time, channel, event_type,is_st)
+                self.do_save_equipment_info(ua, n_time, channel, event_type, is_st)
             #############
             # 阿里云主账号AccessKey拥有所有API的访问权限，风险很高。强烈建议您创建并使用RAM账号进行API访问或日常运维，请登录 https://ram.console.aliyun.com 创建RAM账号。
 
@@ -352,7 +353,7 @@ class NotificationView(View):
         except Exception as e:
             return response.json(10, repr(e))
 
-    def do_save_equipment_info(self, uaql, n_time, channel, event_type,is_st):
+    def do_save_equipment_info(self, uaql, n_time, channel, event_type, is_st):
         Equipment_Info.objects.create(
             userID_id=uaql['userID_id'],
             eventTime=n_time,

Controller/UserController.py

@@ -307,7 +307,7 @@ class LogoutView(TemplateView):
                 uid_app = UID_App.objects.filter(userID_id=userID, m_code=m_code, status=1)
                 print(uid_app)
                 if uid_app.exists():
-                    uid_app.update(status=3)
+                    uid_app.update(status=2)
             return response.json(0)
         else:
             return response.json(tko.code)
@@ -1139,7 +1139,7 @@ class InitInfoView(View):
     # 初始化设备token
     def init_uid_app(self, request_dict, userID, response):
         token_val = request_dict.get('token_val', None)
-        uid_app = UID_App.objects.filter(userID_id=userID, token_val=token_val, status=3)
+        uid_app = UID_App.objects.filter(userID_id=userID, token_val=token_val, status=2)
         if uid_app.exists():
             uid_app.update(status=1)
             return response.json(0)