update. 完成前端页面展示、列表和详情页

update. 调整融合主菜单与板块
update. 分离新闻模块

article/admin.py

@@ -1,51 +1,56 @@
+from django import forms
 from django.contrib import admin
 from django.utils.html import format_html
+from import_export.admin import ImportExportModelAdmin
 
-from article.models import NoticeReceipt, Notice, Article, Carousel, Section
+from article.models import NoticeReceipt, Notice, Article, Carousel, ArticleAttachment
+from base.models import MainMenu
 from users.models import User
 
 
 # —————— 板块 ——————
-@admin.register(Section)
-class SectionAdmin(admin.ModelAdmin):
-    list_display = ('display_name', 'code', 'parent', 'is_enabled', 'order')
-    list_filter = ('parent', 'enabled')
-    search_fields = ('name', 'code')
-    ordering = ('order', 'name')
-    list_editable = ('order',)
-    fieldsets = (
-        ('基本信息', {
-            'fields': ('name', 'code', 'parent', 'enabled', 'order')
-        }),
-    )
-
-    def display_name(self, obj):
-        """在列表中显示层级缩进"""
-        if obj.is_sub:
-            return f"  └─ {obj.name}"  # 使用全角空格+符号模拟缩进
-        return obj.name
-    display_name.short_description = '板块名称'
-    display_name.admin_order_field = 'name'
-
-    def is_enabled(self, obj):
-        return obj.enabled
-    is_enabled.boolean = True
-    is_enabled.short_description = '启用'
-
-    def formfield_for_foreignkey(self, db_field, request, **kwargs):
-        """限制 parent 只能选择主板块（无父级的板块）"""
-        if db_field.name == "parent":
-            kwargs["queryset"] = Section.objects.filter(parent__isnull=True)
-        return super().formfield_for_foreignkey(db_field, request, **kwargs)
-
-    def get_queryset(self, request):
-        """优化查询，避免 N+1"""
-        return super().get_queryset(request).select_related('parent')
-
+# @admin.register(ArticleSection)
+# class SectionAdmin(admin.ModelAdmin):
+#     list_display = ('display_name', 'code', 'parent', 'is_enabled', 'order')
+#     list_filter = ('parent', 'enabled')
+#     search_fields = ('name', 'code')
+#     ordering = ('order', 'name')
+#     list_editable = ('order',)
+#     fieldsets = (
+#         ('基本信息', {
+#             'fields': ('name', 'code', 'parent', 'enabled', 'order')
+#         }),
+#     )
+#
+#     def display_name(self, obj):
+#         """在列表中显示层级缩进"""
+#         if obj.is_sub:
+#             return f"  └─ {obj.name}"  # 使用全角空格+符号模拟缩进
+#         return obj.name
+#
+#     display_name.short_description = '板块名称'
+#     display_name.admin_order_field = 'name'
+#
+#     def is_enabled(self, obj):
+#         return obj.enabled
+#
+#     is_enabled.boolean = True
+#     is_enabled.short_description = '启用'
+#
+#     def formfield_for_foreignkey(self, db_field, request, **kwargs):
+#         """限制 parent 只能选择主板块（无父级的板块）"""
+#         if db_field.name == "parent":
+#             kwargs["queryset"] = ArticleSection.objects.filter(parent__isnull=True)
+#         return super().formfield_for_foreignkey(db_field, request, **kwargs)
+#
+#     def get_queryset(self, request):
+#         """优化查询，避免 N+1"""
+#         return super().get_queryset(request).select_related('parent')
+#
 
 # —————— 轮播图 ——————
 @admin.register(Carousel)
-class CarouselAdmin(admin.ModelAdmin):
+class CarouselAdmin(ImportExportModelAdmin):
     list_display = ('title', 'image_thumb', 'link_url', 'order', 'active')
     list_editable = ('order', 'active')
     ordering = ('order',)
@@ -54,18 +59,49 @@ class CarouselAdmin(admin.ModelAdmin):
         if obj.image:
             return format_html('<image src="{}" width="60" height="auto" />', obj.image.url)
         return "无图"
+
     image_thumb.short_description = "预览"
 
 
