Merge remote-tracking branch 'gitee/master'

# Conflicts:
#	.idea/misc.xml
#	.idea/workspace.xml

.idea/ITShowPlatform.iml

@@ -1,28 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="PYTHON_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="django" name="Django">
-      <configuration>
-        <option name="rootFolder" value="$MODULE_DIR$" />
-        <option name="settingsModule" value="ITShowPlatform/settings.py" />
-        <option name="manageScript" value="$MODULE_DIR$/manage.py" />
-        <option name="environment" value="&lt;map/&gt;" />
-        <option name="doNotUseTestRunner" value="false" />
-        <option name="trackFilePattern" value="migrations" />
-      </configuration>
-    </facet>
-  </component>
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$" />
     <orderEntry type="jdk" jdkName="Python 3.9 (ITShowPlatform)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-  <component name="TemplatesService">
-    <option name="TEMPLATE_CONFIGURATION" value="Django" />
-    <option name="TEMPLATE_FOLDERS">
-      <list>
-        <option value="$MODULE_DIR$/venv/Lib/site-packages/django/forms/templates" />
-      </list>
-    </option>
-  </component>
 </module>

.idea/dataSources.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
+    <data-source source="LOCAL" name="ITStudio@localhost" uuid="f9570fba-eba2-4840-bc3f-b898c3fabd4c">
+      <driver-ref>mysql.8</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
+      <jdbc-url>jdbc:mysql://localhost:3306/ITStudio</jdbc-url>
+      <working-dir>$ProjectFileDir$</working-dir>
+    </data-source>
+  </component>
+</project>

.idea/inspectionProfiles/Project_Default.xml

@@ -1,11 +1,48 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
-    <inspection_tool class="PyPep8Inspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+    <inspection_tool class="HtmlUnknownAttribute" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="myValues">
+        <value>
+          <list size="3">
+            <item index="0" class="java.lang.String" itemvalue="rows" />
+            <item index="1" class="java.lang.String" itemvalue="cols" />
+            <item index="2" class="java.lang.String" itemvalue="height" />
+          </list>
+        </value>
+      </option>
+      <option name="myCustomValuesEnabled" value="true" />
+    </inspection_tool>
+    <inspection_tool class="HtmlUnknownTag" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="myValues">
+        <value>
+          <list size="9">
+            <item index="0" class="java.lang.String" itemvalue="nobr" />
+            <item index="1" class="java.lang.String" itemvalue="noembed" />
+            <item index="2" class="java.lang.String" itemvalue="comment" />
+            <item index="3" class="java.lang.String" itemvalue="noscript" />
+            <item index="4" class="java.lang.String" itemvalue="embed" />
+            <item index="5" class="java.lang.String" itemvalue="script" />
+            <item index="6" class="java.lang.String" itemvalue="style" />
+            <item index="7" class="java.lang.String" itemvalue="a" />
+            <item index="8" class="java.lang.String" itemvalue="div" />
+          </list>
+        </value>
+      </option>
+      <option name="myCustomValuesEnabled" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PyPep8NamingInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
       <option name="ignoredErrors">
         <list>
-          <option value="W29" />
+          <option value="N802" />
-          <option value="E501" />
+          <option value="N806" />
+        </list>
+      </option>
+    </inspection_tool>
+    <inspection_tool class="PyUnresolvedReferencesInspection" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoredIdentifiers">
+        <list>
+          <option value="register.views.register.objects" />
         </list>
       </option>
     </inspection_tool>

ITShowPlatform/settings.py

