Merge remote-tracking branch 'origin/master'
# Conflicts: # .idea/workspace.xml
This commit is contained in:
@@ -0,0 +1,7 @@
|
||||
from django.contrib import admin
|
||||
from .models import *
|
||||
|
||||
|
||||
admin.site.register(Department)
|
||||
admin.site.register(History)
|
||||
admin.site.register(Members)
|
||||
@@ -0,0 +1,6 @@
|
||||
from django.apps import AppConfig
|
||||
|
||||
|
||||
class TodoListConfig(AppConfig):
|
||||
default_auto_field = 'django.db.models.BigAutoField'
|
||||
name = 'Apps.history'
|
||||
@@ -0,0 +1,58 @@
|
||||
# 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',
|
||||
},
|
||||
),
|
||||
]
|
||||
@@ -0,0 +1,39 @@
|
||||
from django.db import models
|
||||
from django.core.validators import validate_comma_separated_integer_list
|
||||
|
||||
|
||||
class Department(models.Model):
|
||||
did = models.IntegerField("部门ID")
|
||||
department = models.CharField("部门", max_length=10) # 如“程序部”
|
||||
department_en = models.CharField("部门英文名称", max_length=30) # 如“程序部”
|
||||
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")
|
||||
department = models.CharField("部门", max_length=10) # 如“程序部”
|
||||
|
||||
class Meta:
|
||||
db_table = 'it_History'
|
||||
verbose_name_plural = u'历史表'
|
||||
|
||||
|
||||
class Members(models.Model):
|
||||
# 默认id作为成员id
|
||||
avatar = models.ImageField("头像", upload_to="avatar", blank=True)
|
||||
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)
|
||||
|
||||
class Meta:
|
||||
db_table = 'it_Members'
|
||||
verbose_name_plural = u'部门成员'
|
||||
|
||||
@@ -0,0 +1,116 @@
|
||||
import re
|
||||
from rest_framework import serializers
|
||||
from Apps.history import *
|
||||
|
||||
|
||||
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_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 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)
|
||||
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
|
||||
|
||||
|
||||
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', '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 = 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):
|
||||
|
||||
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')
|
||||
#
|
||||
|
||||
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
|
||||
@@ -0,0 +1,3 @@
|
||||
from django.test import TestCase
|
||||
|
||||
# Create your tests here.
|
||||
@@ -0,0 +1,10 @@
|
||||
from django.conf.urls.static import static
|
||||
from ITShowPlatform import settings
|
||||
from django.urls import path
|
||||
from Apps.history.views import DepartmentViewSet, MemberViewSet, HistoryViewSet
|
||||
|
||||
urlpatterns = [
|
||||
path('department/', DepartmentViewSet.as_view()),
|
||||
path('member/', MemberViewSet.as_view()),
|
||||
path('history/', HistoryViewSet.as_view()),
|
||||
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
|
||||
@@ -0,0 +1,102 @@
|
||||
from rest_framework.views import APIView
|
||||
from Apps.history 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
|
||||
|
||||
|
||||
class DepartmentViewSet(APIView):
|
||||
# 获取部门信息
|
||||
@method_decorator(csrf_exempt)
|
||||
def get(self, request):
|
||||
response = {
|
||||
"code": 20000,
|
||||
"msg": "成功",
|
||||
}
|
||||
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} # 将其转为字典类(用于放入serializer检验)
|
||||
serializer = DepartmentSerializer(data=d)
|
||||
if serializer.is_valid():
|
||||
response['data'] = serializer.data # 在data里返回想得到的信息
|
||||
return Response(data=response)
|
||||
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)
|
||||
|
||||
|
||||
class MemberViewSet(APIView):
|
||||
# 获取历史成员信息
|
||||
@method_decorator(csrf_exempt)
|
||||
def get(self, request):
|
||||
response = {
|
||||
"code": 20000,
|
||||
"msg": "成功",
|
||||
}
|
||||
grade = request.GET.get('grade')
|
||||
did = request.GET.get('did')
|
||||
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)} # 将路径转为字符串格式
|
||||
serializer = MembersSerializer(data=d)
|
||||
if serializer.is_valid():
|
||||
l.append(d) # 将合法数据存入l列表中并继续进行下一个循环
|
||||
continue
|
||||
# 若出现不合法数据则将错误信息返回前端
|
||||
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)
|
||||
|
||||
|
||||
class HistoryViewSet(APIView):
|
||||
# 获取历史列表
|
||||
@method_decorator(csrf_exempt)
|
||||
def get(self, request):
|
||||
response = {
|
||||
"code": 20000,
|
||||
"msg": "成功",
|
||||
}
|
||||
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
|
||||
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}
|
||||
y = []
|
||||
for j in range(0, 6):
|
||||
try:
|
||||
a = History.objects.get(Q(did=j) & Q(grade=i))
|
||||
except History.DoesNotExist: # 若为空,则继续判断下一个部门
|
||||
continue
|
||||
x = {'id': a.did, 'department_name': a.department}
|
||||
y.append(x)
|
||||
data['data'] = y
|
||||
info.append(data)
|
||||
response["data"] = info
|
||||
return Response(data=response)
|
||||
Reference in New Issue
Block a user