Merge branch 'master' of http://192.168.136.99:3000/servers/ASJPush

Controller/DetectController.py

@@ -24,8 +24,7 @@ from pyfcm import FCMNotification
 
 from AnsjerPush.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, JPUSH_CONFIG, FCM_CONFIG, \
     APNS_CONFIG, BASE_DIR, APNS_MODE
-from AnsjerPush.config import SERVER_TYPE
-from Model.models import Equipment_Info, UidPushModel, SysMsgModel
+from Model.models import UidPushModel, SysMsgModel
 from Object.ETkObject import ETkObject
 from Object.RedisObject import RedisObject
 from Object.UidTokenObject import UidTokenObject
@@ -33,13 +32,8 @@ from Object.utils import LocalDateTimeUtil
 from Service.CommonService import CommonService
 from Service.EquipmentInfoService import EquipmentInfoService
 
-'''
-http://push.dvema.com/notify/push?etk=Y2lTRXhMTjBWS01sWlpURTVJU0ZWTlJ6RXhNVUU9T3o=&n_time=1526845794&channel=1&event_type=704&is_st=0
-http://push.dvema.com/deviceShadow/generateUTK?username=debug_user&password=debug_password&uid=VVDHCVBYDKFMJRWA111A
-'''
 
-
-# 移动侦测接口
+# 旧移动侦测接口
 class NotificationView(View):
 
     def get(self, request, *args, **kwargs):
@@ -52,9 +46,7 @@ class NotificationView(View):
 
     def validation(self, request_dict):
         logger = logging.getLogger('info')
-        logger.info("-----旧的进来推送接口了")
-        logger.info(request_dict)
-        logger.info(SERVER_TYPE)
+        logger.info("旧移动侦测接口参数:{}".format(request_dict))
         uidToken = request_dict.get('uidToken', None)
         etk = request_dict.get('etk', None)
         channel = request_dict.get('channel', '1')
@@ -62,9 +54,7 @@ class NotificationView(View):
         event_type = request_dict.get('event_type', None)
         is_st = request_dict.get('is_st', None)
         if not all([channel, n_time]):
-            return JsonResponse(status=200, data={
-                'code': 444,
-                'msg': 'param is wrong'})
+            return JsonResponse(status=200, data={'code': 444, 'msg': 'error channel or n_time'})
         if etk:
             eto = ETkObject(etk)
             uid = eto.uid
@@ -73,19 +63,15 @@ class NotificationView(View):
         else:
             utko = UidTokenObject(uidToken)
             uid = utko.UID
-        logger.info("当前调用推送接口的uid：")
-        logger.info(uid)
+        logger.info("旧移动侦测接口的uid：{}".format(uid))
         pkey = '{uid}_{channel}_{event_type}_ptl'.format(uid=uid, event_type=event_type, channel=channel)
-        # ykey = 'MUJ887NLR8K8GBM9111A_redis_qs'.format(uid=uid)
         ykey = '{uid}_redis_qs'.format(uid=uid)
-        # dkey = '{uid}_{channel}_{event_type}_flag'.format(uid=uid, event_type=event_type, channel=channel)
         is_sys_msg = self.is_sys_msg(int(event_type))
         if is_sys_msg is True:
             dkey = '{uid}_{channel}_{event_type}_flag'.format(uid=uid, event_type=event_type, channel=channel)
         else:
             dkey = '{uid}_{channel}_flag'.format(uid=uid, channel=channel)
 
-        # 判断redisObj.get_data(key=pkey):不为空
         redisObj = RedisObject(db=6)
         have_ykey = redisObj.get_data(key=ykey)  # uid_set 数据库缓存
         have_pkey = redisObj.get_data(key=pkey)  # 一分钟限制key
@@ -95,17 +81,12 @@ class NotificationView(View):
         detect_med_type = 0  # 0推送旧机制 1存库不推送，2推送存库
         # 暂时注销
         if have_pkey:
-            if SERVER_TYPE != "Ansjer.formal_settings":
-                res_data = {'code': 0, 'msg': 'Push once every 10 seconds'}
-            else:
-                res_data = {'code': 0, 'msg': 'Push it once a minute'}
-
+            res_data = {'code': 0, 'msg': 'Push it once a minute'}
             return JsonResponse(status=200, data=res_data)
 
         # 数据库读取数据
         if have_ykey:
