添加错误码和注释
This commit is contained in:
+29
-22
@@ -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
|
||||
|
||||
+30
-20
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user