From 19440fe0e2ae3f74fdd4b9bd8727c0b7d3fa130c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=B7=E5=AE=B6=E8=BE=89?= <kangjiahui2003@163.com>
Date: Sat, 30 Apr 2022 22:37:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=9A=84model=EF=BC=8C=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=BA=86=E5=AF=B9=E6=95=B0=E6=8D=AE=E5=BA=93=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E8=BE=93=E5=87=BA=E5=89=8D=E7=9A=84=E6=A0=BC=E5=BC=8F=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                |  27 +++++---
 history/migrations/0001_initial.py |  57 ----------------
 history/models.py                  |   8 +--
 history/serializers.py             | 101 ++++++++++++++---------------
 history/views.py                   |  54 +++++++++------
 5 files changed, 104 insertions(+), 143 deletions(-)
 delete mode 100644 history/migrations/0001_initial.py

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b967d98..6bc96f5 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -31,11 +31,7 @@
     </select>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="81247df9-f070-428a-8ff8-85c1a06086e7" name="Default Changelist" comment="修改+合并前的提交">
-      <change beforePath="$PROJECT_DIR$/.idea/ITShowPlatform.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/ITShowPlatform.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/deployment.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/deployment.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/sshConfigs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/sshConfigs.xml" afterDir="false" />
+    <list default="true" id="81247df9-f070-428a-8ff8-85c1a06086e7" name="Default Changelist" comment="完善了一下serializers">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/history/migrations/0001_initial.py" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/history/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/history/models.py" afterDir="false" />
@@ -72,7 +68,7 @@
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../pythonProject4" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../Todo" />
     <property name="settings.editor.selected.configurable" value="web.server" />
   </component>
   <component name="RunManager">
@@ -101,6 +97,7 @@
       <method v="2" />
     </configuration>
   </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="SvnConfiguration">
     <configuration />
   </component>
@@ -120,6 +117,10 @@
       <workItem from="1650790774256" duration="451000" />
       <workItem from="1650903753930" duration="1368000" />
       <workItem from="1651065854470" duration="1813000" />
+      <workItem from="1651235869595" duration="8446000" />
+      <workItem from="1651248194966" duration="1722000" />
+      <workItem from="1651275393720" duration="5083000" />
+      <workItem from="1651322613788" duration="6665000" />
     </task>
     <task id="LOCAL-00001" summary="fix">
       <created>1650187914913</created>
@@ -135,11 +136,18 @@
       <option name="project" value="LOCAL" />
       <updated>1650785005055</updated>
     </task>
-    <option name="localTasksCounter" value="3" />
+    <task id="LOCAL-00003" summary="完善了一下serializers">
+      <created>1651233809599</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1651233809599</updated>
+    </task>
+    <option name="localTasksCounter" value="4" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="2" />
+    <option name="version" value="3" />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
     <option name="TAB_STATES">
@@ -168,7 +176,8 @@
   <component name="VcsManagerConfiguration">
     <MESSAGE value="fix" />
     <MESSAGE value="修改+合并前的提交" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改+合并前的提交" />
+    <MESSAGE value="完善了一下serializers" />
+    <option name="LAST_COMMIT_MESSAGE" value="完善了一下serializers" />
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
     <SUITE FILE_PATH="coverage/ITShowPlatform$urls.coverage" NAME="urls Coverage Results" MODIFIED="1650768597611" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/history" />
diff --git a/history/migrations/0001_initial.py b/history/migrations/0001_initial.py
deleted file mode 100644
index 6ad151e..0000000
--- a/history/migrations/0001_initial.py
+++ /dev/null
@@ -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',
-            },
-        ),
-    ]
diff --git a/history/models.py b/history/models.py
index f90f515..cfaa119 100644
--- a/history/models.py
+++ b/history/models.py
@@ -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("年级")
diff --git a/history/serializers.py b/history/serializers.py
index 00f8f54..6910a96 100644
--- a/history/serializers.py
+++ b/history/serializers.py
@@ -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
diff --git a/history/views.py b/history/views.py
index b13d342..2e821b0 100644
--- a/history/views.py
+++ b/history/views.py
@@ -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}