@@ -78,16 +78,15 @@ WSGI_APPLICATION = 'ITShowPlatform.wsgi.application'
 # https://docs.djangoproject.com/en/4.0/ref/settings/#databases
 
 DATABASES = {
-    'default': {
+     'default': {
         'ENGINE': 'django.db.backends.mysql',
-        'NAME': "ITShowPlatform",
+        'NAME': 'ITStudio',
-        'PORT': '3306',
-        'PASSWORD': 'HNXhnx123',
         'USER': 'root',
-        'HOST': '127.0.0.1'
+        'PASSWORD': 'Kjh030106',
     }
 }
 
+
 # Password validation
 # https://docs.djangoproject.com/en/4.0/ref/settings/#auth-password-validators
 

ITShowPlatform/urls.py

@@ -19,6 +19,8 @@ from django.views.static import serve
 from ITShowPlatform import settings
 from rest_framework import routers
 
+from history.views import DepartmentViewSet, MemberViewSet, HistoryViewSet
+
 urlpatterns = [
     path('admin/', admin.site.urls),
     path('v1/api/', include('comments.urls')),

history/admin.py

@@ -1,5 +1,7 @@
 from django.contrib import admin
-from .models import History
+from .models import *
-# Register your models here.
 
+
+admin.site.register(Department)
 admin.site.register(History)
+admin.site.register(Members)

history/apps.py

@@ -1,6 +1,6 @@
 from django.apps import AppConfig
 
 
-class HistoryConfig(AppConfig):
+class TodoListConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
     name = 'history'

history/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 3.2.5 on 2022-04-15 14:20
+# Generated by Django 3.1.2 on 2022-04-17 06:52
 
 from django.db import migrations, models
 
@@ -11,14 +11,47 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
+        migrations.CreateModel(
+            name='Department',
+            fields=[
+                ('id', models.AutoField(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='部门')),
+                ('part', models.IntegerField(default=0, verbose_name='部分')),
+                ('title', models.CharField(max_length=30, verbose_name='标题')),
+                ('content', models.CharField(max_length=1500, 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')),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('grade', models.IntegerField(verbose_name='年份')),
+                ('grade', models.IntegerField(verbose_name='年级')),
-                ('name', models.CharField(max_length=30, verbose_name='事件名称')),
+                ('did', models.IntegerField(verbose_name='部门ID')),
-                ('description', models.CharField(max_length=200, verbose_name='事件描述')),
+                ('department', models.CharField(max_length=10, verbose_name='部门')),
-                ('img', models.ImageField(upload_to='', verbose_name='图片')),
             ],
+            options={
+                'verbose_name_plural': '历史表',
+                'db_table': 'it_History',
+            },
+        ),
+        migrations.CreateModel(
+            name='Members',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('department', models.CharField(max_length=10, verbose_name='所属部门')),
+                ('avatar', models.ImageField(blank=True, upload_to='avatar', verbose_name='头像')),
+                ('grade', models.IntegerField(verbose_name='年级')),
+                ('name', models.CharField(max_length=10, verbose_name='成员姓名')),
+                ('motto', models.CharField(max_length=30, verbose_name='座右铭')),
+            ],
+            options={
+                'verbose_name_plural': '部门成员',
+                'db_table': 'it_Members',
+            },
         ),
     ]

history/migrations/0002_alter_history_img.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.5 on 2022-04-15 14:32
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('history', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='history',
-            name='img',
-            field=models.ImageField(upload_to='image', verbose_name='图片'),
-        ),
-    ]

history/migrations/0003_alter_history_img.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.5 on 2022-04-15 23:05
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('history', '0002_alter_history_img'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='history',
-            name='img',
-            field=models.ImageField(upload_to='', verbose_name='图片'),
-        ),
-    ]

history/models.py

@@ -1,11 +1,39 @@
 from django.db import models
+from django.core.validators import validate_comma_separated_integer_list
 
-# Create your models here.
+
+class Department(models.Model):
+    did = models.IntegerField("部门ID")
+    department = models.CharField("部门", max_length=10)  # 如“程序部”
+    part = models.IntegerField("部分", default=0)  # 0：内容一；1：内容二          （可能没必要）
+    title = models.CharField("标题", max_length=30)  # 如部门介绍/部门要求
+    content = models.CharField("内容", max_length=1500)  # 如部门介绍/部门要求
+
+    class Meta:
+        db_table = 'it_Department'
+        verbose_name_plural = u'部门详情'
 
     
 class History(models.Model):
-    grade = models.IntegerField(verbose_name="年份")
+    grade = models.IntegerField("年级")
-    name = models.CharField(verbose_name="事件名称", max_length=30)
+    did = models.IntegerField("部门ID")
-    description = models.CharField(verbose_name="事件描述", max_length=200)
+    department = models.CharField("部门", max_length=10)  # 如“程序部”
-    img = models.ImageField(verbose_name="图片", upload_to="image")
+
+    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'部门成员'
 

history/serializers.py

@@ -1,19 +1,75 @@
 from rest_framework import serializers
