ss

Controller/DetectController.py

@@ -167,8 +167,9 @@ class NotificationView(View):
         response = ResponseObject()
         uidToken = request_dict.get('uidToken', None)
         channel = request_dict.get('channel', None)
-        n_time = request_dict.get('n_time',None)
-        event_type = request_dict.get('event_type',None)
+        n_time = request_dict.get('n_time', None)
+        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)
             # return response.json(444)
@@ -188,21 +189,21 @@ 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)
+                self.do_save_equipment_info(ua, n_time, channel, event_type)
             #############
             # 阿里云主账号AccessKey拥有所有API的访问权限，风险很高。强烈建议您创建并使用RAM账号进行API访问或日常运维，请登录 https://ram.console.aliyun.com 创建RAM账号。
-            auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
-            # Endpoint以杭州为例，其它Region请按实际情况填写。
-            bucket = oss2.Bucket(auth, 'oss-cn-shenzhen.aliyuncs.com', 'apg')
-            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)
+
+            if is_st == '0':
+                return JsonResponse(status=200, data={'code': 0, 'msg': 'success'})
+            else:
+                auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
+                # Endpoint以杭州为例，其它Region请按实际情况填写。
+                bucket = oss2.Bucket(auth, 'oss-cn-shenzhen.aliyuncs.com', 'apg')
+                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={
@@ -210,7 +211,7 @@ class NotificationView(View):
                 'msg': 'data is not exist'})
 
     def do_jpush(self, request_dict, uaql, response):
-        event_type = request_dict.get('event_type',None)
+        event_type = request_dict.get('event_type', None)
         jpush_config = {
             'com.ansjer.accloud_ab': {
                 'Key': 'f0dc047e5e53fd14199de5b0',
@@ -296,7 +297,7 @@ class NotificationView(View):
             'com.ansjer.customizeda_a': 'AAAAb9YP3rk:APA91bF0HzizVWDc6dKzobY9fsaKDK4veqkOZehDXshVXs8pEEvNWjR_YWbhP60wsRYCHCal8fWN5cECVOWNMMzDsfU88Ty2AUl8S5FtZsmeDTkoGntQOswBr8Ln7Fm_LAp1VqTf9CpM',
         }
         serverKey = gcm_config[appBundleId]
-        event_type = request_dict.get('event_type',None)
+        event_type = request_dict.get('event_type', None)
         push_data = {"alert": "Motion ", "event_time": n_time, "event_type": event_type, "msg": "",
                      "received_at": n_time, "sound": "sound.aif", "uid": uid}
         json_data = {
@@ -343,7 +344,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):
+    def do_save_equipment_info(self, uaql, n_time, channel, event_type):
         Equipment_Info.objects.create(
             userID_id=uaql['userID_id'],
             eventTime=n_time,