Merge branch 'master' of http://git.zzliaoyuan.com:4000/wushaodong/ly_baoxiu_admin

apps/tenant/operation_help/models.py

@@ -63,9 +63,11 @@ class OperationHelpImg(models.Model):
         DeleteFile(image)
 
 class OperationHelpRadio(models.Model):
+    operation_help = models.ForeignKey(OperationHelp, verbose_name=u'运维帮助', on_delete=models.PROTECT, null=True)
     radio_path = models.CharField(verbose_name=u'视频路径', max_length=250)
     radio_size = models.FloatField(verbose_name="视频大小",blank=True, default=0)
     radio_time = models.FloatField(verbose_name="视频时长",blank=True, default=0)
+    tenant = models.ForeignKey(Tenant, verbose_name=u'企业', editable=False, on_delete=models.PROTECT, null=True)
 
     class Meta:
         db_table = 'operation_help_radio'
@@ -94,6 +96,6 @@ class OperationHelpRadio(models.Model):
         self.save()
 
     def del_radio(self):
-        radio = self.radio
+        radio = self.radio_path
         # self.delete()
         DeleteFile(radio)

apps/tenant/operation_help/serializer.py

@@ -1,5 +1,5 @@
 from rest_framework import serializers
-from .models import OperationHelp,OperationHelpImg
+from .models import OperationHelp,OperationHelpImg,OperationHelpRadio
 from django.conf import settings
 
 class OperationHelpSerializer(serializers.ModelSerializer):
@@ -23,4 +23,5 @@ class OperationHelpSerializer(serializers.ModelSerializer):
         instance = super(OperationHelpSerializer, self).create(validated_data)
         if 'file' in self.initial_data:
             OperationHelpImg.objects.filter(tenant=instance.tenant,operation_help__isnull=True,).update(operation_help=instance)
+            OperationHelpRadio.objects.filter(tenant=instance.tenant,operation_help__isnull=True,).update(operation_help=instance)
         return instance

apps/tenant/operation_help/views.py

@@ -45,12 +45,22 @@ class OperationHelpViewSet(CustomModelViewSet):
         if file:
             operation_help_img._add_img(file, user)
             image = operation_help_img.image
-        return response_ok(image)
-
-    # @action(methods=['post'], detail=False)
-    # def upload_radio(self, request):
-    #     file = self.request.FILES.get('file')
-    #     radio_path = OperationHelpRadio.objects._add_(file, request.user)
-    #     if radio_path:
-    #         return response_ok(radio_path)
-    #     return response_error('上传失败，请重新上传！')
+            data={
+                "src": image
+            }
+            return response_ok(data)
+        return response_error('上传失败，请重新上传！')
+
+    @action(methods=['post'], detail=False)
+    def upload_radio(self, request):
+        file = self.request.FILES.get('file')
+        user = self.request.user
+        operation_help_radio = OperationHelpRadio.objects.create(tenant=user.employee.tenant)
+        if file:
+            operation_help_radio._add_radio(file, user)
+            radio_path = operation_help_radio.radio_path
+            data = {
+                "src": radio_path
+            }
+            return response_ok(data)
+        return response_error('上传失败，请重新上传！')