-            redis_list = eval(redisObj.get_data(key=ykey))
-            logger.info("redis_list----------\n")
+            uid_push_list = eval(redisObj.get_data(key=ykey))
         else:
             # 从数据库查询出来
             uid_push_qs = UidPushModel.objects.filter(uid_set__uid=uid, uid_set__detect_status=1). \
@@ -113,30 +94,23 @@ 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----------\n")
-            logger.info(list(uid_push_qs))
 
-            # 新建一个list接收数据
-            redis_list = []
-            # 把数据库数据追加进redis_list
+            uid_push_list = []
             for qs in uid_push_qs:
-                redis_list.append(qs)
+                uid_push_list.append(qs)
             # 修改redis数据，并设置过期时间为10分钟
-            redisObj.set_data(key=ykey, val=str(redis_list), expire=600)
-            if not redis_list:
+            redisObj.set_data(key=ykey, val=str(uid_push_list), expire=600)
+            if not uid_push_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!'}
+        if not uid_push_list:
+            res_data = {'code': 0, 'msg': 'uid_push_list not exist'}
             return JsonResponse(status=200, data=res_data)
 
-        # is_sys_msg = self.is_sys_msg(int(event_type))
-        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']
+        nickname = uid_push_list[0]['uid_set__nickname']
+        detect_interval = uid_push_list[0]['uid_set__detect_interval']
+        detect_group = uid_push_list[0]['uid_set__detect_group']
         now_time = int(time.time())
         if not nickname:
             nickname = uid
@@ -155,21 +129,11 @@ class NotificationView(View):
                         if detect_interval < 60:
                             detect_interval = 60
                         redisObj.set_data(key=dkey, val=1, expire=detect_interval)
-                # 改为1秒
-                # 如果不是正式
-                if SERVER_TYPE != "Ansjer.formal_settings":
-                    redisObj.set_data(key=pkey, val=1, expire=10)
-                else:
-                    redisObj.set_data(key=pkey, val=1, expire=60)
+                redisObj.set_data(key=pkey, val=1, expire=60)
 
         # 旧模式并且没有pkey,重新创建一个
         if not detect_group and not have_pkey:
-            # 设置推送时间为60秒一次
-            # 如果不是正式
-            if SERVER_TYPE != "Ansjer.formal_settings":
-                redisObj.set_data(key=pkey, val=1, expire=10)
-            else:
-                redisObj.set_data(key=pkey, val=1, expire=60)
+            redisObj.set_data(key=pkey, val=1, expire=60)
         auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
         bucket = oss2.Bucket(auth, 'oss-cn-shenzhen.aliyuncs.com', 'apg')
         kwag_args = {
@@ -185,7 +149,7 @@ class NotificationView(View):
         do_jpush_code = ''
         new_device_info_list = []
         local_date_time = ''
-        for up in redis_list:
+        for up in uid_push_list:
             push_type = up['push_type']
             appBundleId = up['appBundleId']
             token_val = up['token_val']
@@ -247,21 +211,13 @@ class NotificationView(View):
             if detect_med_type == 2 or detect_med_type == 0:
                 try:
                     if push_type == 0:  # ios apns
-                        print('do_apns')
-                        # self.do_apns(**kwag_args)
                         do_apns_code = self.do_apns(**kwag_args)
-                        if isinstance(do_apns_code, int):
-                            push_server_status = do_apns_code
-                        else:
-                            push_server_status = 400
                     elif push_type == 1:  # android gcm
                         print('do_fcm')
                         do_fcm_code = self.do_fcm(**kwag_args)
-                        push_server_status = 200
                     elif push_type == 2:  # android jpush
                         print('do_jpush')
                         do_jpush_code = self.do_jpush(**kwag_args)
-                        push_server_status = do_jpush_code
                 except Exception as e:
                     logger.info("errLine={errLine}, errMsg={errMsg}".format(errLine=e.__traceback__.tb_lineno,
                                                                             errMsg=repr(e)))
@@ -281,14 +237,13 @@ class NotificationView(View):
                 logger.info('----《旧接口》设备信息分表批量保存end')
         if is_st == '0' or is_st == '2':
             print("is_st=0or2")
-            for up in redis_list:
+            for up in uid_push_list:
                 if up['push_type'] == 0:  # ios apns
                     up['do_apns_code'] = do_apns_code
                 elif up['push_type'] == 1:  # android gcm
                     up['do_fcm_code'] = do_fcm_code
                 elif up['push_type'] == 2:  # android jpush
                     up['do_jpush_code'] = do_jpush_code
-                up['test_or_www'] = SERVER_TYPE
                 del up['push_type']
                 del up['userID_id']
                 del up['userID__NickName']
@@ -305,11 +260,10 @@ class NotificationView(View):
             obj = '{uid}/{channel}/{filename}.jpeg'.format(uid=uid, channel=channel, filename=n_time)
             # 设置此签名URL在60秒内有效。
             url = bucket.sign_url('PUT', obj, 7200)
-            for up in redis_list:
+            for up in uid_push_list:
                 up['do_apns_code'] = do_apns_code
                 up['do_fcm_code'] = do_fcm_code
                 up['do_jpush_code'] = do_jpush_code
-                up['test_or_www'] = SERVER_TYPE
                 del up['push_type']
                 del up['userID_id']
                 del up['userID__NickName']
@@ -318,12 +272,7 @@ class NotificationView(View):
                 del up['uid_set__nickname']
                 del up['uid_set__detect_interval']
                 del up['uid_set__detect_group']
-                # 不是正式服务器
-            if SERVER_TYPE != "Ansjer.formal_settings":
-                res_data = {'code': 0, 'img_push': url, 'msg': 'success'}
-            else:
-                # 是正式服务器的时候
-                res_data = {'code': 0, 'img_push': url, 'msg': 'success'}
+            res_data = {'code': 0, 'img_push': url, 'msg': 'success'}
             return JsonResponse(status=200, data=res_data)
 
         elif is_st == '3':
@@ -338,11 +287,10 @@ class NotificationView(View):
                 url = bucket.sign_url('PUT', obj, 7200)
                 img_url_list.append(url)
 
-            for up in redis_list:
+            for up in uid_push_list:
                 up['do_apns_code'] = do_apns_code
                 up['do_fcm_code'] = do_fcm_code
                 up['do_jpush_code'] = do_jpush_code
-                up['test_or_www'] = SERVER_TYPE
                 del up['push_type']
                 del up['userID_id']
                 del up['userID__NickName']
@@ -352,12 +300,7 @@ class NotificationView(View):
                 del up['uid_set__detect_interval']
                 del up['uid_set__detect_group']
 
-            # 不是正式服务器
-            if SERVER_TYPE != "Ansjer.formal_settings":
-                res_data = {'code': 0, 'img_url_list': img_url_list, 'msg': 'success 3'}
-            else:
-                # 是正式服务器的时候
-                res_data = {'code': 0, 'img_url_list': img_url_list, 'msg': 'success 3'}
+            res_data = {'code': 0, 'img_url_list': img_url_list, 'msg': 'success 3'}
             return JsonResponse(status=200, data=res_data)
 
     def get_msg_title(self, appBundleId, nickname):
@@ -401,7 +344,6 @@ class NotificationView(View):
                 send_text = '{msg_type} 通道:{channel}'.format(msg_type=msg_type, channel=channel)
             else:
                 send_text = '{msg_type} 通道:{channel} 日期:{date}'.format(msg_type=msg_type, channel=channel, date=n_date)
-                # send_text = '{msg_type} 通道:{channel} 日期:{date}'.format(msg_type=msg_type, channel=channel, date=n_date)
         else:
             if etype == 704:
                 msg_type = 'Low battery'
@@ -419,16 +361,11 @@ class NotificationView(View):
                     format(msg_type=msg_type, channel=channel, date=n_date)
         return send_text
 
-    def do_jpush(self, uid, channel, appBundleId, token_val, event_type, n_time,
-                 msg_title, msg_text):
+    def do_jpush(self, uid, channel, appBundleId, token_val, event_type, n_time, msg_title, msg_text):
         app_key = JPUSH_CONFIG[appBundleId]['Key']
         master_secret = JPUSH_CONFIG[appBundleId]['Secret']
-        # 此处换成各自的app_key和master_secre
         _jpush = jpush.JPush(app_key, master_secret)
         push = _jpush.create_push()
-        # if you set the logging level to "DEBUG",it will show the debug logging.
-        # _jpush.set_logging("DEBUG")
-        # push.audience = jpush.all_
         push.audience = jpush.registration_id(token_val)
         push_data = {"alert": "Motion ", "event_time": n_time, "event_type": event_type, "msg": "",
                      "received_at": n_time, "sound": "sound.aif", "uid": uid, "zpush": "1", "channel": channel}
@@ -446,17 +383,6 @@ class NotificationView(View):
             logger.info(e)
             status_code = 100
         return status_code
-        # try:
-        #     res = push.send()
-        #     print(res)
-        # except Exception as e:
-        #     print("jpush fail")
-        #     print("Exception")
-        #     print(repr(e))
-        #     return
-        # else:
-        #     print("jpush success")
-        #     return
 
     def do_fcm(self, uid, channel, appBundleId, token_val, event_type, n_time, msg_title, msg_text):
         try:
@@ -473,17 +399,9 @@ class NotificationView(View):
                                                        'default_sound': True,
                                                        'default_light_settings': True
                                                    })
