修改了部门详情的model，

添加了对数据库数据输出前的格式验证
2022-04-30 22:37:50 +08:00
parent 14a75d3fdd
commit 19440fe0e2
5 changed files with 104 additions and 143 deletions
@@ -1,57 +0,0 @@
-# Generated by Django 3.1.2 on 2022-04-17 06:52
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Department',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('did', models.IntegerField(verbose_name='部门ID')),
-                ('department', models.CharField(max_length=10, verbose_name='部门')),
-                ('part', models.IntegerField(default=0, verbose_name='部分')),
-                ('title', models.CharField(max_length=30, verbose_name='标题')),
-                ('content', models.CharField(max_length=1500, verbose_name='内容')),
-            ],
-            options={
-                'verbose_name_plural': '部门详情',
-                'db_table': 'it_Department',
-            },
-        ),
-        migrations.CreateModel(
-            name='History',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('grade', models.IntegerField(verbose_name='年级')),
-                ('did', models.IntegerField(verbose_name='部门ID')),
-                ('department', models.CharField(max_length=10, verbose_name='部门')),
-            ],
-            options={
-                'verbose_name_plural': '历史表',
-                'db_table': 'it_History',
-            },
-        ),
-        migrations.CreateModel(
-            name='Members',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('department', models.CharField(max_length=10, verbose_name='所属部门')),
-                ('avatar', models.ImageField(blank=True, upload_to='avatar', verbose_name='头像')),
-                ('grade', models.IntegerField(verbose_name='年级')),
-                ('name', models.CharField(max_length=10, verbose_name='成员姓名')),
-                ('motto', models.CharField(max_length=30, verbose_name='座右铭')),
-            ],
-            options={
-                'verbose_name_plural': '部门成员',
-                'db_table': 'it_Members',
-            },
-        ),
-    ]
@@ -6,15 +6,14 @@ class Department(models.Model):
    did = models.IntegerField("部门ID")
    department = models.CharField("部门", max_length=10)  # 如“程序部”
    department_en = models.CharField("部门英文名称", max_length=30)  # 如“程序部”
-    part = models.IntegerField("部分", default=0)  # 0：内容一；1：内容二          （可能没必要）
-    title = models.CharField("标题", max_length=30)  # 如部门介绍/部门要求
-    content = models.CharField("内容", max_length=1500)  # 如部门介绍/部门要求
+    content = models.CharField("内容", max_length=800)  # 如部门介绍/部门要求
+    introduction = models.CharField("介绍", max_length=800)  # 如部门介绍/部门要求

    class Meta:
        db_table = 'it_Department'
        verbose_name_plural = u'部门详情'

-    
+
 class History(models.Model):
    grade = models.IntegerField("年级")
    did = models.IntegerField("部门ID")
@@ -27,7 +26,6 @@ class History(models.Model):

 class Members(models.Model):
    # 默认id作为成员id
-    id = models.IntegerField(primary_key=True)
    avatar = models.ImageField("头像", upload_to="avatar", blank=True)
    did = models.IntegerField("所属部门ID", default=0)
    grade = models.IntegerField("年级")
@@ -1,27 +1,32 @@
 import re
-
 from rest_framework import serializers
 from history.models import *
-from django.core.validators import int_list_validator


-class DepartmentSerializer(serializers.HyperlinkedModelSerializer):
-    class Meta:
-        model = Department
-        fields = ('did', 'department_en', 'department', 'part', 'title', 'content')
+def validate_department(value):
+    reg = re.compile(r'^[\u4e00-\u9fa5A-Za-z]*$')
+    if not reg.match(value):
+        raise serializers.ValidationError("部门名称中只能输入汉字或英文")

-    def validate_department(self, value):
-        reg = re.compile(r'^[\u4e00-\u9fa5A-Za-z]*$')
-        if not reg.match(value):
-            raise serializers.ValidationError("只能输入汉字")
-        return value

-    def validate_department_en(self, value):
-        reg = re.compile(r'^[A-Za-z]*$')
-        if not reg.match(value):
-            raise serializers.ValidationError("只能输入英文")
-        return value
+def validate_department_en(value):
+    reg = re.compile(r'^[A-Za-z][A-Za-z\s]*$')
+    if not reg.match(value):
+        raise serializers.ValidationError("部门英文名称中只能输入英文")

