mirror of
https://github.com/insistence/RuoYi-Vue3-FastAPI.git
synced 2026-09-28 06:57:55 +00:00
* perf: 优化代码 * perf: 优化字典类型属性提醒说明 * perf: 优化顶部导航更多菜单路由截取 * perf: 优化RightToolbar搜索栏切换动画 * perf: 优化操作日志详细页面 * feat: 新增锁定屏幕功能 * feat: 字典类型列表新增抽屉效果详细信息 * perf: 优化页签功能&支持全屏按钮操作 * perf: 优化tag全屏为页签内区域 * perf: 菜单搜索支持文本高亮&数量提示 * feat: 添加持久化标签页开关功能 * perf: 优化页签显示 * perf: 优化菜单主题风格 * perf: 黑暗模式下全屏不需要设置背景 * perf: 暗黑浅色主题优化 * perf: 优化快速点击页签刷新出现404问题 * feat: 支持表格列显隐状态记忆 * feat: 代码生成支持表单布局选项 * feat: 新增树分割组件TreePanel * feat: 新增Excel导入组件ExcelImportDialog * perf: 优化样式 * feat: 用户列表新增抽屉效果详细信息 * perf: 代码生成修改拖拽时显示手指样式 * perf: 优化登录页暗黑模式下样式 * feat: 新增标签页样式chrome风格 * perf: 优化白名单支持对通配符路径匹配 * feat: 新增菜单路由地址和名称的校验规则 * feat: 首页新增通知公告消息提醒 * perf&feat: 优化定时任务详情页展示&补充执行时间字段 * feat: 部门管理支持批量保存排序 * feat: 菜单管理支持批量保存排序 * perf: 优化点击任务名称查看详细 * feat: 菜单管理列表新增类型显示 * feat: 新增代码生成详情页功能 * perf: 优化样式 * feat: 通知公告新增详细显示 * feat: 通知公告新增阅读用户列表 * perf: 更换router4过期方法next * perf: 优化暗黑模式下主题样式 * perf: 优化暗黑模式详情样式 * feat: 用户密码支持自定义配置规则 * fix: 修复E2E测试失败的问题
216 lines
8.3 KiB
Python
216 lines
8.3 KiB
Python
from datetime import datetime
|
|
from typing import Annotated
|
|
|
|
from fastapi import Path, Query, Request, Response
|
|
from pydantic_validation_decorator import ValidateFields
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from common.annotation.cache_annotation import ApiCache, ApiCacheEvict
|
|
from common.annotation.log_annotation import Log
|
|
from common.aspect.db_seesion import DBSessionDependency
|
|
from common.aspect.interface_auth import UserInterfaceAuthDependency
|
|
from common.aspect.pre_auth import CurrentUserDependency, PreAuthDependency
|
|
from common.constant import ApiGroup, ApiNamespace
|
|
from common.enums import BusinessType
|
|
from common.router import APIRouterPro
|
|
from common.vo import DataResponseModel, DynamicResponseModel, PageResponseModel, ResponseBaseModel
|
|
from module_admin.entity.vo.notice_vo import (
|
|
DeleteNoticeModel,
|
|
NoticeModel,
|
|
NoticePageQueryModel,
|
|
NoticeReadUserModel,
|
|
NoticeReadUserPageQueryModel,
|
|
NoticeTopResponseModel,
|
|
)
|
|
from module_admin.entity.vo.user_vo import CurrentUserModel
|
|
from module_admin.service.notice_service import NoticeService
|
|
from utils.log_util import logger
|
|
from utils.response_util import ResponseUtil
|
|
|
|
notice_controller = APIRouterPro(
|
|
prefix='/system/notice', order_num=10, tags=['系统管理-通知公告管理'], dependencies=[PreAuthDependency()]
|
|
)
|
|
|
|
|
|
@notice_controller.get(
|
|
'/list',
|
|
summary='获取通知公告分页列表接口',
|
|
description='用于获取通知公告分页列表',
|
|
response_model=PageResponseModel[NoticeModel],
|
|
dependencies=[UserInterfaceAuthDependency('system:notice:list')],
|
|
)
|
|
@ApiCache(namespace=ApiNamespace.SYSTEM_NOTICE_LIST)
|
|
async def get_system_notice_list(
|
|
request: Request,
|
|
notice_page_query: Annotated[NoticePageQueryModel, Query()],
|
|
query_db: Annotated[AsyncSession, DBSessionDependency()],
|
|
) -> Response:
|
|
# 获取分页数据
|
|
notice_page_query_result = await NoticeService.get_notice_list_services(query_db, notice_page_query, is_page=True)
|
|
logger.info('获取成功')
|
|
|
|
return ResponseUtil.success(model_content=notice_page_query_result)
|
|
|
|
|
|
@notice_controller.get(
|
|
'/listTop',
|
|
summary='获取首页顶部通知公告接口',
|
|
description='用于获取最新的正常通知公告及当前用户已读状态',
|
|
response_model=DynamicResponseModel[NoticeTopResponseModel],
|
|
)
|
|
async def get_system_notice_top(
|
|
request: Request,
|
|
query_db: Annotated[AsyncSession, DBSessionDependency()],
|
|
current_user: Annotated[CurrentUserModel, CurrentUserDependency()],
|
|
) -> Response:
|
|
notice_top_result = await NoticeService.get_notice_top_services(query_db, current_user.user.user_id)
|
|
logger.info('获取成功')
|
|
|
|
return ResponseUtil.success(model_content=notice_top_result)
|
|
|
|
|
|
@notice_controller.post(
|
|
'/markRead',
|
|
summary='标记通知公告已读接口',
|
|
description='用于将指定通知公告标记为当前用户已读',
|
|
response_model=ResponseBaseModel,
|
|
)
|
|
async def mark_system_notice_read(
|
|
request: Request,
|
|
notice_id: Annotated[int, Query(alias='noticeId', description='公告ID')],
|
|
query_db: Annotated[AsyncSession, DBSessionDependency()],
|
|
current_user: Annotated[CurrentUserModel, CurrentUserDependency()],
|
|
) -> Response:
|
|
mark_read_result = await NoticeService.mark_notice_read_services(query_db, current_user.user.user_id, [notice_id])
|
|
logger.info(mark_read_result.message)
|
|
|
|
return ResponseUtil.success(msg=mark_read_result.message)
|
|
|
|
|
|
@notice_controller.get(
|
|
'/readUsers/list',
|
|
summary='获取公告已读用户分页列表接口',
|
|
description='用于获取已阅读指定公告的用户列表',
|
|
response_model=PageResponseModel[NoticeReadUserModel],
|
|
dependencies=[UserInterfaceAuthDependency('system:notice:list')],
|
|
)
|
|
async def get_system_notice_read_user_list(
|
|
request: Request,
|
|
read_user_page_query: Annotated[NoticeReadUserPageQueryModel, Query()],
|
|
query_db: Annotated[AsyncSession, DBSessionDependency()],
|
|
) -> Response:
|
|
read_user_page_query_result = await NoticeService.get_notice_read_user_list_services(
|
|
query_db, read_user_page_query, is_page=True
|
|
)
|
|
logger.info('公告已读用户获取成功')
|
|
|
|
return ResponseUtil.success(model_content=read_user_page_query_result)
|
|
|
|
|
|
@notice_controller.post(
|
|
'/markReadAll',
|
|
summary='批量标记通知公告已读接口',
|
|
description='用于将指定通知公告批量标记为当前用户已读',
|
|
response_model=ResponseBaseModel,
|
|
)
|
|
async def mark_all_system_notice_read(
|
|
request: Request,
|
|
ids: Annotated[str, Query(description='逗号分隔的公告ID')],
|
|
query_db: Annotated[AsyncSession, DBSessionDependency()],
|
|
current_user: Annotated[CurrentUserModel, CurrentUserDependency()],
|
|
) -> Response:
|
|
notice_ids = NoticeService.parse_notice_ids(ids)
|
|
mark_read_result = await NoticeService.mark_notice_read_services(query_db, current_user.user.user_id, notice_ids)
|
|
logger.info(mark_read_result.message)
|
|
|
|
return ResponseUtil.success(msg=mark_read_result.message)
|
|
|
|
|
|
@notice_controller.post(
|
|
'',
|
|
summary='新增通知公告接口',
|
|
description='用于新增通知公告',
|
|
response_model=ResponseBaseModel,
|
|
dependencies=[UserInterfaceAuthDependency('system:notice:add')],
|
|
)
|
|
@ValidateFields(validate_model='add_notice')
|
|
@ApiCacheEvict(namespaces=ApiGroup.NOTICE_MUTATION)
|
|
@Log(title='通知公告', business_type=BusinessType.INSERT)
|
|
async def add_system_notice(
|
|
request: Request,
|
|
add_notice: NoticeModel,
|
|
query_db: Annotated[AsyncSession, DBSessionDependency()],
|
|
current_user: Annotated[CurrentUserModel, CurrentUserDependency()],
|
|
) -> Response:
|
|
add_notice.create_by = current_user.user.user_name
|
|
add_notice.create_time = datetime.now()
|
|
add_notice.update_by = current_user.user.user_name
|
|
add_notice.update_time = datetime.now()
|
|
add_notice_result = await NoticeService.add_notice_services(query_db, add_notice)
|
|
logger.info(add_notice_result.message)
|
|
|
|
return ResponseUtil.success(msg=add_notice_result.message)
|
|
|
|
|
|
@notice_controller.put(
|
|
'',
|
|
summary='编辑通知公告接口',
|
|
description='用于编辑通知公告',
|
|
response_model=ResponseBaseModel,
|
|
dependencies=[UserInterfaceAuthDependency('system:notice:edit')],
|
|
)
|
|
@ValidateFields(validate_model='edit_notice')
|
|
@ApiCacheEvict(namespaces=ApiGroup.NOTICE_MUTATION)
|
|
@Log(title='通知公告', business_type=BusinessType.UPDATE)
|
|
async def edit_system_notice(
|
|
request: Request,
|
|
edit_notice: NoticeModel,
|
|
query_db: Annotated[AsyncSession, DBSessionDependency()],
|
|
current_user: Annotated[CurrentUserModel, CurrentUserDependency()],
|
|
) -> Response:
|
|
edit_notice.update_by = current_user.user.user_name
|
|
edit_notice.update_time = datetime.now()
|
|
edit_notice_result = await NoticeService.edit_notice_services(query_db, edit_notice)
|
|
logger.info(edit_notice_result.message)
|
|
|
|
return ResponseUtil.success(msg=edit_notice_result.message)
|
|
|
|
|
|
@notice_controller.delete(
|
|
'/{notice_ids}',
|
|
summary='删除通知公告接口',
|
|
description='用于删除通知公告',
|
|
response_model=ResponseBaseModel,
|
|
dependencies=[UserInterfaceAuthDependency('system:notice:remove')],
|
|
)
|
|
@ApiCacheEvict(namespaces=ApiGroup.NOTICE_MUTATION)
|
|
@Log(title='通知公告', business_type=BusinessType.DELETE)
|
|
async def delete_system_notice(
|
|
request: Request,
|
|
notice_ids: Annotated[str, Path(description='需要删除的公告ID')],
|
|
query_db: Annotated[AsyncSession, DBSessionDependency()],
|
|
) -> Response:
|
|
delete_notice = DeleteNoticeModel(noticeIds=notice_ids)
|
|
delete_notice_result = await NoticeService.delete_notice_services(query_db, delete_notice)
|
|
logger.info(delete_notice_result.message)
|
|
|
|
return ResponseUtil.success(msg=delete_notice_result.message)
|
|
|
|
|
|
@notice_controller.get(
|
|
'/{notice_id}',
|
|
summary='获取通知公告详情接口',
|
|
description='用于获取指定通知公告的详细信息',
|
|
response_model=DataResponseModel[NoticeModel],
|
|
)
|
|
@ApiCache(namespace=ApiNamespace.SYSTEM_NOTICE_DETAIL)
|
|
async def query_detail_system_post(
|
|
request: Request,
|
|
notice_id: Annotated[int, Path(description='公告ID')],
|
|
query_db: Annotated[AsyncSession, DBSessionDependency()],
|
|
) -> Response:
|
|
notice_detail_result = await NoticeService.notice_detail_services(query_db, notice_id)
|
|
logger.info(f'获取notice_id为{notice_id}的信息成功')
|
|
|
|
return ResponseUtil.success(data=notice_detail_result)
|