增加推送消息的插入时间

Controller/DetectController.py

@@ -30,6 +30,7 @@ from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 from Object.UidTokenObject import UidTokenObject
 from Service.CommonService import CommonService
+from Object.ETkObject import ETkObject
 
 
 # http://192.168.136.40:8077/detect/changeStatus?uid=JW3684H8BSHG9TTM111A&token_val=18071adc03536302f34&appBundleId=com.ansjer.zccloud_ab&push_type=2&token=local&status=1&app_type=1&m_code=12
@@ -97,7 +98,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','addTime')
         count = qs.count()
         qr = qs[(page - 1) * line:page * line]
         res = []
@@ -514,8 +515,65 @@ class NotificationViewXX(View):
         return self.validation(request.POST)
 
     def validation(self, request_dict):
+        response = ResponseObject()
+        etk = request_dict.get('etk', None)
+        eto = ETkObject(etk)
+        uid = eto.uid
+        channel = request_dict.get('channel', '1')
+        n_time = request_dict.get('n_time', None)
         response = ResponseObject()
         uidToken = request_dict.get('uidToken', None)
         channel = request_dict.get('channel', '1')
         n_time = request_dict.get('n_time', None)
-        return
+        event_type = request_dict.get('event_type', None)
+        is_st = request_dict.get('is_st', None)
+        uid_set_qs = UidSetModel.objects.filter(uid=uid, detect_status=1)
+        if uid_set_qs.exists():
+            uid_set_id = uid_set_qs[0].id
+            nickname = uid_set_qs[0].nickname
+            if not nickname:
+                nickname = uid
+            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():
+                redisObj = RedisObject(db=6)
+                pkey = '{uid}_{channel}_ptl'.format(uid=uid, channel=channel)
+                if redisObj.get_data(key=pkey):
+                    res_data = {'code': 0, 'msg': 'success,!'}
+                    return JsonResponse(status=200, data=res_data)
+                else:
+                    detect_interval = uid_set_qs[0].detect_interval
+                    if detect_interval:
+                        redisObj.set_data(key=pkey, val=1, expire=detect_interval)
+                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:
+                    push_type = up['push_type']
+                    # ios apns
+                    print(push_type)
+                    if push_type == 0:
+                        self.do_apns(request_dict, up, response, uid, channel, nickname)
+                    # android gcm
+                    elif push_type == 1:
+                        self.do_fcm(request_dict, up, response, uid, channel, nickname)
+                        # self.do_gmc(request_dict, up, response, uid, channel,nickname)
+                    # android jpush
+                    elif push_type == 2:
+                        self.do_jpush(request_dict, up, response, uid, channel, nickname)
+                    # self.do_save_equipment_info(ua, n_time, channel, event_type, is_st)
+                # 需求不一样，所以这么做的
+                self.do_bulk_create_info(uid_push_qs, n_time, channel, event_type, is_st, uid)
+                if is_st == '0' or is_st == '2':
+                    return JsonResponse(status=200, data={'code': 0, 'msg': 'success'})
+                else:
+                    # Endpoint以杭州为例，其它Region请按实际情况填写。
+                    obj = '{uid}/{channel}/{filename}.jpeg'.format(uid=uid, channel=channel, filename=n_time)
+                    # 设置此签名URL在60秒内有效。
+                    url = bucket.sign_url('PUT', obj, 7200)
+                    res_data = {'code': 0, 'img_push': url, 'msg': 'success'}
+                    return JsonResponse(status=200, data=res_data)
+            else:
+                return JsonResponse(status=200, data={'code': 404, 'msg': 'data is not exist'})
+        else:
+            return JsonResponse(status=200, data={'code': 404, 'msg': 'data is not exist'})

Service/TemplateService.py

@@ -68,7 +68,7 @@ class TemplateService:
             'equipment/flowUpdate',
             'wechat/authsign',
             'user/initInfo'
-            'detect/queryInfo'
+            # 'detect/queryInfo'
         ]
         return apiList