+# --- 附件内联配置 ---
+class ArticleAttachmentInline(admin.TabularInline):
+    model = ArticleAttachment
+    extra = 1  # 默认显示 1 个空白的附件上传框
+    verbose_name = "附件"
+    verbose_name_plural = "附件列表"
+    # 如果附件较多，可以限制每页显示数量
+    # max_num = 5
+
+
+# 1. 定义自定义表单
+class ArticleForm(forms.ModelForm):
+    class Meta:
+        model = Article
+        fields = '__all__'
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        # 核心代码：过滤 section 字段，只保留有父级的分类（即二级分类）
+        # 这里的 queryset 会直接作用于 Admin 的下拉选择框
+        self.fields['section'].queryset = MainMenu.objects.filter(parent__isnull=False, enabled=True)
+
+        # 可选：优化显示格式，让用户知道是哪个主板块下的子板块
+        # 例如显示："[新闻中心] 国内新闻"
+        self.fields['section'].label_from_instance = lambda obj: f"[{obj.parent.name}] {obj.name}"
+
+
 # —————— 文章 ——————
 @admin.register(Article)
-class ArticleAdmin(admin.ModelAdmin):
+class ArticleAdmin(ImportExportModelAdmin):
+    form = ArticleForm  # <--- 关联自定义表单
     list_display = ('title', 'section', 'author', 'is_published', 'created_at')
     list_filter = ('section', 'is_published', 'created_at')
     search_fields = ('title', 'content')
     date_hierarchy = 'created_at'
     autocomplete_fields = ('author',)  # 需要 UserAdmin 支持搜索
 
+    # 核心配置：将附件内联注册到文章管理中
+    inlines = [ArticleAttachmentInline]
     fieldsets = (
         ('基本信息', {'fields': ('title', 'section', 'cover')}),
         ('内容', {'fields': ('content',)}),
@@ -75,7 +111,7 @@ class ArticleAdmin(admin.ModelAdmin):
 
 # —————— 通知（带签收） ——————
 @admin.register(Notice)
-class NoticeAdmin(admin.ModelAdmin):
+class NoticeAdmin(ImportExportModelAdmin):
     list_display = (
         'title',
         'publisher',
@@ -112,6 +148,7 @@ class NoticeAdmin(admin.ModelAdmin):
 
     def signed_count(self, obj):
         return obj.receipts.count()
+
     signed_count.short_description = "已签收人数"
 
     def total_target_users(self, obj):
@@ -123,12 +160,13 @@ class NoticeAdmin(admin.ModelAdmin):
         else:
             count = User.objects.filter(is_active=True).count()
         return count
+
     total_target_users.short_description = "应签收人数"
 
 
 # —————— 签收记录 ——————
 @admin.register(NoticeReceipt)
-class NoticeReceiptAdmin(admin.ModelAdmin):
+class NoticeReceiptAdmin(ImportExportModelAdmin):
     list_display = ('notice', 'user', 'signed_at')
     list_filter = ('signed_at', 'notice__title')
     search_fields = ('user__cname', 'user__username', 'notice__title')

article/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 6.0.3 on 2026-03-24 10:31
+# Generated by Django 6.0.3 on 2026-04-01 00:55
 
 import django_ckeditor_5.fields
 from django.db import migrations, models
@@ -16,24 +16,40 @@ class Migration(migrations.Migration):
             name='Article',
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('title', models.CharField(max_length=200, verbose_name='标题')),
-                ('content', django_ckeditor_5.fields.CKEditor5Field(verbose_name='正文')),
-                ('cover', models.ImageField(blank=True, upload_to='articles/', verbose_name='封面图')),
-                ('is_published', models.BooleanField(default=True, verbose_name='已发布')),
                 ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='创建时间')),
                 ('updated_at', models.DateTimeField(auto_now=True, verbose_name='更新时间')),
+                ('title', models.CharField(max_length=200, verbose_name='标题')),
+                ('content', django_ckeditor_5.fields.CKEditor5Field(verbose_name='正文')),
+                ('cover', models.ImageField(blank=True, upload_to='articles/%Y/%m/%d/', verbose_name='封面图')),
+                ('is_contribution', models.BooleanField(default=False, verbose_name='是否投稿')),
+                ('is_published', models.BooleanField(default=True, verbose_name='已发布')),
             ],
             options={
                 'verbose_name': '文章',
                 'verbose_name_plural': '文章管理',
             },
         ),
