完善了一下serializers
This commit is contained in:
康家辉
Generated
+1
-1
@@ -2,7 +2,7 @@
|
||||
<module type="PYTHON_MODULE" version="4">
|
||||
<component name="NewModuleRootManager">
|
||||
<content url="file://$MODULE_DIR$" />
|
||||
<orderEntry type="jdk" jdkName="Python 3.9 (ITShowPlatform)" jdkType="Python SDK" />
|
||||
<orderEntry type="jdk" jdkName="Python 3.8" jdkType="Python SDK" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
</module>
|
||||
Generated
+1
-1
@@ -5,7 +5,7 @@
|
||||
<paths name="ITShowPlatform">
|
||||
<serverdata>
|
||||
<mappings>
|
||||
<mapping deploy="/Django/ITShowPlatform" local="$PROJECT_DIR$" web="/" />
|
||||
<mapping local="$PROJECT_DIR$" web="/" />
|
||||
</mappings>
|
||||
</serverdata>
|
||||
</paths>
|
||||
|
||||
Generated
+1
-1
@@ -3,5 +3,5 @@
|
||||
<component name="JavaScriptSettings">
|
||||
<option name="languageLevel" value="ES6" />
|
||||
</component>
|
||||
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.9 (ITShowPlatform)" project-jdk-type="Python SDK" />
|
||||
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.8" project-jdk-type="Python SDK" />
|
||||
</project>
|
||||
Generated
+1
-1
@@ -2,7 +2,7 @@
|
||||
<project version="4">
|
||||
<component name="SshConfigs">
|
||||
<configs>
|
||||
<sshConfig authType="PASSWORD" host="101.43.216.170" id="76af0150-1401-4711-9b33-6d0785afbecd" port="22" nameFormat="DESCRIPTIVE" username="root" />
|
||||
<sshConfig authType="PASSWORD" connectionConfig="{"serverAliveInterval":300}" host="101.43.216.170" id="76af0150-1401-4711-9b33-6d0785afbecd" port="22" nameFormat="DESCRIPTIVE" username="root" />
|
||||
</configs>
|
||||
</component>
|
||||
</project>
|
||||
Generated
+11
-73
@@ -32,10 +32,15 @@
|
||||
</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" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ITShowPlatform/settings.py" beforeDir="false" afterPath="$PROJECT_DIR$/ITShowPlatform/settings.py" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ITShowPlatform/urls.py" beforeDir="false" afterPath="$PROJECT_DIR$/ITShowPlatform/urls.py" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/history/urls.py" beforeDir="false" afterPath="$PROJECT_DIR$/history/urls.py" 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" />
|
||||
<change beforePath="$PROJECT_DIR$/history/serializers.py" beforeDir="false" afterPath="$PROJECT_DIR$/history/serializers.py" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/history/views.py" beforeDir="false" afterPath="$PROJECT_DIR$/history/views.py" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
@@ -67,7 +72,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$/../IT_todo" />
|
||||
<property name="last_opened_file_path" value="$PROJECT_DIR$/../pythonProject4" />
|
||||
<property name="settings.editor.selected.configurable" value="web.server" />
|
||||
</component>
|
||||
<component name="RunManager">
|
||||
@@ -165,74 +170,7 @@
|
||||
<MESSAGE value="修改+合并前的提交" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="修改+合并前的提交" />
|
||||
</component>
|
||||
<component name="WindowStateProjectService">
|
||||
<state x="345" y="76" key="#SSH_Configurations" timestamp="1650645097799">
|
||||
<screen x="0" y="0" width="1536" height="864" />
|
||||
</state>
|
||||
<state x="345" y="76" key="#SSH_Configurations/0.0.1536.864@0.0.1536.864" timestamp="1650645097799" />
|
||||
<state x="223" y="87" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1650644765641">
|
||||
<screen x="0" y="0" width="1536" height="864" />
|
||||
</state>
|
||||
<state x="223" y="87" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1536.864@0.0.1536.864" timestamp="1650644765641" />
|
||||
<state x="93" y="93" width="1350" height="678" key="DiffContextDialog" timestamp="1650785927137">
|
||||
<screen x="0" y="0" width="1536" height="864" />
|
||||
</state>
|
||||
<state x="93" y="93" width="1350" height="678" key="DiffContextDialog/0.0.1536.864@0.0.1536.864" timestamp="1650785927137" />
|
||||
<state x="549" y="187" key="FileChooserDialogImpl" timestamp="1650645368910">
|
||||
<screen x="0" y="0" width="1536" height="864" />
|
||||
</state>
|
||||
<state x="549" y="187" key="FileChooserDialogImpl/0.0.1536.864@0.0.1536.864" timestamp="1650645368910" />
|
||||
<state x="615" y="398" key="Gitee.ShareDialog" timestamp="1650650539689">
|
||||
<screen x="0" y="0" width="1536" height="864" />
|
||||
</state>
|
||||
<state x="615" y="398" key="Gitee.ShareDialog/0.0.1536.864@0.0.1536.864" timestamp="1650650539689" />
|
||||
<state x="615" y="342" key="Github.Dialog.Accounts.Choose" timestamp="1650187937570">
|
||||
<screen x="0" y="0" width="1536" height="864" />
|
||||
</state>
|
||||
<state x="615" y="342" key="Github.Dialog.Accounts.Choose/0.0.1536.864@0.0.1536.864" timestamp="1650187937570" />
|
||||
<state width="1478" height="214" key="GridCell.Tab.0.bottom" timestamp="1650644913378">
|
||||
<screen x="0" y="0" width="1536" height="864" />
|
||||
</state>
|
||||
<state width="1478" height="214" key="GridCell.Tab.0.bottom/0.0.1536.864@0.0.1536.864" timestamp="1650644913378" />
|
||||
<state width="1478" height="214" key="GridCell.Tab.0.center" timestamp="1650644913377">
|
||||
<screen x="0" y="0" width="1536" height="864" />
|
||||
</state>
|
||||
<state width="1478" height="214" key="GridCell.Tab.0.center/0.0.1536.864@0.0.1536.864" timestamp="1650644913377" />
|
||||
<state width="1478" height="214" key="GridCell.Tab.0.left" timestamp="1650644913374">
|
||||
<screen x="0" y="0" width="1536" height="864" />
|
||||
</state>
|
||||
<state width="1478" height="214" key="GridCell.Tab.0.left/0.0.1536.864@0.0.1536.864" timestamp="1650644913374" />
|
||||
<state width="1478" height="214" key="GridCell.Tab.0.right" timestamp="1650644913377">
|
||||
<screen x="0" y="0" width="1536" height="864" />
|
||||
</state>
|
||||
<state width="1478" height="214" key="GridCell.Tab.0.right/0.0.1536.864@0.0.1536.864" timestamp="1650644913377" />
|
||||
<state x="147" y="69" key="MergeDialog" timestamp="1650785054273">
|
||||
<screen x="0" y="0" width="1536" height="864" />
|
||||
</state>
|
||||
<state x="147" y="69" key="MergeDialog/0.0.1536.864@0.0.1536.864" timestamp="1650785054273" />
|
||||
<state x="396" y="185" key="MultipleFileMergeDialog" timestamp="1650903868503">
|
||||
<screen x="0" y="0" width="1536" height="864" />
|
||||
</state>
|
||||
<state x="396" y="185" key="MultipleFileMergeDialog/0.0.1536.864@0.0.1536.864" timestamp="1650903868503" />
|
||||
<state x="270" y="76" key="SettingsEditor" timestamp="1650645549043">
|
||||
<screen x="0" y="0" width="1536" height="864" />
|
||||
</state>
|
||||
<state x="270" y="76" key="SettingsEditor/0.0.1536.864@0.0.1536.864" timestamp="1650645549043" />
|
||||
<state x="361" y="161" key="Vcs.Push.Dialog.v2" timestamp="1650187932255">
|
||||
<screen x="0" y="0" width="1536" height="864" />
|
||||
</state>
|
||||
<state x="361" y="161" key="Vcs.Push.Dialog.v2/0.0.1536.864@0.0.1536.864" timestamp="1650187932255" />
|
||||
<state x="563" y="345" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1650784772214">
|
||||
<screen x="0" y="0" width="1536" height="864" />
|
||||
</state>
|
||||
<state x="563" y="345" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1536.864@0.0.1536.864" timestamp="1650784772214" />
|
||||
<state x="1000" y="164" key="ftp.server.browser" timestamp="1650645530053">
|
||||
<screen x="0" y="0" width="1536" height="864" />
|
||||
</state>
|
||||
<state x="1000" y="164" key="ftp.server.browser/0.0.1536.864@0.0.1536.864" timestamp="1650645530053" />
|
||||
<state x="520" y="210" key="git4idea.merge.GitMergeDialog" timestamp="1650785115917">
|
||||
<screen x="0" y="0" width="1536" height="864" />
|
||||
</state>
|
||||
<state x="520" y="210" key="git4idea.merge.GitMergeDialog/0.0.1536.864@0.0.1536.864" timestamp="1650785115917" />
|
||||
<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" />
|
||||
</component>
|
||||
</project>
|
||||
@@ -5,6 +5,7 @@ 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) # 如“程序部”
|
||||
part = models.IntegerField("部分", default=0) # 0：内容一；1：内容二 （可能没必要）
|
||||
title = models.CharField("标题", max_length=30) # 如部门介绍/部门要求
|
||||
content = models.CharField("内容", max_length=1500) # 如部门介绍/部门要求
|
||||
@@ -26,6 +27,7 @@ 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("年级")
|
||||
|
||||
+43
-8
@@ -1,3 +1,5 @@
|
||||
import re
|
||||
|
||||
from rest_framework import serializers
|
||||
from history.models import *
|
||||
from django.core.validators import int_list_validator
|
||||
@@ -6,11 +8,27 @@ from django.core.validators import int_list_validator
|
||||
class DepartmentSerializer(serializers.HyperlinkedModelSerializer):
|
||||
class Meta:
|
||||
model = Department
|
||||
fields = ('did', 'department', 'part', 'title', 'content')
|
||||
fields = ('did', 'department_en', 'department', 'part', 'title', 'content')
|
||||
|
||||
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
|
||||
|
||||
did = serializers.IntegerField(required=True, error_messages={"blank": '部门ID不能为空', "invalid": '类型错误'})
|
||||
department = serializers.CharField(max_length=10, required=True, trim_whitespace=True,
|
||||
validators=[validate_department],
|
||||
error_messages={"max_length": '长度过长', "blank": '部门名称不能为空'})
|
||||
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": '题目过长'})
|
||||
@@ -20,6 +38,7 @@ class DepartmentSerializer(serializers.HyperlinkedModelSerializer):
|
||||
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)
|
||||
@@ -30,18 +49,29 @@ class DepartmentSerializer(serializers.HyperlinkedModelSerializer):
|
||||
class MembersSerializer(serializers.HyperlinkedModelSerializer):
|
||||
class Meta:
|
||||
model = Members
|
||||
fields = ('did', 'department', 'grade', 'name', 'motto', 'avatar')
|
||||
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": '部门名称不能为空'})
|
||||
grade = serializers.IntegerField(required=True, min_value=2002, max_value=2022,
|
||||
grade = serializers.IntegerField(required=True, min_value=2001, max_value=2022,
|
||||
error_messages={"max_value": '年级数过大', "blank": "年级数不能为空", "min_value": '年级数过小'})
|
||||
name = serializers.CharField(required=True, trim_whitespace=True, max_length=6,
|
||||
error_messages={"blank": '姓名不能为空', "max_length": '姓名过长'})
|
||||
motto = serializers.CharField(required=False, trim_whitespace=True, max_length=25,
|
||||
motto = serializers.CharField(required=False, trim_whitespace=True, max_length=25, validators=[name_validate],
|
||||
error_messages={"max_length": '座右铭过长'})
|
||||
avatar = serializers.ImageField()
|
||||
avatar = serializers.ImageField(validators=[name_validate])
|
||||
|
||||
def update(self, instance, validated_data):
|
||||
instance.did = validated_data.get("did", instance.did)
|
||||
@@ -59,10 +89,17 @@ class HistorySerializer(serializers.HyperlinkedModelSerializer):
|
||||
model = History
|
||||
fields = ('grade', 'did', 'department')
|
||||
|
||||
grade = serializers.IntegerField(required=True, min_value=1970, max_value=2022,
|
||||
def validate_department(self, value):
|
||||
reg = re.compile(r'^[\u4e00-\u9fa5A-Za-z]*$')
|
||||
if not reg.match(value):
|
||||
raise serializers.ValidationError("只能输入汉字")
|
||||
return value
|
||||
|
||||
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": '类型错误'})
|
||||
department = serializers.CharField(max_length=10, required=True, trim_whitespace=True,
|
||||
validators=[validate_department],
|
||||
error_messages={"max_length": '部门名称过长', "blank": '部门名称不能为空'})
|
||||
|
||||
def update(self, instance, validated_data):
|
||||
@@ -71,5 +108,3 @@ class HistorySerializer(serializers.HyperlinkedModelSerializer):
|
||||
instance.did = validated_data.get("did", instance.did)
|
||||
instance.save()
|
||||
return instance
|
||||
|
||||
|
||||
|
||||
+6
-16
@@ -17,10 +17,11 @@ class DepartmentViewSet(APIView):
|
||||
"msg": "成功",
|
||||
}
|
||||
queryset = Department.objects.all().filter(did=request.GET.get('did'))
|
||||
serializer = DepartmentSerializer(queryset, many=True, context={'request': request})
|
||||
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
|
||||
@@ -42,7 +43,7 @@ class MemberViewSet(APIView):
|
||||
grade = request.GET.get('grade')
|
||||
did = request.GET.get('did')
|
||||
try:
|
||||
queryset = Members.objects.all().filter(Q(grade=grade) & Q(did=did))
|
||||
queryset = Members.objects.all().filter(Q(did=did) & Q(grade=grade))
|
||||
serializer = MembersSerializer(queryset, many=True)
|
||||
except:
|
||||
response = {
|
||||
@@ -55,36 +56,25 @@ class MemberViewSet(APIView):
|
||||
|
||||
|
||||
class HistoryViewSet(APIView):
|
||||
# 获取历史成员信息
|
||||
# 获取历史列表
|
||||
@method_decorator(csrf_exempt)
|
||||
def get(self, request):
|
||||
response = {
|
||||
"code": 20000,
|
||||
"msg": "成功",
|
||||
}
|
||||
# queryset = History.objects.all()
|
||||
# serializer = HistorySerializer(queryset, many=True, context={'request': request})
|
||||
# try:
|
||||
# s = serializer.data
|
||||
# except:
|
||||
# response['code'] = 40000
|
||||
# response['msg'] = serializer.error_messages.first()
|
||||
info = []
|
||||
for i in range(2002, 2022):
|
||||
data = {}
|
||||
data['grade'] = i
|
||||
data = {'grade': i}
|
||||
y = []
|
||||
for j in range(0, 6):
|
||||
try:
|
||||
a = History.objects.get(Q(did=j) & Q(grade=i))
|
||||
except:
|
||||
continue
|
||||
x = {}
|
||||
x['id'] = a.did
|
||||
x['department_name'] = a.department
|
||||
x = {'id': a.did, 'department_name': a.department}
|
||||
y.append(x)
|
||||
data['data'] = y
|
||||
info.append(data)
|
||||
response["data"] = info
|
||||
print(response)
|
||||
return Response(data=response)
|
||||
|
||||
Reference in New Issue
Block a user