-        print('fcm push ing')
-        print(result)
         return result
 
-    def do_apns(self, uid, channel, appBundleId, token_val, event_type, n_time, msg_title,
-                msg_text):
-        logger = logging.getLogger('info')
-        logger.info("进来do_apns函数了")
-        logger.info(token_val)
-        logger.info(APNS_MODE)
-        logger.info(os.path.join(BASE_DIR, APNS_CONFIG[appBundleId]['pem_path']))
+    def do_apns(self, uid, channel, appBundleId, token_val, event_type, n_time, msg_title, msg_text):
         try:
             cli = apns2.APNSClient(mode=APNS_MODE,
                                    client_cert=os.path.join(BASE_DIR, APNS_CONFIG[appBundleId]['pem_path']))
@@ -492,218 +410,13 @@ class NotificationView(View):
                          "received_at": n_time, "sound": "", "uid": uid, "zpush": "1", "channel": channel}
             alert = apns2.PayloadAlert(body=msg_text, title=msg_title)
             payload = apns2.Payload(alert=alert, custom=push_data, sound="default")
-
-            # return uid, channel, appBundleId, str(token_val), event_type, n_time, msg_title,msg_text
             n = apns2.Notification(payload=payload, priority=apns2.PRIORITY_LOW)
             res = cli.push(n=n, device_token=token_val, topic=appBundleId)
-            print(res.status_code)
-            logger.info("推送状态：")
-            logger.info(res.status_code)
-
-            #     200, 推送成功。
-            # 　　400, 请求有问题。
-            # 　　403, 证书或Token有问题。
-            # 　　405, 请求方式不正确, 只支持POST请求
-            # 　　410, 设备的Token与证书不一致
             if res.status_code == 200:
                 return res.status_code
             else:
-                print('apns push fail')
-                print(res.reason)
-                logger.info('apns push fail')
-                logger.info(res.reason)
                 return res.status_code
         except (ValueError, ArithmeticError):
             return 'The program has a numeric format exception, one of the arithmetic exceptions'
         except Exception as e:
-            print(repr(e))
-            logger.info(repr(e))
             return repr(e)