-from .models import *
+from history.models import *
+from django.core.validators import int_list_validator
 
 
-class HistoryInfoSerializer(serializers.ModelSerializer):
+class DepartmentSerializer(serializers.HyperlinkedModelSerializer):
+    class Meta:
+        model = Department
+        fields = ('did', 'department', 'part', 'title', 'content')
+
+    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": '部门名称不能为空'})
+    part = serializers.IntegerField(required=True, error_messages={"blank": '不能为空'})  # 区分同意部分不同段落
+    title = serializers.CharField(required=False, trim_whitespace=True, max_length=30,
+                                  error_messages={"max_length": '题目过长'})
+    content = serializers.CharField(max_length=600, required=True, trim_whitespace=True,
+                                    error_messages={"max_length": '内容过长', "blank": '内容不能为空'})
+
+    def update(self, instance, validated_data):
+        instance.content = validated_data.get("content", instance.content)
+        instance.department = validated_data.get("department", instance.department)
+        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):
+    class Meta:
+        model = Members
+        fields = ('did', 'department', 'grade', 'name', 'motto', 'avatar')
+
+    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,
+                                     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,
+                                  error_messages={"max_length": '座右铭过长'})
+    avatar = serializers.ImageField()
+
+    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.HyperlinkedModelSerializer):
     class Meta:
         model = History
-        fields = '__all__'
+        fields = ('grade', 'did', 'department')
-    grade = serializers.CharField(label="年级", required=True)
-    name = serializers.CharField(label="事件名称", max_length=30, required=True)
-    description = serializers.CharField(label="事件描述", max_length=200, required=True)
-    img = serializers.ImageField(label="图片", required=False)
 
-    def validate_grade(self, value):
+    grade = serializers.IntegerField(required=True, min_value=1970, max_value=2022,
-        if not (2010 < value <= 2021):
+                                     error_messages={"max_value": '年级数过大', "blank": "年级数不能为空", "min_value": '年级数过小'})
-            raise serializers.ValidationError("不合法输入")
+    did = serializers.IntegerField(required=True, error_messages={"blank": '部门ID不能为空', "invalid": '类型错误'})
-        return value
+    department = serializers.CharField(max_length=10, required=True, trim_whitespace=True,
+                                       error_messages={"max_length": '部门名称过长', "blank": '部门名称不能为空'})
+
+    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
 
 

history/urls.py

@@ -1,11 +1,10 @@
-from django.contrib import admin
-from django.urls import path
-from . import views
 from django.conf.urls.static import static
 from ITShowPlatform import settings
+from django.urls import path
+from history.views import DepartmentViewSet, MemberViewSet, HistoryViewSet
 
 urlpatterns = [
-    path('history/', views.history.as_view()),
+    path('department/', DepartmentViewSet.as_view()),
-]
+    path('member/', MemberViewSet.as_view()),
-
+    path('history_list/', HistoryViewSet.as_view()),
-urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

history/views.py

@@ -1,37 +1,90 @@
-import time
+from django.http import JsonResponse
-from django.conf import settings
-import re
-from django.shortcuts import render
 from rest_framework.views import APIView
+from history.serializers import *
 from rest_framework.response import Response
-from .models import History
+from django.db.models import Q
-from .serializers import HistoryInfoSerializer
+from django.utils.decorators import method_decorator
-# Create your views here.
+from django.views.decorators.csrf import csrf_exempt
+from django.core.cache import cache
 
 
-class history(APIView):
+class DepartmentViewSet(APIView):
-
+    # 获取部门信息
+    @method_decorator(csrf_exempt)
     def get(self, request):
-        key = []
+        response = {
-        data = {"data": key}
+            "code": 20000,
-        for i in range(2012, 2022):
+            "msg": "成功",
-            temp = {}
+        }
-            try:
+        queryset = Department.objects.all().filter(did=request.GET.get('did'))
-                works_set = History.objects.filter(grade=i)
+        serializer = DepartmentSerializer(queryset, many=True, context={'request': request})
-                if works_set:
+        try:
-                    serializer = HistoryInfoSerializer(works_set, many=True)
+            response["data"] = serializer.data
-                    temp['grade'] = i
+        except:
-                    temp['data'] = serializer.data
+            response['msg'] = serializer.error_messages
-                    data['data'].append(temp)
+        if len(response['data']) == 0:
-            except Exception:
+            response['code'] = 40000
-                pass
+            response['msg'] = "未返回数据"
-        if len(data['data']) == 0:
-            data['code'] = 40000
-            data['msg'] = "error"
         else:
-            data['code'] = 20000
+            response['code'] = 20000
-            data['msg'] = 'success'
+            response['msg'] = "成功"
-        return Response(data=data)
+        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')
+        try:
+            queryset = Members.objects.all().filter(Q(grade=grade) & Q(did=did))
+            serializer = MembersSerializer(queryset, many=True)
+        except:
+            response = {
+                "code": 40000,
+                "msg": "错误",
+            }
+            return Response(data=response)
+        response["data"] = serializer.data
+        return Response(data=response)
 
+
+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
+            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
+                y.append(x)
+            data['data'] = y
+            info.append(data)
+        response["data"] = info
+        print(response)
+        return Response(data=response)