From b8ce7038aa375b870bb5b8c5bcd35cba400d138c Mon Sep 17 00:00:00 2001 From: haotian <2421912570@qq.com> Date: Mon, 28 Jul 2025 15:45:55 +0800 Subject: [PATCH] =?UTF-8?q?1.guide=5Fwords=E8=A1=A8=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=96=B0=E5=AD=97=E6=AE=B5update=5Fby\n2.=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=95=E5=AF=BC=E8=AF=8D=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E7=B1=BB\n3.=E5=AE=9E=E7=8E=B0=E4=BF=AE=E6=94=B9=E5=BC=95?= =?UTF-8?q?=E5=AF=BC=E8=AF=8D=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-fastapi-backend/.env.dev | 2 +- .../module_admin/controller/words_controller.py | 10 +++++++--- .../module_admin/entity/do/words_do.py | 1 + .../module_admin/entity/vo/words_vo.py | 12 ++++++++++++ 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/ruoyi-fastapi-backend/.env.dev b/ruoyi-fastapi-backend/.env.dev index ad3f913..d466ca5 100644 --- a/ruoyi-fastapi-backend/.env.dev +++ b/ruoyi-fastapi-backend/.env.dev @@ -12,7 +12,7 @@ APP_PORT = 9099 # 应用版本 APP_VERSION= '1.6.2' # 应用是否开启热重载 -APP_RELOAD = false +APP_RELOAD = true # 应用是否开启IP归属区域查询 APP_IP_LOCATION_QUERY = true # 应用是否允许账号同时登录 diff --git a/ruoyi-fastapi-backend/module_admin/controller/words_controller.py b/ruoyi-fastapi-backend/module_admin/controller/words_controller.py index b7205bf..9834fc3 100644 --- a/ruoyi-fastapi-backend/module_admin/controller/words_controller.py +++ b/ruoyi-fastapi-backend/module_admin/controller/words_controller.py @@ -9,7 +9,7 @@ from module_admin.aspect.interface_auth import CheckUserInterfaceAuth from module_admin.entity.vo.user_vo import CurrentUserModel from module_admin.service.login_service import LoginService from module_admin.service.words_service import WordsService -from module_admin.entity.vo.words_vo import DeleteWordsModel, WordsModel, WordsPageQueryModel +from module_admin.entity.vo.words_vo import DeleteWordsModel, WordsModel, WordsPageQueryModel, WordsUpdateModel from utils.common_util import bytes2file_response from utils.log_util import logger from utils.page_util import PageResponseModel @@ -61,15 +61,19 @@ async def add_guide_words( return ResponseUtil.success(msg=add_words_result.message) -@wordsController.put('', dependencies=[Depends(CheckUserInterfaceAuth('guide:words:edit'))]) +@wordsController.put('/edit_guide' + # ,dependencies=[Depends(CheckUserInterfaceAuth('guide:words:edit'))] + ) @ValidateFields(validate_model='edit_words') @Log(title='引导词', business_type=BusinessType.UPDATE) async def edit_guide_words( request: Request, - edit_words: WordsModel, + edit_words: WordsUpdateModel, query_db: AsyncSession = Depends(get_db), current_user: CurrentUserModel = Depends(LoginService.get_current_user), ): + print("修改id", edit_words.guide_id) + print("修改id", edit_words.text) edit_words.update_by = current_user.user.user_name edit_words.update_time = datetime.now() edit_words_result = await WordsService.edit_words_services(query_db, edit_words) diff --git a/ruoyi-fastapi-backend/module_admin/entity/do/words_do.py b/ruoyi-fastapi-backend/module_admin/entity/do/words_do.py index 12a680f..42806f3 100644 --- a/ruoyi-fastapi-backend/module_admin/entity/do/words_do.py +++ b/ruoyi-fastapi-backend/module_admin/entity/do/words_do.py @@ -17,6 +17,7 @@ class GuideWords(Base): create_by = Column(String(64), nullable=True, comment='创建者') remark = Column(String(500), nullable=True, comment='备注') del_flag = Column(CHAR(1), nullable=False, comment='删除标志（0代表存在 2代表删除）') + update_by = Column(String(64), nullable=True, comment='修改者') diff --git a/ruoyi-fastapi-backend/module_admin/entity/vo/words_vo.py b/ruoyi-fastapi-backend/module_admin/entity/vo/words_vo.py index f5ff68a..645cb3e 100644 --- a/ruoyi-fastapi-backend/module_admin/entity/vo/words_vo.py +++ b/ruoyi-fastapi-backend/module_admin/entity/vo/words_vo.py @@ -22,6 +22,7 @@ class WordsModel(BaseModel): create_by: Optional[str] = Field(default=None, description='创建者') remark: Optional[str] = Field(default=None, description='备注') del_flag: Optional[str] = Field(default=None, description='删除标志（0代表存在 2代表删除）') + update_by : Optional[str] = Field(default=None, description='修改者') @@ -33,7 +34,18 @@ class WordsModel(BaseModel): def validate_fields(self): self.get_del_flag() +class WordsUpdateModel(WordsModel): + """ + 引导词更新模型 + """ + model_config = ConfigDict(alias_generator=to_camel, from_attributes=True) + guide_id: int = Field(description='引导词id') + text: str = Field(default=None, description='文本内容') + type: Optional[str] = Field(default=None, description='引导词类型') + remark : Optional[str] = Field(default=None, description='备注') + update_time: Optional[datetime] = Field(default=None, description='修改时间') + update_by : Optional[str] = Field(default=None, description='修改者') class WordsQueryModel(WordsModel):