-
-    def do_update_detect_interval(self, uid, channel, redisObject, detect_interval):
-        if channel == 0:
-            channel = 17
-        else:
-            channel += 1
-        for i in range(1, channel):
-            tmpDKey = '{uid}_{channel}_{event_type}_flag'.format(uid=uid, event_type=51, channel=i)
-            if tmpDKey is not False:
-                llt = redisObject.get_ttl(tmpDKey)
-                if llt > detect_interval:
-                    redisObject.set_data(key=tmpDKey, val=1, expire=detect_interval)
-
-            tmpDKey = '{uid}_{channel}_{event_type}_flag'.format(uid=uid, event_type=54, channel=i)
-            if tmpDKey is not False:
-                llt = redisObject.get_ttl(tmpDKey)
-                if llt > detect_interval:
-                    redisObject.set_data(key=tmpDKey, val=1, expire=detect_interval)
-
-
-# http://test.dvema.com/detect/add?uidToken=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1aWQiOiJQMldOR0pSRDJFSEE1RVU5MTExQSJ9.xOCI5lerk8JOs5OcAzunrKCfCrtuPIZ3AnkMmnd-bPY&n_time=1526845794&channel=1&event_type=51&is_st=0
-# 移动侦测接口
-class PushNotificationView(View):
-
-    def get(self, request, *args, **kwargs):
-        request.encoding = 'utf-8'
-        # operation = kwargs.get('operation')
-        return self.validation(request.GET)
-
-    def post(self, request, *args, **kwargs):
-        request.encoding = 'utf-8'
-        # operation = kwargs.get('operation')
-        return self.validation(request.POST)
-
-    def validation(self, request_dict):
-        etk = request_dict.get('etk', None)
-        channel = request_dict.get('channel', '1')
-        n_time = request_dict.get('n_time', None)
-        event_type = request_dict.get('event_type', None)
-        is_st = request_dict.get('is_st', None)
-        eto = ETkObject(etk)
-        uid = eto.uid
-        if len(uid) == 20:
-            redisObj = RedisObject(db=6)
-            # pkey = '{uid}_{channel}_ptl'.format(uid=uid, channel=channel)
-            pkey = '{uid}_ptl'.format(uid=uid)
-            ykey = '{uid}_redis_qs'.format(uid=uid)
-            if redisObj.get_data(key=pkey):
-                res_data = {'code': 0, 'msg': 'success,!33333333333'}
-                return JsonResponse(status=200, data=res_data)
-            else:
-                redisObj.set_data(key=pkey, val=1, expire=60)
-            ##############
-            redis_data = redisObj.get_data(key=ykey)
-            if redis_data:
-                redis_list = eval(redis_data)
-            else:
-                # 设置推送时间为60秒一次
-                redisObj.set_data(key=pkey, val=1, expire=60)
-                print("从数据库查到数据")
-                # 从数据库查询出来
-                uid_push_qs = UidPushModel.objects.filter(uid_set__uid=uid, uid_set__detect_status=1). \
-                    values('token_val', 'app_type', 'appBundleId',
-                           'push_type', 'userID_id', 'lang', 'm_code',
-                           'tz', 'uid_set__nickname')
-                # 新建一个list接收数据
-                redis_list = []
-                # 把数据库数据追加进redis_list
-                for qs in uid_push_qs:
-                    redis_list.append(qs)
-                # 修改redis数据，并设置过期时间为10分钟
-            if redis_list:
-                redisObj.set_data(key=ykey, val=str(redis_list), expire=600)
-                auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
-                bucket = oss2.Bucket(auth, 'oss-cn-shenzhen.aliyuncs.com', 'apg')
-                self.do_bulk_create_info(redis_list, n_time, channel, event_type, is_st, uid)
-                if is_st == '0' or is_st == '2':
-                    return JsonResponse(status=200, data={'code': 0, 'msg': 'success44444444444444444'})
-                elif is_st == '1':
-                    # 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)
-                elif is_st == '3':
-                    # 人形检测带动图
-                    img_url_list = []
-                    for i in range(int(is_st)):
-                        obj = '{uid}/{channel}/{filename}_{st}.jpeg'. \
-                            format(uid=uid, channel=channel, filename=n_time, st=i)
-                        # 设置此签名URL在60秒内有效。
-                        url = bucket.sign_url('PUT', obj, 7200)
-                        img_url_list.append(url)
-                    res_data = {'code': 0, 'img_url_list': img_url_list, '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': 'wrong etk'})
-
-    def do_bulk_create_info(self, uaqs, n_time, channel, event_type, is_st, uid):
-        now_time = int(time.time())
-        # 设备昵称
-        userID_ids = []
-        sys_msg_list = []
-        is_sys_msg = self.is_sys_msg(int(event_type))
-        is_st = int(is_st)
-        eq_list = []
-        nickname = uaqs[0]['uid_set__nickname']
-        if not nickname:
-            nickname = uid
-        for ua in uaqs:
-            lang = ua['lang']
-            tz = ua['tz']
-            userID_id = ua["userID_id"]
-            if userID_id not in userID_ids:
-
-                if is_sys_msg:
-                    sys_msg_text = self.get_msg_text(channel=channel, n_time=n_time, lang=lang, tz=tz,
-                                                     event_type=event_type, is_sys=1)
-                    sys_msg_list.append(SysMsgModel(
-                        userID_id=userID_id,
-                        msg=sys_msg_text,
-                        addTime=now_time,
-                        updTime=now_time,
-                        uid=uid,
-                        eventType=event_type))
-                else:
-                    eq_list.append(Equipment_Info(
-                        userID_id=userID_id,
-                        eventTime=n_time,
-                        eventType=event_type,
-                        devUid=uid,
-                        devNickName=nickname,
-                        Channel=channel,
-                        alarm='Motion \tChannel:{channel}'.format(channel=channel),
-                        is_st=is_st,
-                        receiveTime=n_time,
-                        addTime=now_time,
-                        storage_location=1
-                    ))
-        if eq_list:
-            print('eq_list')
-            Equipment_Info.objects.bulk_create(eq_list)
-        if is_sys_msg:
-            print('sys_msg')
-            SysMsgModel.objects.bulk_create(sys_msg_list)
-        return True
-
-    def is_sys_msg(self, event_type):
-        event_type_list = [702, 703, 704]
-        if event_type in event_type_list:
-            return True
-        return False
-
-    def get_msg_text(self, channel, n_time, lang, tz, event_type, is_sys=0):
-        n_date = CommonService.get_now_time_str(n_time=n_time, tz=tz)
-        etype = int(event_type)
-        if lang == 'cn':
-            if etype == 704:
-                msg_type = '电量过低'
-            elif etype == 702:
-                msg_type = '摄像头休眠'
-            elif etype == 703:
-                msg_type = '摄像头唤醒'
-            else:
-                msg_type = ''
-            if is_sys:
-                send_text = '{msg_type} 通道:{channel}'.format(msg_type=msg_type, channel=channel)
-            else:
-                send_text = '{msg_type} 通道:{channel} 日期:{date}'.format(msg_type=msg_type, channel=channel, date=n_date)
-        else:
-            if etype == 704:
-                msg_type = 'Low battery'
-            elif etype == 702:
-                msg_type = 'Camera sleep'
-            elif etype == 703:
-                msg_type = 'Camera wake'
-            else:
-                msg_type = ''
-            if is_sys:
-                send_text = '{msg_type} channel:{channel}'. \
-                    format(msg_type=msg_type, channel=channel)
-            else:
-                send_text = '{msg_type} channel:{channel} date:{date}'. \
-                    format(msg_type=msg_type, channel=channel, date=n_date)
-        return send_text

