ITStudio_OUC/ITShowPlatform
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	.idea/workspace.xml
This commit is contained in:
ygm1881
2022-05-05 20:40:19 +08:00
parent 3472f7e00e dd14308c35
commit 51b5e374a3
6 changed files with 204 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/ITShowPlatform.iml
Generated
+1 -1
View File
@@ -16,7 +16,7 @@
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/venv" /> <excludeFolder url="file://$MODULE_DIR$/venv" />
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="jdk" jdkName="Python 3.8" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
</component> </component>
<component name="TemplatesService"> <component name="TemplatesService">
.idea/misc.xml
Generated
+1 -1
View File
@@ -3,5 +3,5 @@
<component name="JavaScriptSettings"> <component name="JavaScriptSettings">
<option name="languageLevel" value="ES6" /> <option name="languageLevel" value="ES6" />
</component> </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> </project>
.idea/workspace.xml
Generated
+136 -9
View File
@@ -32,17 +32,49 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="81247df9-f070-428a-8ff8-85c1a06086e7" name="Default Changelist" comment="第一次合并+上线&#10;修改了history路由"> <list default="true" id="81247df9-f070-428a-8ff8-85c1a06086e7" name="Default Changelist" comment="第一次合并+上线&#10;修改了history路由">
<change afterPath="$PROJECT_DIR$/Apps/enroll/email_body" afterDir="false" /> <change afterPath="$PROJECT_DIR$/Apps/history/migrations/0001_initial.py" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Apps/enroll/migrations/0006_rename_new_member_newmember.py" afterDir="false" /> <change afterPath="$PROJECT_DIR$/Apps/history/migrations/__init__.py" afterDir="false" />
<change afterPath="$PROJECT_DIR$/media/lFUQpbHJ8k.jpg" afterDir="false" />
<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/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Apps/enroll/admin.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/enroll/admin.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Apps/enroll/email.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/enroll/email.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Apps/enroll/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/enroll/models.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Apps/enroll/serializers.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/enroll/serializers.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Apps/enroll/urls.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/enroll/urls.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Apps/enroll/views.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/enroll/views.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ITShowPlatform/settings.py" beforeDir="false" afterPath="$PROJECT_DIR$/ITShowPlatform/settings.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ITShowPlatform/settings.py" beforeDir="false" afterPath="$PROJECT_DIR$/ITShowPlatform/settings.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/utils/get_error_msg.py" beforeDir="false" afterPath="$PROJECT_DIR$/utils/get_error_msg.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ITShowPlatform/urls.py" beforeDir="false" afterPath="$PROJECT_DIR$/ITShowPlatform/urls.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/comments/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/__init__.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/comments/admin.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/comments/admin.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/comments/apps.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/comments/apps.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/comments/migrations/0001_initial.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/comments/migrations/0001_initial.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/comments/migrations/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/comments/__init__.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/comments/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/comments/models.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/comments/serializers.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/comments/serializers.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/comments/tests.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/comments/tests.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/comments/urls.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/comments/urls.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/comments/views.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/comments/views.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/enroll/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/comments/migrations/__init__.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/enroll/admin.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/enroll/admin.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/enroll/apps.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/enroll/apps.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/enroll/email.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/enroll/email.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/enroll/migrations/0001_initial.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/enroll/migrations/0001_initial.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/enroll/migrations/0002_alter_new_member_schedule_and_more.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/enroll/migrations/0002_alter_new_member_schedule_and_more.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/enroll/migrations/0003_alter_new_member_email_alter_new_member_phone_number.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/enroll/migrations/0003_alter_new_member_email_alter_new_member_phone_number.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/enroll/migrations/0004_alter_emailverifyrecord_send_time.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/enroll/migrations/0004_alter_emailverifyrecord_send_time.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/enroll/migrations/0005_alter_emailverifyrecord_code.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/enroll/migrations/0005_alter_emailverifyrecord_code.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/enroll/migrations/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/enroll/__init__.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/enroll/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/enroll/models.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/enroll/serializer.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/enroll/serializers.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/enroll/tests.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/enroll/tests.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/enroll/urls.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/enroll/urls.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/enroll/views.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/enroll/views.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/history/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/enroll/migrations/__init__.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/history/admin.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/history/admin.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/history/apps.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/history/apps.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/history/migrations/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/history/__init__.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/history/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/history/models.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/history/serializers.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/history/serializers.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/history/tests.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/history/tests.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/history/urls.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/history/urls.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/history/views.py" beforeDir="false" afterPath="$PROJECT_DIR$/Apps/history/views.py" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -206,6 +238,7 @@
</entry> </entry>
</map> </map>
</option> </option>
<option name="oldMeFiltersMigrated" value="true" />
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" /> <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
@@ -213,4 +246,98 @@
<MESSAGE value="修改+合并前的提交" /> <MESSAGE value="修改+合并前的提交" />
<option name="LAST_COMMIT_MESSAGE" value="修改+合并前的提交" /> <option name="LAST_COMMIT_MESSAGE" value="修改+合并前的提交" />
</component> </component>
<component name="WindowStateProjectService">
<state x="460" y="12" key="#ITShowPlatform" timestamp="1651644593580">
<screen x="0" y="0" width="1536" height="864" />
</state>
<state x="460" y="12" key="#ITShowPlatform/0.0.1536.864@0.0.1536.864" timestamp="1651644593580" />
<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="1651645077454">
<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="1651645077454" />
<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="1651739204582">
<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="1651739204582" />
<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="1493" height="216" key="GridCell.Tab.0.bottom" timestamp="1651746397547">
<screen x="0" y="0" width="1536" height="864" />
</state>
<state width="1493" height="216" key="GridCell.Tab.0.bottom/0.0.1536.864@0.0.1536.864" timestamp="1651746397546" />
<state width="1493" height="216" key="GridCell.Tab.0.center" timestamp="1651746397545">
<screen x="0" y="0" width="1536" height="864" />
</state>
<state width="1493" height="216" key="GridCell.Tab.0.center/0.0.1536.864@0.0.1536.864" timestamp="1651746397545" />
<state width="1493" height="216" key="GridCell.Tab.0.left" timestamp="1651746397545">
<screen x="0" y="0" width="1536" height="864" />
</state>
<state width="1493" height="216" key="GridCell.Tab.0.left/0.0.1536.864@0.0.1536.864" timestamp="1651746397545" />
<state width="1493" height="216" key="GridCell.Tab.0.right" timestamp="1651746397546">
<screen x="0" y="0" width="1536" height="864" />
</state>
<state width="1493" height="216" key="GridCell.Tab.0.right/0.0.1536.864@0.0.1536.864" timestamp="1651746397546" />
<state width="1493" height="269" key="GridCell.Tab.1.bottom" timestamp="1651745777781">
<screen x="0" y="0" width="1536" height="864" />
</state>
<state width="1493" height="269" key="GridCell.Tab.1.bottom/0.0.1536.864@0.0.1536.864" timestamp="1651745777781" />
<state width="1493" height="269" key="GridCell.Tab.1.center" timestamp="1651745777781">
<screen x="0" y="0" width="1536" height="864" />
</state>
<state width="1493" height="269" key="GridCell.Tab.1.center/0.0.1536.864@0.0.1536.864" timestamp="1651745777781" />
<state width="1493" height="269" key="GridCell.Tab.1.left" timestamp="1651745777781">
<screen x="0" y="0" width="1536" height="864" />
</state>
<state width="1493" height="269" key="GridCell.Tab.1.left/0.0.1536.864@0.0.1536.864" timestamp="1651745777781" />
<state width="1493" height="269" key="GridCell.Tab.1.right" timestamp="1651745777781">
<screen x="0" y="0" width="1536" height="864" />
</state>
<state width="1493" height="269" key="GridCell.Tab.1.right/0.0.1536.864@0.0.1536.864" timestamp="1651745777781" />
<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="1651645101984">
<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="1651645101984" />
<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="93" y="93" width="1350" height="678" key="com.intellij.history.integration.ui.views.FileHistoryDialog" timestamp="1651645036813">
<screen x="0" y="0" width="1536" height="864" />
</state>
<state x="93" y="93" width="1350" height="678" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1536.864@0.0.1536.864" timestamp="1651645036813" />
<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="1651644223975">
<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="1651644223975" />
<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>
</project> </project>
Apps/history/serializers.py
+30 -22
View File
@@ -1,24 +1,25 @@
import re import re
from rest_framework import serializers from rest_framework import serializers
from Apps.history import * from Apps.history import *
from Apps.history.models import Department, Members, History
def validate_department(value): def validate_department(value):
reg = re.compile(r'^[\u4e00-\u9fa5A-Za-z]*$') reg = re.compile(r'^[\u4e00-\u9fa5A-Za-z]*$')
if not reg.match(value): if not reg.match(value):
raise serializers.ValidationError("部门名称中只能输入汉字或英文") raise serializers.ValidationError("42011-部门名称中只能输入汉字或英文")
def validate_department_en(value): def validate_department_en(value):
reg = re.compile(r'^[A-Za-z][A-Za-z\s]*$') reg = re.compile(r'^[A-Za-z][A-Za-z\s]*$')
if not reg.match(value): if not reg.match(value):
raise serializers.ValidationError("部门英文名称中只能输入英文") raise serializers.ValidationError("42010-部门英文名称中只能输入英文")
def name_validate(value): def name_validate(value):
reg = re.compile(r'^[\u4e00-\u9fa5A-Za-z]*$') reg = re.compile(r'^[\u4e00-\u9fa5A-Za-z]*$')
if not reg.match(value): if not reg.match(value):
raise serializers.ValidationError("姓名只能输入汉字或英文") raise serializers.ValidationError("42012-姓名只能输入汉字或英文")
# #
# def validate_avatar(value): # def validate_avatar(value):
@@ -27,17 +28,18 @@ def name_validate(value):
class DepartmentSerializer(serializers.Serializer): 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, department = serializers.CharField(max_length=10, required=True, trim_whitespace=True,
validators=[validate_department], 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, department_en = serializers.CharField(max_length=30, required=True, trim_whitespace=True,
validators=[validate_department_en], 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, 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, 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: # class Meta:
# model = Department # model = Department
@@ -59,15 +61,16 @@ class DepartmentSerializer(serializers.Serializer):
class MembersSerializer(serializers.HyperlinkedModelSerializer): 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, 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, 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, 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], 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]) # avatar = serializers.ImageField(validators=[validate_avatar])
class Meta: class Meta:
@@ -91,19 +94,24 @@ class MembersSerializer(serializers.HyperlinkedModelSerializer):
class HistorySerializer(serializers.Serializer): class HistorySerializer(serializers.Serializer):
grade = serializers.IntegerField(required=True, min_value=2001, max_value=2022, 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-年级数不能为空",
did = serializers.IntegerField(required=True, error_messages={"blank": '部门ID不能为空', "invalid": '类型错误'}) "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, department = serializers.CharField(max_length=10, required=True, trim_whitespace=True,
validators=[validate_department], validators=[validate_department],
error_messages={"max_length": '部门名称过长', "blank": '部门名称不能为空'}) error_messages={"max_length": '42021-部门名称过长', "blank": '41011-部门名称不能为空'})
# class Meta: # class Meta:
# model = History # model = History
# fields = ('grade', 'did', 'department') # fields = ('grade', 'did', 'department')
# #
# def update(self, instance, validated_data):
# instance.department = validated_data.get("department", instance.department) def create(self, validated_data):
# instance.grade = validated_data.get("grade", instance.grade) return History.objects.create(**validated_data)
# instance.did = validated_data.get("did", instance.did)
# instance.save() def update(self, instance, validated_data):
# return instance 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
Apps/history/views.py
+36 -20
View File
@@ -5,6 +5,9 @@ from django.db.models import Q
from django.utils.decorators import method_decorator from django.utils.decorators import method_decorator
from django.views.decorators.csrf import csrf_exempt 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): class DepartmentViewSet(APIView):
# 获取部门信息 # 获取部门信息
@@ -14,16 +17,19 @@ class DepartmentViewSet(APIView):
"code": 20000, "code": 20000,
"msg": "成功", "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, 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) serializer = DepartmentSerializer(data=d)
if serializer.is_valid(): if serializer.is_valid():
response['data'] = serializer.data response['data'] = serializer.data # 在data里返回想得到的信息
return Response(data=response) return Response(data=response)
response['code'] = 40000 key = list(serializer.errors.keys())[0] # 得到错误信息的keys中的第一个key
response['msg'] = "错误" # 用一个key得到一个错误信息,一个错误信息中的错误码与detail用“-”隔开， 通过split分开
response['data'] = serializer.errors value = str(list(serializer.errors.get(key))[0]).split("-")
response['code'] = int(value[0])
response['msg'] = value[1]
return Response(data=response) return Response(data=response)
@@ -37,20 +43,27 @@ class MemberViewSet(APIView):
} }
grade = request.GET.get('grade') grade = request.GET.get('grade')
did = request.GET.get('did') did = request.GET.get('did')
queryset = Members.objects.all().filter(Q(did=did) & Q(grade=grade)) queryset = Members.objects.all().filter(Q(did=did) & Q(grade=grade)) # 获得所有符合要求的object
l = [] l = [] # 建一个列表用于存储最终输出的data
# 对符合要求的每一个object都转为字典并通过serializer检验数据是否合法
for x in queryset: 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, d = {'id': x.id, 'did': x.did, 'grade': x.grade, 'department': x.department, 'motto': x.motto,
'name': x.name, 'name': x.name,
'avatar': str(x.avatar)} 'avatar': avatar} # 将路径转为字符串格式
serializer = MembersSerializer(data=d) serializer = MembersSerializer(data=d)
if serializer.is_valid(): if serializer.is_valid():
l.append(d) l.append(d) # 将合法数据存入l列表中并继续进行下一个循环
continue continue
response = { # 若出现不合法数据则将错误信息返回前端
"code": 40000, key = list(serializer.errors.keys())[0] # 得到错误信息的keys中的第一个key
"msg": serializer.errors, # 用一个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) return Response(data=response)
response['data'] = l response['data'] = l
return Response(data=response) return Response(data=response)
@@ -64,17 +77,20 @@ class HistoryViewSet(APIView):
"code": 20000, "code": 20000,
"msg": "成功", "msg": "成功",
} }
ser = History.objects.all() ser = History.objects.all() # 获取全部历史列表信息
# 同上，对每一个object进行判断
for x in ser: for x in ser:
d = {'did': x.did, 'grade': x.grade, 'department': x.department} d = {'did': x.did, 'grade': x.grade, 'department': x.department}
serializer = HistorySerializer(data=d) serializer = HistorySerializer(data=d)
if serializer.is_valid(): if serializer.is_valid():
continue continue
response = { key = list(serializer.errors.keys())[0] # 得到错误信息的keys中的第一个key
"code": 40000, # 用一个key得到一个错误信息,一个错误信息中的错误码与detail用“-”隔开， 通过split分开
"msg": serializer.errors, value = str(list(serializer.errors.get(key))[0]).split("-")
} response['code'] = int(value[0])
response['msg'] = value[1]
return Response(data=response) return Response(data=response)
# 若数据通过判断，则在此处将数据转为要求格式
info = [] info = []
for i in range(2002, 2022): for i in range(2002, 2022):
data = {'grade': i} data = {'grade': i}
@@ -82,7 +98,7 @@ class HistoryViewSet(APIView):
for j in range(0, 6): for j in range(0, 6):
try: try:
a = History.objects.get(Q(did=j) & Q(grade=i)) a = History.objects.get(Q(did=j) & Q(grade=i))
except: except History.DoesNotExist: # 若为空，则继续判断下一个部门
continue continue
x = {'id': a.did, 'department_name': a.department} x = {'id': a.did, 'department_name': a.department}
y.append(x) y.append(x)
media/default/user.jpg
View File