运维帮助

apps/tenant/operation_help/models.py

@@ -6,14 +6,13 @@ from apps.tenant.models import Tenant
 from utils.file_operation import UploadFile, DeleteFile
 
 class OperationHelp(models.Model):
-
     title = models.CharField(verbose_name=u'标题', max_length=100)
     content = models.CharField(verbose_name=u'内容',max_length=500)
     create_user = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name=u"创建人", on_delete=models.PROTECT,
                                     editable=False)
     create_time = models.DateTimeField(verbose_name='创建时间', auto_now_add=True)
     enable = models.BooleanField(verbose_name=u"在用", default=True)
-    tenant = models.ForeignKey(Tenant, verbose_name=u'企业', editable=False, on_delete=models.PROTECT, null=True)
+    tenant = models.ForeignKey(Tenant, verbose_name=u'企业', editable=False, on_delete=models.PROTECT)
 
 
     class Meta:
@@ -21,18 +20,20 @@ class OperationHelp(models.Model):
         ordering = ['-id', 'tenant']
         verbose_name = u'运维帮助'
 
+
 class OperationHelpImg(models.Model):
+    operation_help = models.ForeignKey(OperationHelp,verbose_name=u'运维帮助', on_delete=models.PROTECT,null=True)
     image = models.CharField(verbose_name=u'图片路径', max_length=250)
     width = models.IntegerField(verbose_name=u"图片宽度")
     height = models.IntegerField(verbose_name=u"图片高度")
-
+    tenant = models.ForeignKey(Tenant, verbose_name=u'企业', editable=False, on_delete=models.PROTECT, null=True)
 
     class Meta:
         db_table = 'operation_help_img'
         ordering = ['-id']
         verbose_name = u'运维帮助图片'
 
-    def _add_img(self, file, user_id):
+    def _add_img(self,file,user_id):
         width = None
         height = None
 

apps/tenant/operation_help/serializer.py

@@ -1,5 +1,5 @@
 from rest_framework import serializers
-from .models import OperationHelp
+from .models import OperationHelp,OperationHelpImg
 from django.conf import settings
 
 class OperationHelpSerializer(serializers.ModelSerializer):
@@ -17,11 +17,10 @@ class OperationHelpSerializer(serializers.ModelSerializer):
         fields = '__all__'
 
     def create(self, validated_data):
-        validated_data['create_user'] = self.context['request'].user
+        user = self.context['request'].user
+        validated_data['create_user'] = user
         validated_data['tenant'] = self.context['request'].user.employee.tenant
         instance = super(OperationHelpSerializer, self).create(validated_data)
-
-        return instance
-
-
-
+        if 'file' in self.initial_data:
+            OperationHelpImg.objects.filter(tenant=instance.tenant,operation_help__isnull=True,).update(operation_help=instance)
+        return instance

apps/tenant/operation_help/views.py

@@ -25,30 +25,35 @@ class OperationHelpViewSet(CustomModelViewSet):
 
     def perform_create(self, serializer):
         super(OperationHelpViewSet,self).perform_create(serializer)
+        print(555555555)
         instance = serializer.instance
         validated_data = serializer.validated_data
-        tenant_log(self.request.user.employee, BizLog.INSERT, u'添加运维帮助[%s]，id=%d' % (instance.name, instance.id),
+        tenant_log(self.request.user.employee, BizLog.INSERT, u'添加运维帮助[%s]，id=%d' % (instance.title, instance.id),
                    validated_data)
 
     def perform_update(self, serializer):
         super(OperationHelpViewSet,self).perform_update(serializer)
         instance = serializer.instance
         validated_data = serializer.validated_data
-        tenant_log(self.request.user.employee, BizLog.INSERT, u'修改运维帮助[%s]，id=%d' % (instance.name, instance.id),
+        tenant_log(self.request.user.employee, BizLog.INSERT, u'修改运维帮助[%s]，id=%d' % (instance.title, instance.id),
                    validated_data)
 
-    @action(methods=['post'], detail=False)
-    def upload_image(self, request):
-        file = self.request.FILES.get('file')
-        img = OperationHelpImg.objects._add_img(file,request.user)
-        if img:
-            return response_ok(img.image)
-        return response_error('上传失败，请重新上传！')
 
     @action(methods=['post'], detail=False)
-    def upload_radio(self, request):
+    def upload_image(self, request):
+        print(777777777777)
         file = self.request.FILES.get('file')
-        radio_path = OperationHelpRadio.objects._add_img(file, request.user)
-        if radio_path:
-            return response_ok(radio_path)
-        return response_error('上传失败，请重新上传！')
+        user = self.request.user
+        operation_help_img = OperationHelpImg.objects.create(tenant=user.employee.tenant)
+        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('上传失败，请重新上传！')

ly_baoxiu_admin/settings.py

@@ -56,6 +56,7 @@ INSTALLED_APPS = [
     'apps.tenant.inspection_order',
     'apps.wxapp',
     'apps.tenant.notices',
+    'apps.tenant.operation_help',
 
 ]
 
@@ -66,7 +67,7 @@ MIDDLEWARE = [
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
-    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    # 'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'corsheaders.middleware.CorsMiddleware',
 ]
 
@@ -122,14 +123,14 @@ WSGI_APPLICATION = 'ly_baoxiu_admin.wsgi.application'
 # https://docs.djangoproject.com/en/2.2/ref/settings/#databases
 
 DATABASES = {
-    'default2': {
-        'ENGINE': 'django.db.backends.mysql',
-        'NAME': 'baoxiu',
-        'USER': 'baoxiu',
-        'PASSWORD': 'baoxiu@20210323',
-        'HOST': '139.9.148.181',
-        'PORT': 3306,
-    },
+    # 'default2': {
+    #     'ENGINE': 'django.db.backends.mysql',
+    #     'NAME': 'baoxiu',
+    #     'USER': 'baoxiu',
+    #     'PASSWORD': 'baoxiu@20210323',
+    #     'HOST': '139.9.148.181',
+    #     'PORT': 3306,
+    # },
     'default': {
         'ENGINE': 'django.db.backends.mysql',
         'NAME': 'ly_report_repair',