Controller/DetectControllerV2.py

@@ -95,10 +95,12 @@ class NotificationV2View(View):
             uid_push_qs = UidPushModel.objects.filter(uid_set__uid=uid, uid_set__detect_status=1). \
                 values('token_val', 'app_type', 'appBundleId', 'm_code', 'push_type', 'userID_id', 'userID__NickName',
                        'lang', 'm_code', 'tz', 'uid_set__nickname', 'uid_set__detect_interval', 'uid_set__detect_group',
-                       'uid_set__channel')
+                       'uid_set__channel', 'uid_set__ai_type')
             if not uid_push_qs.exists():
                 logger.info('uid_push 数据不存在')
                 return JsonResponse(status=200, data={'code': 176, 'msg': 'no uid_push data'})
+            ai_type = uid_push_qs.first()['uid_set__ai_type']
+            event_type = self.get_combo_msg_type(ai_type, int(event_type))
             redis_list = []
             for qs in uid_push_qs:
                 redis_list.append(qs)
@@ -202,7 +204,7 @@ class NotificationV2View(View):
                     # 推送消息
                     if not have_dkey:
                         logger.info('准备推送:{}, {}'.format(uid, request_dict))
-                        if (is_st == 1 or is_st == 3) and (push_type == 0 or push_type == 1):   # 推送显示图片
+                        if (is_st == 1 or is_st == 3) and (push_type == 0 or push_type == 1):  # 推送显示图片
                             if is_st == 1:
                                 key = '{}/{}/{}.jpeg'.format(uid, channel, n_time)
                             else:
@@ -310,6 +312,48 @@ class NotificationV2View(View):
             }
             return JsonResponse(status=200, data=json.dumps(data), safe=False)
 
