设备上传日志接口兼容使用序列号

Controller/DeviceLogController.py

@@ -39,20 +39,23 @@ class DeviceLogView(View):
 
     def getUploadUrl(self, request_dict, response):
         uid = request_dict.get('uid', None)
+        serial_number = request_dict.get('serial_number', None)
         file_type = request_dict.get('file_type', None)
         file_num = int(request_dict.get('file_num', 1))
 
-        if not all([uid, file_type]):
+        # uid,serial_number二传一
+        if not (uid or serial_number and file_type):
             return response.json(444)
 
         try:
-            uid = CommonService.decode_data(uid)
+            device_id = uid if uid else serial_number
+            # device_id = CommonService.decode_data(device_id)
             put_url_list = []
             for num in range(file_num):
                 # 日志文件名
                 name = CommonService.createOrderID()
                 filename = str(name) + '.' + file_type
-                obj = 'device_log/{uid}/'.format(uid=uid) + filename
+                obj = 'device_log/{device_id}/'.format(device_id=device_id) + filename
                 aws_s3_client = boto3.client(
                     's3',
                     region_name=REGION_NAME,
@@ -77,17 +80,24 @@ class DeviceLogView(View):
 
     def uploaded(self, request, request_dict, response):
         uid = request_dict.get('uid', None)
+        serial_number = request_dict.get('serial_number', None)
         status = request_dict.get('status', None)
         filename = request_dict.get('filename', None)
 
-        if not all([uid, status, filename]):
+        # uid,serial_number二传一
+        if not (uid or serial_number and status and filename):
             return response.json(444)
 
         try:
-            status = int(status)
-            uid = CommonService.decode_data(uid)
-            ip = CommonService.get_ip_address(request)
-            DeviceLogModel.objects.create(uid=uid, ip=ip, status=status, filename=filename)
+            data_dict = {
+                'status': int(status),
+                'ip': CommonService.get_ip_address(request),
+            }
+            if uid:
+                data_dict['uid'] = CommonService.decode_data(uid)
+            else:
+                data_dict['serial_number'] = CommonService.decode_data(serial_number)
+            DeviceLogModel.objects.create(**data_dict)
             return response.json(0)
         except Exception as e:
             print(e)

Model/models.py

@@ -1168,6 +1168,7 @@ class DeviceLogModel(models.Model):
     id = models.AutoField(primary_key=True)
     ip = models.CharField(default='', max_length=32, verbose_name='ip')
     uid = models.CharField(max_length=32, default='', verbose_name='设备uid')
+    serial_number = models.CharField(max_length=9, default='', verbose_name='序列号')
     status = models.SmallIntegerField(default=0, verbose_name='上传状态')   # 0: 成功,1: 失败
     filename = models.CharField(max_length=120, default='', verbose_name='文件名')
     add_time = models.DateTimeField(blank=True, auto_now_add=True, verbose_name=u'添加时间')