删除设备时，记录uid日志

Controller/TestApi.py

@@ -56,6 +56,7 @@ from Service.CommonService import CommonService
 from Service.ModelService import ModelService
 from Object.m3u8generate import PlaylistGenerator
 from Model.models import Device_User, Device_Info, UID_Bucket, UID_Preview, UidSetModel, UidPushModel
+from Ansjer.config import PAYPAL_CRD,SERVER_DOMAIN,SERVER_DOMAIN_SSL,PAYPAL_WEB_HOOK_ID
 
 
 
@@ -146,7 +147,11 @@ class testView(View):
             return 123
 
     def findPaypalOrder(self,request_dict, response):
-
+        from Object.ETkObject import ETkObject
+        etkObj = ETkObject(etk='')
+        etk = etkObj.encrypt('RBF474J66TLAGHW9111A')
+        exit(etk)
+        return HttpResponse(PAYPAL_WEB_HOOK_ID)
         logger = logging.getLogger('info')
         logger.info('------记录aws bucket init时间')
         logger.info(int(time.time()))
@@ -757,8 +762,10 @@ class testView(View):
     def generate_token(self,request_dict,userID):
         # UserIdToken
         tko = TokenObject()
+        userID = request_dict.get('userID',None)
+        username = request_dict.get('username',None)
         res = tko.generate(
-            data={'userID': 162156677434713800138000, 'lang': 'cn', 'user': '3076898361@qq.com', 'm_code': '12341324321'})
+            data={'userID': userID, 'lang': 'cn', 'user': username, 'm_code': username})
         #uidToken
         # utko = UidTokenObject()
         # res = utko.generate(data={'uid': '4UZSEDP93MJ3X7YB111A','channel': 1})

Service/MiscellService.py

@@ -14,7 +14,7 @@ from Service.ModelService import ModelService
 from Service.TemplateService import TemplateService
 from Object.RedisObject import RedisObject
 from Ansjer.config import SERVER_TYPE
-from Model.models import Device_User
+from Model.models import Device_User, Device_Info
 # coding:utf-8
 from boto3 import Session
 from botocore.exceptions import ClientError
@@ -457,6 +457,22 @@ def dynamo_db_add_log_ctr(request, status_code):
     if password is not None:
         request_dict = dict(request_dict)
         request_dict.pop('userPwd')
+
+    #删除设备时记录设备UID
+    if request_path == 'equipment/delete':
+        device_id = request_dict.get('id', None)
+        if device_id:
+            uid = Device_Info.objects.filter(id=device_id).value("UID")
+            request_dict['uid'] = uid[0]['UID']
+    if request_path == 'equipment/batchDelete':
+        device_ids = request_dict.get('ids', None)
+        if device_ids:
+            uids_query = Device_Info.objects.filter(id__in=device_ids).value("UID")
+            uids = ''
+            for uid in uids_query:
+                uids = uids + uid['UID'] + ','
+            request_dict['uids'] = uids
+
     content = json.dumps(request_dict)
     addTime = int(time.time())
     if DOMAIN_HOST == 'www.zositechc.cn':

Service/TemplateService.py

@@ -75,6 +75,7 @@ class TemplateService:
             'equipment/modifyUserEquipment',
             'equipment/add',
             'equipment/delete',
+            'equipment/batchDelete',
             'equipment/query',
             'equipment/flowUpdate',
             'v3/equipment/query',