优化设备重置去除字符串空格

AdminController/DeviceManagementController.py

@@ -417,15 +417,22 @@ class DeviceManagement(View):
         if not all([uidList or serialNumberList, delDataOptions]):
             return response.json(444)
         try:
+            # 记录日志
+            content = json.loads(json.dumps(request_dict))
             with transaction.atomic():
                 if uidList:
                     #  uid
                     uidList = uidList.splitlines()  # 按行('\r', '\r\n', \n')切割字符串返回列表
+                    uid_list = []
+                    for uid in uidList:
+                        uid_list.append(uid.replace(" ", ""))
+                    uidList = uid_list
                 else:
                     #  序列号
                     serialNumberList = serialNumberList.splitlines()  # 按行('\r', '\r\n', \n')切割字符串返回列表
                     serial_number_list = []
                     for serial_number in serialNumberList:
+                        serial_number = serial_number.replace(" ", "")
                         serial_number_list.append(serial_number[0:6])
                     uid_company_serial_qs = UIDCompanySerialModel.objects.filter(
                         company_serial__serial_number__in=serial_number_list).values('uid__uid')
@@ -469,8 +476,6 @@ class DeviceManagement(View):
                     for serial in serial_number_list:
                         redis_obj.rpush(UNUSED_SERIAL_REDIS_LIST, serial)
 
-                # 记录日志
-                content = json.loads(json.dumps(request_dict))
                 device_list = uidList if serialNumberList is None else serial_number_list
                 log = {
                     'user_id': 2,
@@ -484,7 +489,15 @@ class DeviceManagement(View):
 
             return response.json(0)
         except Exception as e:
-            print(e)
+            log = {
+                'user_id': 2,
+                'status': 500,
+                'time': int(time.time()),
+                'url': 'deviceManagement/delDeviceData',
+                'content': json.dumps(content),
+                'operation': '删除数据失败的设备列表:{},{},{}'.format(device_list, e.__traceback__.tb_lineno, repr(e)),
+            }
+            LogModel.objects.create(**log)
             return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
     def get_app_device_type_list(self, request_dict, response):