完善日志信息

Controller/SerialNumberController.py

@@ -273,7 +273,7 @@ class SerialNumberView(View):
                         'user_id': 1,
                         'status': 200,
                         'time': now_time,
-                        'operation': '绑定uid',
+                        'operation': '序列号{}绑定uid{}'.format(serial, uid.uid),
                         'content': json.dumps(content),
                         'url': 'serialNumber/attachUID',
                     }
@@ -344,9 +344,9 @@ class SerialNumberView(View):
             return response.json(444)
 
     def do_detach_uid(self, request, request_dict, response):
-        serial_number = request_dict.get('serial_number', None)
         token = request_dict.get('token', None)
         time_stamp = request_dict.get('time_stamp', None)
+        serial_number = request_dict.get('serial_number', None)
 
         if not all([token, time_stamp, serial_number]):
             return response.json(444)
@@ -370,16 +370,15 @@ class SerialNumberView(View):
         if iot.exists():
             iot.delete()
 
+        uid = uid_serial.uid.uid
         company_serial_qs = CompanySerialModel.objects.filter(id=uid_serial.company_serial.id)
         if company_serial_qs.exists():
             company_serial = company_serial_qs[0]
             company_serial.status = 1
             company_serial.save()
-            mark = company_serial.company.mark
-            dv_qs = Device_Info.objects.filter(serial_number=serial_number + mark)
+            dv_qs = Device_Info.objects.filter(UID=uid)
             if dv_qs.exists():
-                # a.主用户删除设备
-                uid = dv_qs[0].UID
+                # 删除设备
                 dv_qs.delete()
                 # 删除设备影子信息uid_set   外键关联删除设备推送配置信息 uid_push
                 up_qs = UidPushModel.objects.filter(uid_set__uid=uid)
@@ -389,7 +388,7 @@ class SerialNumberView(View):
                 else:
                     up_qs.delete()
 
-        UIDModel.objects.filter(uid=uid_serial.uid.uid).update(status=0)    # 重置uid的使用状态为未分配
+        UIDModel.objects.filter(uid=uid).update(status=0)    # 重置uid的使用状态为未分配
         uid_serial.delete()
 
         # 记录操作日志
@@ -400,7 +399,7 @@ class SerialNumberView(View):
             'user_id': 1,
             'status': 200,
             'time': now_time,
-            'operation': '解绑uid',
+            'operation': '序列号{}解绑uid{}'.format(serial, uid),
             'content': json.dumps(content),
             'url': 'serialNumber/detachUID',
         }