+        migrations.CreateModel(
+            name='ArticleAttachment',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='创建时间')),
+                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='更新时间')),
+                ('file', models.FileField(upload_to='articles/attachments/%Y/%m/%d/', verbose_name='附件文件')),
+            ],
+            options={
+                'verbose_name': '文章附件',
+                'verbose_name_plural': '文章附件管理',
+            },
+        ),
         migrations.CreateModel(
             name='Carousel',
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='创建时间')),
+                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='更新时间')),
                 ('title', models.CharField(max_length=100, verbose_name='轮播标题')),
-                ('image', models.ImageField(upload_to='carousel/', verbose_name='图片')),
+                ('image', models.ImageField(upload_to='carousel/%Y/%m/%d/', verbose_name='图片')),
                 ('link_url', models.URLField(blank=True, verbose_name='跳转链接')),
                 ('order', models.IntegerField(default=0, verbose_name='排序')),
                 ('active', models.BooleanField(default=True, verbose_name='启用')),
@@ -63,6 +79,8 @@ class Migration(migrations.Migration):
             name='NoticeReceipt',
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='创建时间')),
+                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='更新时间')),
                 ('signed_at', models.DateTimeField(auto_now_add=True, verbose_name='签收时间')),
             ],
             options={
@@ -70,19 +88,4 @@ class Migration(migrations.Migration):
                 'verbose_name_plural': '签收管理',
             },
         ),
-        migrations.CreateModel(
-            name='Section',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=50, unique=True, verbose_name='板块名称')),
-                ('code', models.SlugField(help_text='用于模板识别，如 news, notice', unique=True, verbose_name='板块代码')),
-                ('description', models.TextField(blank=True, verbose_name='描述')),
-                ('order', models.IntegerField(default=0, verbose_name='排序')),
-                ('enabled', models.BooleanField(default=True, verbose_name='启用')),
-            ],
-            options={
-                'verbose_name': '板块',
-                'verbose_name_plural': '板块管理',
-            },
-        ),
     ]

article/migrations/0002_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 6.0.3 on 2026-03-24 10:31
+# Generated by Django 6.0.3 on 2026-04-01 00:55
 
 import django.db.models.deletion
 from django.conf import settings
@@ -11,6 +11,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('article', '0001_initial'),
+        ('base', '0001_initial'),
         ('users', '0001_initial'),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
@@ -21,6 +22,16 @@ class Migration(migrations.Migration):
             name='author',
             field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='作者'),
         ),
+        migrations.AddField(
+            model_name='article',
+            name='section',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='base.mainmenu', verbose_name='所属板块'),
+        ),
+        migrations.AddField(
+            model_name='articleattachment',
+            name='article',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='attachments', to='article.article', verbose_name='所属文章'),
+        ),
         migrations.AddField(
             model_name='notice',
             name='publisher',
@@ -41,11 +52,6 @@ class Migration(migrations.Migration):
             name='user',
             field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='签收人'),
         ),
-        migrations.AddField(
-            model_name='article',
-            name='section',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='article.section', verbose_name='所属板块'),
-        ),
         migrations.AlterUniqueTogether(
             name='noticereceipt',
             unique_together={('notice', 'user')},

article/migrations/0003_alter_section_options_remove_section_description_and_more.py

@@ -1,47 +0,0 @@
-# Generated by Django 6.0.3 on 2026-03-24 13:24
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('article', '0002_initial'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='section',
-            options={'ordering': ('order', 'name'), 'verbose_name': '板块', 'verbose_name_plural': '板块管理'},
-        ),
-        migrations.RemoveField(
-            model_name='section',
-            name='description',
-        ),
-        migrations.AddField(
-            model_name='section',
-            name='parent',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='subsections', to='article.section', verbose_name='所属主板块'),
-        ),
-        migrations.AlterField(
-            model_name='section',
-            name='code',
-            field=models.SlugField(help_text='用于模板或URL识别，建议英文', unique=True, verbose_name='唯一标识'),
-        ),
-        migrations.AlterField(
-            model_name='section',
-            name='enabled',
-            field=models.BooleanField(default=True, verbose_name='启用状态'),
-        ),
-        migrations.AlterField(
-            model_name='section',
-            name='name',
-            field=models.CharField(max_length=100, unique=True, verbose_name='板块名称'),
-        ),
-        migrations.AlterField(
-            model_name='section',
-            name='order',
-            field=models.PositiveSmallIntegerField(default=0, verbose_name='排序权重'),
-        ),
-    ]

