消息列表，录音

apps/upload/models.py

@@ -46,14 +46,14 @@ class UploadManager(models.Manager):
             picture="%s%s" % (settings.MEDIA_URL, filename),
             width=width,
             height=height,
-            file_size="%.2f kb" % (float(size)/1024),
+            file_size="%.2f" % (float(size)/1024),
         )
         instance.save()
         return instance
 
-    def _addnew_voice(self, tenant, user, type, file):
+    def _addnew_voice(self, tenant, user, type, file, time):
 
-        path = UploadManager.calculatePath(type, tenant.id, user.id)
+        path = UploadManager.calculatePath(type, tenant.id)
         filename = UploadFile(file, path, user.id)
         fullname = "%s%s" % (settings.MEDIA_ROOT, filename)
         size = os.path.getsize(fullname)
@@ -66,7 +66,8 @@ class UploadManager(models.Manager):
             picture="%s%s" % (settings.MEDIA_URL, filename),
             width=200,
             height=200,
-            file_size="%.2f kb" % (float(size)/1024),
+            file_size="%.2f" % (float(size)/1024),
+            voice_time=time,
         )
         instance.save()
         return instance
@@ -108,6 +109,7 @@ class Upload(models.Model):
     height = models.IntegerField(verbose_name=u"图片高度", blank=True, default=0)
     create_time = models.DateTimeField(verbose_name=u'上传时间', auto_now_add=True, editable=False)
     file_size = models.FloatField(verbose_name="文件大小",blank=True, default=0)
+    voice_time = models.FloatField(verbose_name="语音时长",blank=True, default=0)
 
     objects = UploadManager()
 

apps/upload/serializers.py

@@ -9,4 +9,4 @@ class UploadSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Upload
-        fields = ('picture', 'width', 'height', 'type', 'file_size')
+        fields = ('picture', 'width', 'height', 'type', 'voice_time')

apps/wxapp/repair_order/views.py

@@ -135,8 +135,9 @@ class RepairOrderViewSet(CustomModelViewSet):
     @action(methods=['post'], detail=False)
     def upload_voice(self, request):
         file = self.request.FILES.get('file')
+        time = self.request.POST.get('time')
         user = self.request.user
-        upload = Upload.objects._addnew_voice(user.employee.tenant, user, Upload.REPAIR_VOICE, file)
+        upload = Upload.objects._addnew_voice(user.employee.tenant, user, Upload.REPAIR_VOICE, file, time)
         if upload:
             return response_ok(upload.id)
         return response_error('上传失败，请重新上传！')

utils/file_operation.py

@@ -12,7 +12,7 @@ def UploadFile(file, upload_path, user_id):
     filename = "%s%s_%s.%s" % (
         upload_path.path,
         user_id,
-        timezone.now().strftime('%Y%m%d%H%M%S'),
+        timezone.now().strftime('%Y%m%d%H%M%S%f'),
         file.name.split('.')[-1]
     )
     filename = filename.lower()