修改find_device_serial函数

Controller/TestApi.py

@@ -1033,41 +1033,32 @@ class testView(View):
             firmware_time_code_no = request_dict.get('firmwareTimeCode', None)
             function_type_str = request_dict.get('functionType', None)
             serial_no = request_dict.get('serialNo', None)
+            print('00000')
             if not function_type_str:
                 return response.json(444)
             with transaction.atomic():
                 first_firmwares_qs = TestDeviceFindSerial.objects.filter(firmware_time_code=firmware_time_code_no)
-                if function_type_str == 'save_firmware_code': # pc上报唯一码（固件码+时间）  device_save_serial get_device_serial
-                    if not firmware_time_code_no:
+                if function_type_str == 'device_save_serial':  # 设备上报序列号绑定固件码  get_device_serial
+                    if not all([firmware_time_code_no, serial_no]):
                         return response.json(444)
                     if first_firmwares_qs.exists():
                         return response.json(174)
-                    else:
-                        now_time = int(time.time())
-                        params = {'firmware_time_code': firmware_time_code_no, 'created_time': now_time}
-                        TestDeviceFindSerial.objects.create(**params)
+                    nowtime = int(time.time())
+                    params = {'firmware_time_code': firmware_time_code_no,
+                              'serial_number': serial_no,
+                              'created_time': nowtime}
+                    TestDeviceFindSerial.objects.create(**params)
+                    print('111111')
                     return response.json(0)
-                elif function_type_str == 'device_save_serial':     # 设备上报序列号绑定固件码  get_device_serial
-                    if not all([firmware_time_code_no, serial_no]):
-                        return response.json(444)
-                    if first_firmwares_qs.exists():
-                        serial_no_qs = TestDeviceFindSerial.objects.filter(serial_number=serial_no)
-                        if serial_no_qs.exists():
-                            return response.json(174)
-                        data_id = first_firmwares_qs.first().id
-                        TestDeviceFindSerial.objects.filter(id=data_id).update(serial_number=serial_no)
-                        return response.json(0)
-                    else:
-                        return response.json(173)
-
                 elif function_type_str == 'get_device-serial':  # 根据固件码获取序列号
+                    print('222222')
                     if not firmware_time_code_no:
                         return response.json(444)
                     if first_firmwares_qs.exists():
                         result = {'Id': first_firmwares_qs.first().id,
-                                'firmwareTimeCode': firmware_time_code_no,
-                                'serialNumber': first_firmwares_qs.first().serial_number,
-                                'createdTime': first_firmwares_qs.first().created_time}
+                                  'firmwareTimeCode': firmware_time_code_no,
+                                  'serialNumber': first_firmwares_qs.first().serial_number,
+                                  'createdTime': first_firmwares_qs.first().created_time}
                         print('返回结果 ： %s', result)
                         return response.json(0, result)
                     else:
@@ -1077,4 +1068,4 @@ class testView(View):
 
         except Exception as e:
             LOGGER.info('异常详情,errLine:{}, errMsg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
-            return response.json(178, e)
+            return response.json(178, e)