From 45a3e4a3a9c77bc6aebf5c3ab97c2d472845539c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=B7=E5=AE=B6=E8=BE=89?= Date: Thu, 5 May 2022 18:59:29 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=A0=81=E5=92=8C=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 21 +++++++++++------ history/serializers.py | 51 ++++++++++++++++++++++++------------------ history/views.py | 50 ++++++++++++++++++++++++----------------- 3 files changed, 73 insertions(+), 49 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 6bc96f5..0594c73 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -31,10 +31,8 @@ - + - - @@ -68,7 +66,7 @@ - + @@ -120,7 +118,8 @@ - + + 1650187914913 @@ -143,7 +142,14 @@ - @@ -177,7 +183,8 @@ - diff --git a/history/serializers.py b/history/serializers.py index 6910a96..da6f1fd 100644 --- a/history/serializers.py +++ b/history/serializers.py @@ -6,19 +6,19 @@ from history.models import * def validate_department(value): reg = re.compile(r'^[\u4e00-\u9fa5A-Za-z]*$') if not reg.match(value): - raise serializers.ValidationError("部门名称中只能输入汉字或英文") + raise serializers.ValidationError("42011-部门名称中只能输入汉字或英文") def validate_department_en(value): reg = re.compile(r'^[A-Za-z][A-Za-z\s]*$') if not reg.match(value): - raise serializers.ValidationError("部门英文名称中只能输入英文") + raise serializers.ValidationError("42010-部门英文名称中只能输入英文") def name_validate(value): reg = re.compile(r'^[\u4e00-\u9fa5A-Za-z]*$') if not reg.match(value): - raise serializers.ValidationError("姓名只能输入汉字或英文") + raise serializers.ValidationError("42012-姓名只能输入汉字或英文") # # def validate_avatar(value): @@ -27,17 +27,18 @@ def name_validate(value): class DepartmentSerializer(serializers.Serializer): - did = serializers.IntegerField(required=True, error_messages={"blank": '部门ID不能为空', "invalid": '类型错误'}) + did = serializers.IntegerField(required=True, error_messages={"blank": '41010-部门ID不能为空', "invalid": '42020-类型错误'}) department = serializers.CharField(max_length=10, required=True, trim_whitespace=True, validators=[validate_department], - error_messages={"max_length": '长度过长', "blank": '部门名称不能为空'}) + error_messages={"max_length": '42021-部门名称长度过长', "blank": '41011-部门名称不能为空'}) department_en = serializers.CharField(max_length=30, required=True, trim_whitespace=True, validators=[validate_department_en], - error_messages={"max_length": '长度过长', "blank": '部门英文名称不能为空'}) + error_messages={"max_length": '42022-部门英文名称长度过长', + "blank": '41012-部门英文名称不能为空'}) content = serializers.CharField(max_length=800, required=True, trim_whitespace=True, - error_messages={"max_length": '内容过长', "blank": '内容不能为空'}) + error_messages={"max_length": '42023-内容过长', "blank": '41013-内容不能为空'}) introduction = serializers.CharField(max_length=800, required=True, trim_whitespace=True, - error_messages={"max_length": '内容过长', "blank": '内容不能为空'}) + error_messages={"max_length": '42024-介绍内容过长', "blank": '41014-介绍内容不能为空'}) # class Meta: # model = Department @@ -59,15 +60,16 @@ class DepartmentSerializer(serializers.Serializer): class MembersSerializer(serializers.HyperlinkedModelSerializer): - did = serializers.IntegerField(required=True, error_messages={"blank": '部门ID不能为空', "invalid": '类型错误'}) + did = serializers.IntegerField(required=True, error_messages={"blank": '41010-部门ID不能为空', "invalid": '42020-类型错误'}) department = serializers.CharField(max_length=10, required=True, trim_whitespace=True, - error_messages={"max_length": '部门名称过长', "blank": '部门名称不能为空'}) + error_messages={"max_length": '42021-部门名称过长', "blank": '41011-部门名称不能为空'}) grade = serializers.IntegerField(required=True, min_value=2001, max_value=2022, - error_messages={"max_value": '年级数过大', "blank": "年级数不能为空", "min_value": '年级数过小'}) + error_messages={"max_value": '42025-年级数过大', "blank": "41015-年级数不能为空", + "min_value": '42026-年级数过小'}) name = serializers.CharField(required=True, trim_whitespace=True, max_length=6, - error_messages={"blank": '姓名不能为空', "max_length": '姓名过长'}) + error_messages={"blank": '41016-姓名不能为空', "max_length": '42027-姓名过长'}) motto = serializers.CharField(required=False, trim_whitespace=True, max_length=25, validators=[name_validate], - error_messages={"max_length": '座右铭过长'}) + error_messages={"max_length": '42028-座右铭过长'}) # avatar = serializers.ImageField(validators=[validate_avatar]) class Meta: @@ -91,19 +93,24 @@ class MembersSerializer(serializers.HyperlinkedModelSerializer): class HistorySerializer(serializers.Serializer): grade = serializers.IntegerField(required=True, min_value=2001, max_value=2022, - error_messages={"max_value": '年级数过大', "blank": "年级数不能为空", "min_value": '年级数过小'}) - did = serializers.IntegerField(required=True, error_messages={"blank": '部门ID不能为空', "invalid": '类型错误'}) + error_messages={"max_value": '42025-年级数过大', "blank": "41015-年级数不能为空", + "min_value": '42026-年级数过小'}) + did = serializers.IntegerField(required=True, error_messages={"blank": '41010-部门ID不能为空', "invalid": '42020-类型错误'}) department = serializers.CharField(max_length=10, required=True, trim_whitespace=True, validators=[validate_department], - error_messages={"max_length": '部门名称过长', "blank": '部门名称不能为空'}) + error_messages={"max_length": '42021-部门名称过长', "blank": '41011-部门名称不能为空'}) # 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 + + def create(self, validated_data): + return History.objects.create(**validated_data) + + 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 2e821b0..3849d09 100644 --- a/history/views.py +++ b/history/views.py @@ -14,16 +14,19 @@ class DepartmentViewSet(APIView): "code": 20000, "msg": "成功", } - obj = Department.objects.all().filter(did=request.GET.get('did')).first() + obj = Department.objects.all().filter(did=request.GET.get('did')).first() # 获取符合did的DepartmentObject + # （默认每个部门只对应一个object） d = {'did': obj.did, 'department': obj.department, 'department_en': obj.department_en, 'content': obj.content, - 'introduction': obj.introduction} + 'introduction': obj.introduction} # 将其转为字典类（用于放入serializer检验） serializer = DepartmentSerializer(data=d) if serializer.is_valid(): - response['data'] = serializer.data + response['data'] = serializer.data # 在data里返回想得到的信息 return Response(data=response) - response['code'] = 40000 - response['msg'] = "错误" - response['data'] = serializer.errors + key = list(serializer.errors.keys())[0] # 得到错误信息的keys中的第一个key + # 用一个key得到一个错误信息,一个错误信息中的错误码与detail用“-”隔开， 通过split分开 + value = str(list(serializer.errors.get(key))[0]).split("-") + response['code'] = int(value[0]) + response['msg'] = value[1] return Response(data=response) @@ -37,20 +40,24 @@ class MemberViewSet(APIView): } grade = request.GET.get('grade') did = request.GET.get('did') - queryset = Members.objects.all().filter(Q(did=did) & Q(grade=grade)) - l = [] + queryset = Members.objects.all().filter(Q(did=did) & Q(grade=grade)) # 获得所有符合要求的object + l = [] # 建一个列表用于存储最终输出的data + # 对符合要求的每一个object都转为字典并通过serializer检验数据是否合法 for x in queryset: + # 将符合要求的一个object都转为字典 d = {'id': x.id, 'did': x.did, 'grade': x.grade, 'department': x.department, 'motto': x.motto, 'name': x.name, - 'avatar': str(x.avatar)} + 'avatar': str(x.avatar)} # 将路径转为字符串格式 serializer = MembersSerializer(data=d) if serializer.is_valid(): - l.append(d) + l.append(d) # 将合法数据存入l列表中并继续进行下一个循环 continue - response = { - "code": 40000, - "msg": serializer.errors, - } + # 若出现不合法数据则将错误信息返回前端 + key = list(serializer.errors.keys())[0] # 得到错误信息的keys中的第一个key + # 用一个key得到一个错误信息,一个错误信息中的错误码与detail用“-”隔开， 通过split分开 + value = str(list(serializer.errors.get(key))[0]).split("-") + response['code'] = int(value[0]) + response['msg'] = value[1] return Response(data=response) response['data'] = l return Response(data=response) @@ -64,17 +71,20 @@ class HistoryViewSet(APIView): "code": 20000, "msg": "成功", } - ser = History.objects.all() + ser = History.objects.all() # 获取全部历史列表信息 + # 同上，对每一个object进行判断 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, - } + key = list(serializer.errors.keys())[0] # 得到错误信息的keys中的第一个key + # 用一个key得到一个错误信息,一个错误信息中的错误码与detail用“-”隔开， 通过split分开 + value = str(list(serializer.errors.get(key))[0]).split("-") + response['code'] = int(value[0]) + response['msg'] = value[1] return Response(data=response) + # 若数据通过判断，则在此处将数据转为要求格式 info = [] for i in range(2002, 2022): data = {'grade': i} @@ -82,7 +92,7 @@ class HistoryViewSet(APIView): for j in range(0, 6): try: a = History.objects.get(Q(did=j) & Q(grade=i)) - except: + except History.DoesNotExist: # 若为空，则继续判断下一个部门 continue x = {'id': a.did, 'department_name': a.department} y.append(x) From 66ea27faee390c859457fbb8d9f64113c4d983be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=B7=E5=AE=B6=E8=BE=89?= Date: Thu, 5 May 2022 19:21:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=A0=81=E5=92=8C=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Apps/history/serializers.py | 1 + Apps/history/views.py | 8 +++++++- media/default/user.jpg | 0 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 media/default/user.jpg diff --git a/Apps/history/serializers.py b/Apps/history/serializers.py index aaee3f9..0562eec 100644 --- a/Apps/history/serializers.py +++ b/Apps/history/serializers.py @@ -1,6 +1,7 @@ import re from rest_framework import serializers from Apps.history import * +from Apps.history.models import Department, Members, History def validate_department(value): diff --git a/Apps/history/views.py b/Apps/history/views.py index 426d400..effc2fa 100644 --- a/Apps/history/views.py +++ b/Apps/history/views.py @@ -5,6 +5,9 @@ from django.db.models import Q from django.utils.decorators import method_decorator from django.views.decorators.csrf import csrf_exempt +from Apps.history.models import Members, History, Department +from Apps.history.serializers import MembersSerializer, HistorySerializer, DepartmentSerializer + class DepartmentViewSet(APIView): # 获取部门信息 @@ -44,10 +47,13 @@ class MemberViewSet(APIView): l = [] # 建一个列表用于存储最终输出的data # 对符合要求的每一个object都转为字典并通过serializer检验数据是否合法 for x in queryset: + avatar = str(x.avatar) + if avatar == '': + avatar = "default/user.jpg" # 将符合要求的一个object都转为字典 d = {'id': x.id, 'did': x.did, 'grade': x.grade, 'department': x.department, 'motto': x.motto, 'name': x.name, - 'avatar': str(x.avatar)} # 将路径转为字符串格式 + 'avatar': avatar} # 将路径转为字符串格式 serializer = MembersSerializer(data=d) if serializer.is_valid(): l.append(d) # 将合法数据存入l列表中并继续进行下一个循环 diff --git a/media/default/user.jpg b/media/default/user.jpg new file mode 100644 index 0000000..e69de29 From dd14308c3588fd745ee7b7054c4bdba4fe8159e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=B7=E5=AE=B6=E8=BE=89?= Date: Thu, 5 May 2022 19:26:23 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=A0=81=E5=92=8C=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/ITShowPlatform.iml | 2 +- .idea/misc.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.idea/ITShowPlatform.iml b/.idea/ITShowPlatform.iml index c5d6a50..90cd6d8 100644 --- a/.idea/ITShowPlatform.iml +++ b/.idea/ITShowPlatform.iml @@ -16,7 +16,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 67c853b..6649a8c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file