+
+def name_validate(value):
+    reg = re.compile(r'^[\u4e00-\u9fa5A-Za-z]*$')
+    if not reg.match(value):
+        raise serializers.ValidationError("姓名只能输入汉字或英文")
+
+#
+# def validate_avatar(value):
+#     s = str(value)
+#     return s
+
+
+class DepartmentSerializer(serializers.Serializer):
    did = serializers.IntegerField(required=True, error_messages={"blank": '部门ID不能为空', "invalid": '类型错误'})
    department = serializers.CharField(max_length=10, required=True, trim_whitespace=True,
                                       validators=[validate_department],
@@ -29,11 +34,17 @@ class DepartmentSerializer(serializers.HyperlinkedModelSerializer):
    department_en = serializers.CharField(max_length=30, required=True, trim_whitespace=True,
                                          validators=[validate_department_en],
                                          error_messages={"max_length": '长度过长', "blank": '部门英文名称不能为空'})
-    part = serializers.IntegerField(required=True, error_messages={"blank": '不能为空'})  # 区分同意部分不同段落
-    title = serializers.CharField(required=False, trim_whitespace=True, max_length=30,
-                                  error_messages={"max_length": '题目过长'})
-    content = serializers.CharField(max_length=600, required=True, trim_whitespace=True,
+    content = serializers.CharField(max_length=800, required=True, trim_whitespace=True,
                                    error_messages={"max_length": '内容过长', "blank": '内容不能为空'})
+    introduction = serializers.CharField(max_length=800, required=True, trim_whitespace=True,
+                                         error_messages={"max_length": '内容过长', "blank": '内容不能为空'})
+
+    # class Meta:
+    #     model = Department
+    #     fields = ('did', 'department_en', 'department', 'part', 'title', 'content')
+
+    def create(self, validated_data):
+        return Department.objects.create(**validated_data)

    def update(self, instance, validated_data):
        instance.content = validated_data.get("content", instance.content)
@@ -47,21 +58,7 @@ class DepartmentSerializer(serializers.HyperlinkedModelSerializer):


 class MembersSerializer(serializers.HyperlinkedModelSerializer):
-    class Meta:
-        model = Members
-        fields = ('id', 'did', 'department', 'grade', 'name', 'motto', 'avatar')

-    def name_validate(self, value):
-        reg = re.compile(r'^[\u4e00-\u9fa5A-Za-z]*$')
-        if not reg.match(value):
-            raise serializers.ValidationError("只能输入汉字或英文")
-        return value
-
-    def validate_avatar(self, value):
-        s = str(value)
-        return s
-
-    id = serializers.IntegerField()
    did = serializers.IntegerField(required=True, error_messages={"blank": '部门ID不能为空', "invalid": '类型错误'})
    department = serializers.CharField(max_length=10, required=True, trim_whitespace=True,
                                       error_messages={"max_length": '部门名称过长', "blank": '部门名称不能为空'})
@@ -71,7 +68,14 @@ class MembersSerializer(serializers.HyperlinkedModelSerializer):
                                 error_messages={"blank": '姓名不能为空', "max_length": '姓名过长'})
    motto = serializers.CharField(required=False, trim_whitespace=True, max_length=25, validators=[name_validate],
                                  error_messages={"max_length": '座右铭过长'})
-    avatar = serializers.ImageField(validators=[name_validate])
+    # avatar = serializers.ImageField(validators=[validate_avatar])
+
+    class Meta:
+        model = Members
+        fields = ('did', 'department', 'grade', 'name', 'motto')
+
+    def create(self, validated_data):
+        return Members.objects.create(**validated_data)

    def update(self, instance, validated_data):
        instance.did = validated_data.get("did", instance.did)
@@ -84,16 +88,7 @@ class MembersSerializer(serializers.HyperlinkedModelSerializer):
        return instance


-class HistorySerializer(serializers.HyperlinkedModelSerializer):
-    class Meta:
-        model = History
-        fields = ('grade', 'did', 'department')
-
-    def validate_department(self, value):
-        reg = re.compile(r'^[\u4e00-\u9fa5A-Za-z]*$')
-        if not reg.match(value):
-            raise serializers.ValidationError("只能输入汉字")
-        return value
+class HistorySerializer(serializers.Serializer):

    grade = serializers.IntegerField(required=True, min_value=2001, max_value=2022,
                                     error_messages={"max_value": '年级数过大', "blank": "年级数不能为空", "min_value": '年级数过小'})
@@ -102,9 +97,13 @@ class HistorySerializer(serializers.HyperlinkedModelSerializer):
                                       validators=[validate_department],
                                       error_messages={"max_length": '部门名称过长', "blank": '部门名称不能为空'})