article/models.py

@@ -1,79 +1,22 @@
 from django.db import models
 from django_ckeditor_5.fields import CKEditor5Field
 
+from base.models import MainMenu
+from common.base import BaseEntity
 from users.models import User, Department
 
 
 # Create your models here.
 
-from django.db import models
-from django.core.exceptions import ValidationError
-
-class Section(models.Model):
-    name = models.CharField('板块名称', max_length=100, unique=True)
-    code = models.SlugField('唯一标识', max_length=50, unique=True, help_text='用于模板或URL识别，建议英文')
-    parent = models.ForeignKey(
-        'self',
-        on_delete=models.CASCADE,
-        null=True,
-        blank=True,
-        related_name='subsections',
-        verbose_name='所属主板块'
-    )
-    order = models.PositiveSmallIntegerField('排序权重', default=0)
-    enabled = models.BooleanField('启用状态', default=True)
-
-    class Meta:
-        verbose_name = '板块'
-        verbose_name_plural = '板块管理'
-        ordering = ('order', 'name')
-
-    def __str__(self):
-        if self.parent:
-            return f"{self.parent.name} → {self.name}"
-        return self.name
-
-    def clean(self):
-        super().clean()
-        # 禁止子板块再设父级（即最多两级）
-        if self.parent and self.parent.parent:
-            raise ValidationError('子板块不能再设置子级，最多只允许一级嵌套。')
-        # 防止自引用
-        if self.pk and self.parent and self.parent.pk == self.pk:
-            raise ValidationError('板块不能以自身为父级。')
-
-    @property
-    def is_sub(self):
-        """是否为子板块"""
-        return self.parent is not None
-
-    @property
-    def is_main(self):
-        """是否为主板块（无父级）"""
-        return self.parent is None
-
-
-class Carousel(models.Model):
-    title = models.CharField("轮播标题", max_length=100)
-    image = models.ImageField("图片", upload_to='carousel/')
-    link_url = models.URLField("跳转链接", blank=True)
-    order = models.IntegerField("排序", default=0)
-    active = models.BooleanField("启用", default=True)
-
-    class Meta:
-        verbose_name = "轮播图"
-        verbose_name_plural = "轮播管理"
-
-
-class Article(models.Model):
+class Article(BaseEntity):
     title = models.CharField("标题", max_length=200)
-    section = models.ForeignKey(Section, on_delete=models.CASCADE, verbose_name="所属板块")
+    section = models.ForeignKey(MainMenu, on_delete=models.SET_NULL, null=True, blank=True, verbose_name="所属板块")
     author = models.ForeignKey(User, on_delete=models.SET_NULL, null=True, verbose_name="作者")
     content = CKEditor5Field("正文")  # 需安装 django-ckeditor
-    cover = models.ImageField("封面图", upload_to='articles/', blank=True)
+    cover = models.ImageField("封面图", upload_to='articles/%Y/%m/%d/', blank=True)
+    # 标记是否为投稿（决定是否需要审核）
+    is_contribution = models.BooleanField("是否投稿", default=False)
     is_published = models.BooleanField("已发布", default=True)
-    created_at = models.DateTimeField("创建时间", auto_now_add=True)
-    updated_at = models.DateTimeField("更新时间", auto_now=True)
 
     class Meta:
         verbose_name = "文章"
@@ -83,7 +26,38 @@ class Article(models.Model):
         return self.title
 
 
