改了一下数据库表,把history的序列化器改为模型序列化器
This commit is contained in:
ygm1881
@@ -1,58 +0,0 @@
|
||||
# Generated by Django 4.0.4 on 2022-05-05 17:54
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
initial = True
|
||||
|
||||
dependencies = [
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='Department',
|
||||
fields=[
|
||||
('id', models.BigAutoField(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='部门')),
|
||||
('department_en', models.CharField(max_length=30, verbose_name='部门英文名称')),
|
||||
('content', models.CharField(max_length=800, verbose_name='内容')),
|
||||
('introduction', models.CharField(max_length=800, verbose_name='介绍')),
|
||||
],
|
||||
options={
|
||||
'verbose_name_plural': '部门详情',
|
||||
'db_table': 'it_Department',
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='History',
|
||||
fields=[
|
||||
('id', models.BigAutoField(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.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('avatar', models.ImageField(blank=True, upload_to='avatar', verbose_name='头像')),
|
||||
('did', models.IntegerField(default=0, verbose_name='所属部门ID')),
|
||||
('grade', models.IntegerField(verbose_name='年级')),
|
||||
('name', models.CharField(max_length=10, verbose_name='成员姓名')),
|
||||
('motto', models.CharField(max_length=30, verbose_name='座右铭')),
|
||||
('department', models.CharField(max_length=10, verbose_name='所属部门')),
|
||||
],
|
||||
options={
|
||||
'verbose_name_plural': '部门成员',
|
||||
'db_table': 'it_Members',
|
||||
},
|
||||
),
|
||||
]
|
||||
@@ -29,7 +29,7 @@ class History(models.Model):
|
||||
])
|
||||
# did = models.IntegerField("部门ID")
|
||||
# did = models.ForeignKey(Department, on_delete=models.DO_NOTHING(), related_name="history", verbose_name="部门id")
|
||||
# department = models.CharField("部门", max_length=10) # 如“程序部”
|
||||
# department_cn = models.CharField("部门", max_length=10) # 如“程序部”
|
||||
department = models.ForeignKey(Department, on_delete=models.DO_NOTHING, related_name="history", verbose_name="部门")
|
||||
|
||||
class Meta:
|
||||
@@ -43,11 +43,11 @@ class History(models.Model):
|
||||
class Members(models.Model):
|
||||
# 默认id作为成员id
|
||||
avatar = models.ImageField("头像", upload_to="avatar", blank=True)
|
||||
did = models.IntegerField("所属部门ID", default=0)
|
||||
# did = models.IntegerField("所属部门ID", default=0)
|
||||
grade = models.IntegerField("年级")
|
||||
name = models.CharField("成员姓名", max_length=10)
|
||||
motto = models.CharField("座右铭", max_length=30)
|
||||
# department = models.CharField("所属部门", max_length=10)
|
||||
# department_cn = models.CharField("所属部门", max_length=10)
|
||||
department = models.ForeignKey(Department, on_delete=models.DO_NOTHING, related_name="member",
|
||||
verbose_name="所属部门")
|
||||
|
||||
|
||||
+186
-87
@@ -1,117 +1,216 @@
|
||||
import re
|
||||
from rest_framework import serializers
|
||||
|
||||
from apps.history import *
|
||||
from apps.history.models import Department, Members, History
|
||||
|
||||
|
||||
def validate_department(value):
|
||||
reg = re.compile(r'^[\u4e00-\u9fa5A-Za-z]*$')
|
||||
if not reg.match(value):
|
||||
raise serializers.ValidationError("42011-部门名称中只能输入汉字或英文")
|
||||
# def validate_department(value):
|
||||
# reg = re.compile(r'^[\u4e00-\u9fa5A-Za-z]*$')
|
||||
# if not reg.match(value):
|
||||
# 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("42010-部门英文名称中只能输入英文")
|
||||
#
|
||||
#
|
||||
# def name_validate(value):
|
||||
# reg = re.compile(r'^[\u4e00-\u9fa5A-Za-z]*$')
|
||||
# if not reg.match(value):
|
||||
# raise serializers.ValidationError("42012-姓名只能输入汉字或英文")
|
||||
|
||||
|
||||
def validate_department_en(value):
|
||||
reg = re.compile(r'^[A-Za-z][A-Za-z\s]*$')
|
||||
if not reg.match(value):
|
||||
raise serializers.ValidationError("42010-部门英文名称中只能输入英文")
|
||||
|
||||
|
||||
def name_validate(value):
|
||||
reg = re.compile(r'^[\u4e00-\u9fa5A-Za-z]*$')
|
||||
if not reg.match(value):
|
||||
raise serializers.ValidationError("42012-姓名只能输入汉字或英文")
|
||||
|
||||
#
|
||||
# def validate_avatar(value):
|
||||
# s = str(value)
|
||||
# return s
|
||||
|
||||
|
||||
class DepartmentSerializer(serializers.Serializer):
|
||||
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": '42021-部门名称长度过长', "blank": '41011-部门名称不能为空'})
|
||||
department_en = serializers.CharField(max_length=30, required=True, trim_whitespace=True,
|
||||
validators=[validate_department_en],
|
||||
error_messages={"max_length": '42022-部门英文名称长度过长',
|
||||
"blank": '41012-部门英文名称不能为空'})
|
||||
content = serializers.CharField(max_length=800, required=True, trim_whitespace=True,
|
||||
error_messages={"max_length": '42023-内容过长', "blank": '41013-内容不能为空'})
|
||||
introduction = serializers.CharField(max_length=800, required=True, trim_whitespace=True,
|
||||
error_messages={"max_length": '42024-介绍内容过长', "blank": '41014-介绍内容不能为空'})
|
||||
# class DepartmentSerializer(serializers.Serializer):
|
||||
# did = serializers.IntegerField(required=True, error_messages={"blank": '41010-部门ID不能为空', "invalid": '42020-类型错误'})
|
||||
# department_cn = serializers.CharField(max_length=10, required=True, trim_whitespace=True,
|
||||
# validators=[validate_department],
|
||||
# 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": '42022-部门英文名称长度过长',
|
||||
# "blank": '41012-部门英文名称不能为空'})
|
||||
# content = serializers.CharField(max_length=800, required=True, trim_whitespace=True,
|
||||
# error_messages={"max_length": '42023-内容过长', "blank": '41013-内容不能为空'})
|
||||
# introduction = serializers.CharField(max_length=800, required=True, trim_whitespace=True,
|
||||
# error_messages={"max_length": '42024-介绍内容过长', "blank": '41014-介绍内容不能为空'})
|
||||
#
|
||||
# # class Meta:
|
||||
# # model = Department
|
||||
# # fields = ('did', 'department_en', 'department_cn', '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)
|
||||
# instance.department_cn = validated_data.get("department_cn", instance.department_cn)
|
||||
# instance.department_en = validated_data.get("department_en", instance.department_en)
|
||||
# instance.id = validated_data.get("id", instance.id)
|
||||
# instance.title = validated_data.get("title", instance.title)
|
||||
# instance.part = validated_data.get("part", instance.part)
|
||||
# instance.save()
|
||||
# return instance
|
||||
|
||||
# class Meta:
|
||||
# model = Department
|
||||
# fields = ('did', 'department_en', 'department', 'part', 'title', 'content')
|
||||
class DepartmentSerializer(serializers.ModelSerializer):
|
||||
class Meta:
|
||||
model = Department
|
||||
fields = "__all__"
|
||||
|
||||
def create(self, validated_data):
|
||||
return Department.objects.create(**validated_data)
|
||||
extra_kwargs = {
|
||||
"department_cn": {
|
||||
"error_messages": {
|
||||
"max_length": '42021-部门名称长度过长',
|
||||
"blank": '41011-部门名称不能为空'
|
||||
}
|
||||
},
|
||||
"department_en": {
|
||||
"error_messages": {
|
||||
"max_length": '42022-部门英文名称长度过长',
|
||||
"blank": '41012-部门英文名称不能为空'
|
||||
}
|
||||
},
|
||||
"content": {
|
||||
"error_messages": {
|
||||
"max_length": '42023-内容过长',
|
||||
"blank": '41013-内容不能为空'
|
||||
}
|
||||
},
|
||||
"introduction": {
|
||||
"error_messages": {
|
||||
"max_length": '42024-介绍内容过长',
|
||||
"blank": '41014-介绍内容不能为空'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
def update(self, instance, validated_data):
|
||||
instance.content = validated_data.get("content", instance.content)
|
||||
instance.department = validated_data.get("department", instance.department)
|
||||
instance.department_en = validated_data.get("department_en", instance.department_en)
|
||||
instance.id = validated_data.get("id", instance.id)
|
||||
instance.title = validated_data.get("title", instance.title)
|
||||
instance.part = validated_data.get("part", instance.part)
|
||||
instance.save()
|
||||
return instance
|
||||
def validate_department_cn(self, data):
|
||||
reg = re.compile(r'^[\u4e00-\u9fa5A-Za-z]*$')
|
||||
if not reg.match(data):
|
||||
raise serializers.ValidationError("42011-部门名称中只能输入汉字或英文")
|
||||
return data
|
||||
|
||||
def validate_department_en(self, data):
|
||||
reg = re.compile(r'^[A-Za-z][A-Za-z\s]*$')
|
||||
if not reg.match(data):
|
||||
raise serializers.ValidationError("42010-部门英文名称中只能输入英文")
|
||||
return data
|
||||
|
||||
def validate_name(self, data):
|
||||
reg = re.compile(r'^[\u4e00-\u9fa5A-Za-z]*$')
|
||||
if not reg.match(data):
|
||||
raise serializers.ValidationError("42012-姓名只能输入汉字或英文")
|
||||
return data
|
||||
|
||||
|
||||
class MembersSerializer(serializers.HyperlinkedModelSerializer):
|
||||
# class MembersSerializer(serializers.HyperlinkedModelSerializer):
|
||||
# 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": '42021-部门名称过长', "blank": '41011-部门名称不能为空'})
|
||||
# grade = serializers.IntegerField(required=True, min_value=2001, max_value=2022,
|
||||
# error_messages={"max_value": '42025-年级数过大', "blank": "41015-年级数不能为空",
|
||||
# "min_value": '42026-年级数过小'})
|
||||
# name = serializers.CharField(required=True, trim_whitespace=True, max_length=6,
|
||||
# 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": '42028-座右铭过长'})
|
||||
#
|
||||
# # avatar = serializers.ImageField(validators=[validate_avatar])
|
||||
#
|
||||
# class Meta:
|
||||
# model = Members
|
||||
# fields = ('did', 'department_cn', '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)
|
||||
# instance.department_cn = validated_data.get("department_cn", instance.department_cn)
|
||||
# instance.grade = validated_data.get("grade", instance.grade)
|
||||
# instance.name = validated_data.get("name", instance.name)
|
||||
# instance.motto = validated_data.get("motto", instance.motto)
|
||||
# instance.avatar = validated_data.get("avatar", instance.avatar)
|
||||
# instance.save()
|
||||
# return instance
|
||||
|
||||
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": '42021-部门名称过长', "blank": '41011-部门名称不能为空'})
|
||||
grade = serializers.IntegerField(required=True, min_value=2001, max_value=2022,
|
||||
error_messages={"max_value": '42025-年级数过大', "blank": "41015-年级数不能为空",
|
||||
"min_value": '42026-年级数过小'})
|
||||
name = serializers.CharField(required=True, trim_whitespace=True, max_length=6,
|
||||
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": '42028-座右铭过长'})
|
||||
# avatar = serializers.ImageField(validators=[validate_avatar])
|
||||
class MembersSerializer(serializers.ModelSerializer):
|
||||
department = serializers.CharField(source="department.department_cn")
|
||||
|
||||
class Meta:
|
||||
model = Members
|
||||
fields = ('did', 'department', 'grade', 'name', 'motto')
|
||||
|
||||
def create(self, validated_data):
|
||||
return Members.objects.create(**validated_data)
|
||||
extra_kwargs = {
|
||||
"did": {
|
||||
"error_messages": {
|
||||
"blank": '41010-部门ID不能为空',
|
||||
"invalid": '42020-类型错误'
|
||||
}
|
||||
},
|
||||
"department": {
|
||||
"error_messages": {
|
||||
"max_length": '42021-部门名称过长',
|
||||
"blank": '41011-部门名称不能为空'
|
||||
}
|
||||
},
|
||||
"grade": {
|
||||
"error_messages": {
|
||||
"max_value": '42025-年级数过大',
|
||||
"blank": "41015-年级数不能为空",
|
||||
"min_value": '42026-年级数过小'
|
||||
}
|
||||
},
|
||||
"name": {
|
||||
"error_messages": {
|
||||
"blank": '41016-姓名不能为空',
|
||||
"max_length": '42027-姓名过长'
|
||||
}
|
||||
},
|
||||
"motto": {
|
||||
"error_messages": {
|
||||
"max_length": '42028-座右铭过长'
|
||||
}
|
||||
}
|
||||
|
||||
def update(self, instance, validated_data):
|
||||
instance.did = validated_data.get("did", instance.did)
|
||||
instance.department = validated_data.get("department", instance.department)
|
||||
instance.grade = validated_data.get("grade", instance.grade)
|
||||
instance.name = validated_data.get("name", instance.name)
|
||||
instance.motto = validated_data.get("motto", instance.motto)
|
||||
instance.avatar = validated_data.get("avatar", instance.avatar)
|
||||
instance.save()
|
||||
return instance
|
||||
}
|
||||
|
||||
|
||||
class HistorySerializer(serializers.Serializer):
|
||||
# class HistorySerializer(serializers.Serializer):
|
||||
# grade = serializers.IntegerField(required=True, min_value=2001, max_value=2022,
|
||||
# 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": '42021-部门名称过长', "blank": '41011-部门名称不能为空'})
|
||||
#
|
||||
# # class Meta:
|
||||
# # model = History
|
||||
# # fields = ('grade', 'did', 'department_cn')
|
||||
# #
|
||||
#
|
||||
# def create(self, validated_data):
|
||||
# return History.objects.create(**validated_data)
|
||||
#
|
||||
# def update(self, instance, validated_data):
|
||||
# instance.department_cn = validated_data.get("department_cn", instance.department_cn)
|
||||
# instance.grade = validated_data.get("grade", instance.grade)
|
||||
# instance.did = validated_data.get("did", instance.did)
|
||||
# instance.save()
|
||||
# return instance
|
||||
|
||||
grade = serializers.IntegerField(required=True, min_value=2001, max_value=2022,
|
||||
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": '42021-部门名称过长', "blank": '41011-部门名称不能为空'})
|
||||
class HistorySerializer(serializers.ModelSerializer):
|
||||
department = serializers.CharField(source="department.department_cn")
|
||||
|
||||
# class Meta:
|
||||
# model = History
|
||||
# fields = ('grade', 'did', 'department')
|
||||
#
|
||||
|
||||
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
|
||||
class Meta:
|
||||
model = History
|
||||
fields = ('years', 'department')
|
||||
|
||||
@@ -4,7 +4,7 @@ from django.urls import path
|
||||
from apps.history.views import DepartmentViewSet, MemberViewSet, HistoryViewSet
|
||||
|
||||
urlpatterns = [
|
||||
path('department/', DepartmentViewSet.as_view()),
|
||||
path('department_cn/', DepartmentViewSet.as_view()),
|
||||
path('member/', MemberViewSet.as_view()),
|
||||
path('history/', HistoryViewSet.as_view()),
|
||||
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
|
||||
|
||||
@@ -19,7 +19,7 @@ class DepartmentViewSet(APIView):
|
||||
}
|
||||
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,
|
||||
d = {'did': obj.did, 'department_cn': obj.department_cn, 'department_en': obj.department_en, 'content': obj.content,
|
||||
'introduction': obj.introduction} # 将其转为字典类（用于放入serializer检验）
|
||||
serializer = DepartmentSerializer(data=d)
|
||||
if serializer.is_valid():
|
||||
@@ -51,7 +51,7 @@ class MemberViewSet(APIView):
|
||||
if avatar == '':
|
||||
avatar = "default/user.jpg"
|
||||
# 将符合要求的一个object都转为字典
|
||||
d = {'id': x.id, 'did': x.did, 'grade': x.grade, 'department': x.department, 'motto': x.motto,
|
||||
d = {'id': x.id, 'did': x.did, 'grade': x.grade, 'department_cn': x.department_cn, 'motto': x.motto,
|
||||
'name': x.name,
|
||||
'avatar': avatar} # 将路径转为字符串格式
|
||||
serializer = MembersSerializer(data=d)
|
||||
@@ -80,7 +80,7 @@ class HistoryViewSet(APIView):
|
||||
ser = History.objects.all() # 获取全部历史列表信息
|
||||
# 同上，对每一个object进行判断
|
||||
for x in ser:
|
||||
d = {'did': x.did, 'grade': x.grade, 'department': x.department}
|
||||
d = {'did': x.did, 'grade': x.grade, 'department_cn': x.department_cn}
|
||||
serializer = HistorySerializer(data=d)
|
||||
if serializer.is_valid():
|
||||
continue
|
||||
@@ -100,7 +100,7 @@ class HistoryViewSet(APIView):
|
||||
a = History.objects.get(Q(did=j) & Q(grade=i))
|
||||
except History.DoesNotExist: # 若为空，则继续判断下一个部门
|
||||
continue
|
||||
x = {'id': a.did, 'department_name': a.department}
|
||||
x = {'id': a.did, 'department_name': a.department_cn}
|
||||
y.append(x)
|
||||
data['data'] = y
|
||||
info.append(data)
|
||||
|
||||
Reference in New Issue
Block a user