+    @classmethod
+    def get_combo_msg_type(cls, ai_type, event_type):
+        """
+        获取组合类型，ai_type == 47 支持算法小店，需判断组合类型
+        """
+        logger = logging.getLogger('info')
+        try:
+            if ai_type != 47:
+                return event_type
+            # 如触发一个事件，则匹配已用类型 1替换后变成51代表移动侦测 1：移动侦测,2：人形,4：车型,8：人脸
+            event_dict = {
+                1: 51,
+                2: 57,
+                4: 58,
+                16: 59,
+                8: 60,
+                32: 61
+            }
+            event_val = event_dict.get(event_type, 0)
+            # event_val == 0 没有匹配到单个值则认为组合类型
+            # 如是3，则转为二进制11，代表（1+2）触发了移动侦测+人形侦测
+            if event_val == 0:
+                val = cls.dec_to_bin(event_type)
+                return int(val)
+            else:
+                return int(event_val)
+        except Exception as e:
+            logger.info('推送错误异常,errLine:{}, errMsg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
+            return event_type
+
+    @staticmethod
+    def dec_to_bin(num):
+        """
+        十进制转二进制
+        """
+        result = ""
+        while num != 0:
+            ret = num % 2
+            num //= 2
+            result = str(ret) + result
+        return result
+
     def push_thread_test(self, push_type, aws_s3_client, bucket, key, uid, appBundleId, token_val, event_type, n_time,
                          msg_title, msg_text, channel):
         logger = logging.getLogger('info')

Controller/ShadowController.py

@@ -4,7 +4,6 @@ import time
 
 import requests
 from django.http import JsonResponse
-from ratelimit.decorators import ratelimit
 
 from AnsjerPush.config import SERVER_TYPE
 from Model.models import Device_Info, UidSetModel, UID_Preview, VoicePromptModel, UID_Bucket, UidChannelSetModel, \
@@ -38,7 +37,6 @@ def generate_utk(request):
 
 
 # 更新设备影子
-@ratelimit(key='ip', rate='1/3s', block=True)
 def update_device_shadow(request):
     request.encoding = 'utf-8'
     if request.method == 'POST':
@@ -118,6 +116,7 @@ def update_device_shadow(request):
         mobile_4g = request_dict.get('mobile4G', None)
         is_ptz = request_dict.get('is_ptz', None)
         is_ai = request_dict.get('is_ai', None)
+        ai_type = request_dict.get('AiType', None)
         isSupportFourPoint = request_dict.get('isSupportFourPoint', None)
 
         # 更新
@@ -158,6 +157,8 @@ def update_device_shadow(request):
             qs_dict['is_ai'] = is_ai
         if isSupportFourPoint:
             qs_dict['isSupportFourPoint'] = isSupportFourPoint
+        if ai_type:
+            qs_dict['ai_type'] = ai_type
         ipInfo = CommonService.getIpIpInfo(ip, 'CN')
         country_qs = CountryModel.objects.filter(country_code=ipInfo['country_code']).values('id')
         if country_qs.exists():

Controller/gatewayController.py

@@ -71,12 +71,13 @@ class GatewayView(View):
         n_time = int(time.time())
 
         try:
-            nickname = serial_number
             # 查询子设备表id
             gateway_sub_device_qs = GatewaySubDevice.objects.filter(device__serial_number=serial_number,
                                                                     device_type=sensor_type, ieee_addr=ieee_addr,
                                                                     src_addr=src_addr).values('id', 'nickname')
-            if gateway_sub_device_qs.exists():
+            if not gateway_sub_device_qs.exists():
+                return response.json(173)
+            else:
                 gateway_sub_device_id = gateway_sub_device_qs[0]['id']
                 nickname = gateway_sub_device_qs[0]['nickname']
                 sensor_record_dict = {
@@ -98,7 +99,8 @@ class GatewayView(View):
 
                 # (门磁,烟雾,人体)传感器被拆动/拆动恢复,修改拆动状态
                 if sensor_status:
-                    gateway_sub_device_qs.update(is_tampered=1)
+                    if sensor_type != SENSOR_TYPE['smart_button']:  # 智能按钮不更新
+                        gateway_sub_device_qs.update(is_tampered=1)
                 elif sensor_type == SENSOR_TYPE['door_magnet'] or sensor_type == SENSOR_TYPE['smoke_sensor'] or \
                         sensor_type == SENSOR_TYPE['body_sensor']:
                     gateway_sub_device_qs.update(is_tampered=0)
@@ -205,7 +207,7 @@ class GatewayView(View):
         smart_scene_qs = SmartScene.objects.filter(id=scene_id).values('scene_name', 'conditions', 'tasks', 'device_id',
                                                                        'sub_device_id', 'user_id')
         if not smart_scene_qs.exists():
-            return response.json(174)
+            return response.json(173)
 
         nickname = ''
         scene_name = smart_scene_qs[0]['scene_name']

Model/models.py

@@ -1168,6 +1168,7 @@ class UidSetModel(models.Model):
     new_detect_interval = models.IntegerField(blank=True, verbose_name='新加-消息提醒间隔', default=60)  # 秒
     tb_country = models.IntegerField(blank=True, default=0, verbose_name='国家')
     device_type = models.SmallIntegerField(default=0, verbose_name='设备类型')
+    ai_type = models.SmallIntegerField(default=0, verbose_name='检测类型')
 
     class Meta:
         db_table = 'uid_set'