-class Notice(models.Model):
+# --- 新增：附件模型 ---
+class ArticleAttachment(BaseEntity):
+    # 关联文章：related_name='attachments' 允许我们通过 article.attachments.all() 访问
+    article = models.ForeignKey(
+        Article,
+        on_delete=models.CASCADE,
+        related_name='attachments',
+        verbose_name="所属文章"
+    )
+    file = models.FileField("附件文件", upload_to='articles/attachments/%Y/%m/%d/')
+
+    class Meta:
+        verbose_name = "文章附件"
+        verbose_name_plural = "文章附件管理"
+
+    def __str__(self):
+        return f"{self.article.title} - {self.file.name}"
+
+
+class Carousel(BaseEntity):
+    title = models.CharField("轮播标题", max_length=100)
+    image = models.ImageField("图片", upload_to='carousel/%Y/%m/%d/')
+    link_url = models.URLField("跳转链接", blank=True)
+    order = models.IntegerField("排序", default=0)
+    active = models.BooleanField("启用", default=True)
+
+    class Meta:
+        verbose_name = "轮播图"
+        verbose_name_plural = "轮播管理"
+
+
+class Notice(BaseEntity):
     title = models.CharField("通知标题", max_length=200)
     content = CKEditor5Field("通知内容")
     publisher = models.ForeignKey(User, on_delete=models.SET_NULL, null=True, verbose_name="发布人")
@@ -101,7 +75,7 @@ class Notice(models.Model):
         return self.title
 
 
-class NoticeReceipt(models.Model):
+class NoticeReceipt(BaseEntity):
     """签收记录"""
     notice = models.ForeignKey(Notice, on_delete=models.CASCADE, related_name='receipts')
     user = models.ForeignKey(User, on_delete=models.CASCADE, verbose_name="签收人")

article/seeder.py

@@ -0,0 +1,84 @@
+import os
+import random
+import sys
+import tempfile
+
+import django
+
+# 配置 Django 环境
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "server.settings")  # 修改为你的 settings 路径
+django.setup()
+
+# 2. 导入 Faker 和 模型
+
+from faker import Faker
+from article.models import Article, ArticleAttachment
+from base.models import MainMenu
+from users.models import User
+from django.core.files import File  # 引入 Django 的文件处理类
+
+fake = Faker('zh_CN')
+
+
+def seed_articles(count=20):
+    print(f"🚀 开始生成 {count} 篇文章...")
+
+    subsections = list(MainMenu.objects.filter(parent__isnull=False, visible=True))
+    users = list(User.objects.all())
+
+    if not subsections:
+        print("❌ 错误：数据库中没有找到任何子板块！")
+        return
+
+    if not users:
+        print("⚠️ 警告：数据库中没有用户，作者将设为空。")
+
+    created_count = 0
+    for i in range(count):
+        section = random.choice(subsections)
+        author = random.choice(users) if users else None
+
+        paragraphs = fake.paragraphs(nb=random.randint(3, 8))
+        content_html = "\n".join([f"<p>{p}</p>" for p in paragraphs])
+
+        article = Article.objects.create(
+            title=fake.sentence(nb_words=random.randint(5, 10))[:-1],
+            section=section,
+            author=author,
+            content=content_html,
+            is_published=True,
+        )
+
+        # --- 生成真实附件 ---
+        if random.random() < 0.3:
+            fake_filename = f"附件资料_{fake.word()}.pdf"
+
+            # 创建临时文件
+            with tempfile.NamedTemporaryFile(suffix='.pdf', delete=False) as tmp_file:
+                tmp_file.write(b'%PDF-1.4 Fake PDF Content for Testing')
+                tmp_file_path = tmp_file.name
+
+            try:
+                # 打开并保存
+                with open(tmp_file_path, 'rb') as f:
+                    # 关键点：使用 file.save 方法，这会触发文件上传机制
+                    attachment = ArticleAttachment(article=article)
+                    attachment.file.save(fake_filename, File(f), save=True)
+
+                print(f" - [{section}] {article.title} (含真实附件)")
+
+            finally:
+                # 删除临时文件
+                if os.path.exists(tmp_file_path):
+                    os.remove(tmp_file_path)
+        else:
+            print(f" - [{section}] {article.title}")
+
+        created_count += 1
+
+    print(f"✅ 成功生成 {created_count} 篇文章！")
+
+
+if __name__ == "__main__":
+    seed_articles(30)

article/views.py

@@ -13,7 +13,7 @@ router = Router(tags=['content'])
 
 
 @router.get('/article', description="获取文章列表")
-def article_list(request):
+def article_details(request):
     if not user_has_permission(request.user, 'article', 'view'):
         return HttpResponseForbidden("无权访问")
     articles = Article.objects.all()