删除设备时，记录uid日志2.0

Service/MiscellService.py

@@ -364,8 +364,25 @@ def addLog(request, status_code):
             if password is not None:
                 request_dict = dict(request_dict)
                 request_dict.pop('userPwd')
+
             content = json.dumps(request_dict)
-            print(content)
+            content = json.loads(content)
+
+            # 删除设备时记录设备UID
+            if request_path == 'equipment/delete':
+                device_id = request_dict.get('id', None)
+                if device_id:
+                    uid = Device_Info.objects.filter(id=device_id).values("UID")
+                    content['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).values("UID")
+                    uids = ''
+                    for uid in uids_query:
+                        uids = uids + uid['UID'] + ','
+                    content['uids'] = uids
+            content = json.dumps(content)
             if user != '':
                 user = user
             else:
@@ -458,21 +475,6 @@ def dynamo_db_add_log_ctr(request, status_code):
         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':