查询分页修改

dbgpt/app/apps/vadmin/word/params/sensitive.py

@@ -21,6 +21,8 @@ class SensitiveParams(QueryParams):
     def __init__(
             self,
             word_name: str | None = Query(None, title="词条"),
+            params: Paging = Depends()
     ):
+        super().__init__(params)
         self.word_name = ("like", word_name)
 

dbgpt/app/apps/vadmin/word/params/similar.py

@@ -22,7 +22,9 @@ class SimilarParams(QueryParams):
             self,
             word_name: str | None = Query(None, title="词条"),
             similar_name: str | None = Query(None, title="近义词"),
+            params: Paging = Depends()
     ):
+        super().__init__(params)
         self.word_name = ("like", word_name)
         self.similar_name = ("like", similar_name)
 

dbgpt/app/apps/vadmin/word/schemas/sensitive.py

@@ -18,6 +18,12 @@ class SensitiveSchemas(BaseModel):
     update_datetime: datetime | None = None
     delete_datetime: datetime | None = None
 
+class SensitiveInDic(SensitiveSchemas):
+    model_config = ConfigDict(from_attributes=True)
+    """
+    创建近义词
+    """
+    word_name: str | None = ""
 
 class SensitiveIn(SensitiveSchemas):
     """

dbgpt/app/apps/vadmin/word/schemas/similar.py

@@ -19,6 +19,13 @@ class SimilarSchemas(BaseModel):
     update_datetime: datetime | None = None
     delete_datetime: datetime | None = None
 
+class SimilarInDic(SimilarSchemas):
+    model_config = ConfigDict(from_attributes=True)
+    """
+    创建近义词
+    """
+    word_name: str
+    similar_name: str | None = ""
 
 class SimilarIn(SimilarSchemas):
     """

dbgpt/app/apps/vadmin/word/views.py

@@ -11,6 +11,7 @@ from dbgpt.app.apps.vadmin.word.models.similar import VadminWordSimilar
 from dbgpt.app.apps.vadmin.word.params.similar import SimilarParams
 from dbgpt.app.apps.vadmin.word.schemas.similar import SimilarSchemas, SimilarIn,SimilarUpdate
 from dbgpt.app.apps.vadmin.word.schemas.sensitive import SensitiveSchemas, SensitiveIn,SensitiveUpdate
+from dbgpt.app.apps.vadmin.word.params.sensitive import SensitiveParams
 from dbgpt.app.apps.vadmin.word import crud
 from fastapi.encoders import jsonable_encoder
 
@@ -20,6 +21,20 @@ router = APIRouter()
 ###########################################################
 #    同义词管理
 ###########################################################
+@router.get("/get_test", summary="获取测试列表")
+async def get_test(para: SimilarParams = Depends(), auth: Auth = Depends(OpenAuth())):
+    #datas = await crud.SimilarDal(auth.db).get_data(para)
+    #model = models.similar.VadminWordSimilar #不需要关联查询
+
+    #v_schema = schemas.similar.SimilarSchemas
+    v_schema = schemas.similar.SimilarInDic
+    datas, count = await crud.SimilarDal(auth.db).get_datas(
+        **para.dict(),
+        v_schema=v_schema,
+        v_return_count=True
+    )
+    return SuccessResponse(datas, count=count)
+
 @router.get("/get_similars", summary="获取同义词列表")
 async def get_similars(auth: Auth = Depends(OpenAuth())):
     model = VadminWordSimilar
@@ -115,6 +130,7 @@ async def create_sensitive(req: Request, auth: Auth = Depends(OpenAuth())):
 
     return SuccessResponse("请求成功!")
 
+"""
 @router.get("/get_sensitives", summary="获取敏感词列表")
 async def get_sensitives(auth: Auth = Depends(OpenAuth())):
 
@@ -124,6 +140,17 @@ async def get_sensitives(auth: Auth = Depends(OpenAuth())):
     for row in datas:
         print(f"编号：{row.id} 词条：{row.word_name} ")
     return SuccessResponse(jsondatas, count=1)
+"""
+
+@router.get("/get_sensitives", summary="获取敏感词列表")
+async def get_sensitives(para: SensitiveParams = Depends(), auth: Auth = Depends(OpenAuth())):
+    v_schema = schemas.sensitive.SensitiveInDic
+    datas, count = await crud.SensitiveDal(auth.db).get_datas(
+        **para.dict(),
+        v_schema=v_schema,
+        v_return_count=True
+    )
+    return SuccessResponse(datas, count=count)
 
 @router.post("/update_sensitive_byid", summary="根据id修改敏感词")
 async def update_sensitive_byid(data: Request, auth: Auth = Depends(OpenAuth())):