-    def update(self, instance, validated_data):
-        instance.department = validated_data.get("department", instance.department)
-        instance.grade = validated_data.get("grade", instance.grade)
-        instance.did = validated_data.get("did", instance.did)
-        instance.save()
-        return instance
+    # class Meta:
+    #     model = History
+    #     fields = ('grade', 'did', 'department')
+    #
+    # def update(self, instance, validated_data):
+    #     instance.department = validated_data.get("department", instance.department)
+    #     instance.grade = validated_data.get("grade", instance.grade)
+    #     instance.did = validated_data.get("did", instance.did)
+    #     instance.save()
+    #     return instance
@@ -1,11 +1,9 @@
-from django.http import JsonResponse
 from rest_framework.views import APIView
 from history.serializers import *
 from rest_framework.response import Response
 from django.db.models import Q
 from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_exempt
-from django.core.cache import cache


 class DepartmentViewSet(APIView):
@@ -16,19 +14,16 @@ class DepartmentViewSet(APIView):
            "code": 20000,
            "msg": "成功",
        }
-        queryset = Department.objects.all().filter(did=request.GET.get('did'))
-        serializer = DepartmentSerializer(queryset, many=True)
-        try:
-            response["data"] = serializer.data
-        except:
-            response['code'] = 40000
-            response['msg'] = serializer.error_messages
-        if len(response['data']) == 0:
-            response['code'] = 40000
-            response['msg'] = "未返回数据"
-        else:
-            response['code'] = 20000
-            response['msg'] = "成功"
+        obj = Department.objects.all().filter(did=request.GET.get('did')).first()
+        d = {'did': obj.did, 'department': obj.department, 'department_en': obj.department_en, 'content': obj.content,
+             'introduction': obj.introduction}
+        serializer = DepartmentSerializer(data=d)
+        if serializer.is_valid():
+            response['data'] = serializer.data
+            return Response(data=response)
+        response['code'] = 40000
+        response['msg'] = "错误"
+        response['data'] = serializer.errors
        return Response(data=response)


@@ -42,16 +37,22 @@ class MemberViewSet(APIView):
        }
        grade = request.GET.get('grade')
        did = request.GET.get('did')
-        try:
-            queryset = Members.objects.all().filter(Q(did=did) & Q(grade=grade))
-            serializer = MembersSerializer(queryset, many=True)
-        except:
+        queryset = Members.objects.all().filter(Q(did=did) & Q(grade=grade))
+        l = []
+        for x in queryset:
+            d = {'id': x.id, 'did': x.did, 'grade': x.grade, 'department': x.department, 'motto': x.motto,
+                 'name': x.name,
+                 'avatar': str(x.avatar)}
+            serializer = MembersSerializer(data=d)
+            if serializer.is_valid():
+                l.append(d)
+                continue
            response = {
                "code": 40000,
-                "msg": "错误",
+                "msg": serializer.errors,
            }
            return Response(data=response)
-        response["data"] = serializer.data
+        response['data'] = l
        return Response(data=response)


@@ -63,6 +64,17 @@ class HistoryViewSet(APIView):
            "code": 20000,
            "msg": "成功",
        }
+        ser = History.objects.all()
+        for x in ser:
+            d = {'did': x.did, 'grade': x.grade, 'department': x.department}
+            serializer = HistorySerializer(data=d)
+            if serializer.is_valid():
+                continue
+            response = {
+                "code": 40000,
+                "msg": serializer.errors,
+            }
+            return Response(data=response)
        info = []
        for i in range(2002, 2022):
            data = {'grade': i}