diff --git a/ruoyi-fastapi-backend/config/enums.py b/ruoyi-fastapi-backend/config/enums.py index 4f0b8d8..6b62ce7 100644 --- a/ruoyi-fastapi-backend/config/enums.py +++ b/ruoyi-fastapi-backend/config/enums.py @@ -14,6 +14,20 @@ class GuideWordType(Enum): STAFF = 2 CHAT = 3 +class ExplanationContentStatus(Enum): + """ + 讲解内容状态 + + NOTSTART: 未开始 + READY: 已就绪 + PLAYING: 播放中 + FINISH: 已完成 + """ + NOTSTART = '0' + READY = '1' + PLAYING = '2' + FINISH = '3' + class BusinessType(Enum): """ 业务操作类型 diff --git a/ruoyi-fastapi-backend/module_admin/controller/explanation_content_controller.py b/ruoyi-fastapi-backend/module_admin/controller/explanation_content_controller.py index 71e034a..ce94611 100644 --- a/ruoyi-fastapi-backend/module_admin/controller/explanation_content_controller.py +++ b/ruoyi-fastapi-backend/module_admin/controller/explanation_content_controller.py @@ -14,12 +14,13 @@ from utils.common_util import bytes2file_response from utils.log_util import logger from utils.page_util import PageResponseModel from utils.response_util import ResponseUtil +from config.enums import ExplanationContentStatus -explanation_contentController = APIRouter(prefix='/system/explanation_content', dependencies=[Depends(LoginService.get_current_user)]) +explanationContentController = APIRouter(prefix='/system/explanation_content', dependencies=[Depends(LoginService.get_current_user)]) -@explanation_contentController.get( +@explanationContentController.get( '/list', response_model=PageResponseModel # , dependencies=[Depends(CheckUserInterfaceAuth('system:explanation_content:list'))] ) @@ -35,7 +36,7 @@ explanation_content_page_query: Explanation_contentPageQueryModel = Depends(Expl return ResponseUtil.success(model_content=explanation_content_page_query_result) -@explanation_contentController.post('' +@explanationContentController.post('/add_explanation' # , dependencies=[Depends(CheckUserInterfaceAuth('system:explanation_content:add'))] ) @ValidateFields(validate_model='add_explanation_content') @@ -50,13 +51,15 @@ async def add_system_explanation_content( add_explanation_content.create_by = current_user.user.user_name add_explanation_content.update_time = datetime.now() add_explanation_content.update_by = current_user.user.user_name + # 新添加内容状态默认0 + add_explanation_content.status = ExplanationContentStatus.NOTSTART.value add_explanation_content_result = await Explanation_contentService.add_explanation_content_services(query_db, add_explanation_content) logger.info(add_explanation_content_result.message) return ResponseUtil.success(msg=add_explanation_content_result.message) -@explanation_contentController.put('' +@explanationContentController.put('' # , dependencies=[Depends(CheckUserInterfaceAuth('system:explanation_content:edit'))] ) @ValidateFields(validate_model='edit_explanation_content') @@ -75,7 +78,7 @@ async def edit_system_explanation_content( return ResponseUtil.success(msg=edit_explanation_content_result.message) -@explanation_contentController.delete('/{explanation_content_ids}' +@explanationContentController.delete('/{explanation_content_ids}' # , dependencies=[Depends(CheckUserInterfaceAuth('system:explanation_content:remove'))] ) @Log(title='讲解内容', business_type=BusinessType.DELETE) @@ -87,7 +90,7 @@ async def delete_system_explanation_content(request: Request, explanation_conten return ResponseUtil.success(msg=delete_explanation_content_result.message) -@explanation_contentController.get( +@explanationContentController.get( '/{explanation_content_id}', response_model=Explanation_contentModel # , dependencies=[Depends(CheckUserInterfaceAuth('system:explanation_content:query'))] ) @@ -98,7 +101,7 @@ async def query_detail_system_explanation_content(request: Request, explanation_ return ResponseUtil.success(data=explanation_content_detail_result) -# @explanation_contentController.post('/export' +# @explanationContentController.post('/export' # # , dependencies=[Depends(CheckUserInterfaceAuth('system:explanation_content:export'))] # ) # @Log(title='讲解内容', business_type=BusinessType.EXPORT) diff --git a/ruoyi-fastapi-backend/server.py b/ruoyi-fastapi-backend/server.py index 273fb25..fe2ee63 100644 --- a/ruoyi-fastapi-backend/server.py +++ b/ruoyi-fastapi-backend/server.py @@ -28,6 +28,7 @@ from module_admin.controller.info_controller import infoController from module_generator.controller.gen_controller import genController from module_admin.controller.message_controller import messageController from module_admin.controller.robot_role_pairing_controller import pairingController +from module_admin.controller.explanation_content_controller import explanationContentController from sub_applications.handle import handle_sub_applications from utils.common_util import worship @@ -90,6 +91,7 @@ controller_list = [ {'router': infoController, 'tage':['机器人信息管理']}, {'router': messageController, 'tags': ['消息管理']}, {'router': pairingController, 'tags': ['机器人角色']}, + {'router': explanationContentController, 'tags': ['讲解管理']}, ]