From 6c7ebc5525d745ff8edf533353d97d2ab914003a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=80=9D=E5=B7=9D?= Date: Sun, 20 Nov 2022 23:20:27 +0800 Subject: [PATCH] changes --- AppIndicators/Router.py | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/AppIndicators/Router.py b/AppIndicators/Router.py index 99f8d3d..24ea813 100644 --- a/AppIndicators/Router.py +++ b/AppIndicators/Router.py @@ -15,7 +15,7 @@ router = APIRouter( # 新建指标 @router.post("/create", summary='新建指标', tags=["指标"], response_model=Schemas.CreateIndicatorResBody) -def func01(schema: Schemas.CreateIndicatorReqBody, db: Session = Depends(get_db)): +def func(schema: Schemas.CreateIndicatorReqBody, db: Session = Depends(get_db)): index_obj = Crud.get_indicator_by_ename(db, ename=schema.ename) if index_obj: raise HTTPException(status_code=202, detail="Indicator Already Registered") @@ -35,7 +35,7 @@ def func01(schema: Schemas.CreateIndicatorReqBody, db: Session = Depends(get_db) # 删除指标 @router.post("/delete/{iid}", summary='删除指标', tags=["指标"]) -def func02(iid: str, db: Session = Depends(get_db)): +def func(iid: str, db: Session = Depends(get_db)): index_obj = Crud.get_indicator_by_iid(db=db, iid=iid) if not index_obj: raise HTTPException(status_code=404, detail="Indicator Not Existed") @@ -47,7 +47,7 @@ def func02(iid: str, db: Session = Depends(get_db)): # 编辑指标 @router.post("/edit/{iid}", summary='编辑指标', tags=["指标"]) -def func03(iid: str, schema: Schemas.EditIndicatorReqBody, db: Session = Depends(get_db)): +def func(iid: str, schema: Schemas.EditIndicatorReqBody, db: Session = Depends(get_db)): index_obj = Crud.get_indicator_by_iid(db=db, iid=iid) if not index_obj: raise HTTPException(status_code=404, detail="Indicator Not Found") @@ -63,7 +63,7 @@ def func03(iid: str, schema: Schemas.EditIndicatorReqBody, db: Session = Depends # 查看指标 @router.get("/view/{iid}", summary='查看指标', tags=["指标"], response_model=Schemas.ViewIndicatorResBody) -def func04(iid: str, db: Session = Depends(get_db)): +def func(iid: str, db: Session = Depends(get_db)): index_obj = Crud.get_indicator_by_iid(db, iid=iid) if index_obj is None: raise HTTPException(status_code=404, detail="Indicator Not Found") @@ -71,9 +71,18 @@ def func04(iid: str, db: Session = Depends(get_db)): return index_obj.to_dict() +@router.get("/view/{ename}", summary='查看指标', tags=["指标"]) +def func(ename: str, db: Session = Depends(get_db)): + index_obj = Crud.get_indicator_by_ename(db, ename=ename) + if index_obj is None: + raise HTTPException(status_code=404, detail="Indicator Not Found") + + return {"id": index_obj.ename, "name": index_obj.cname} + + # 查询指标描述 @router.post("/describe/{iid}", summary='查看指标描述', tags=["指标"], response_model=Schemas.IndicatorDescribeResBody) -def func05(iid: str, db: Session = Depends(get_db)): +def func(iid: str, db: Session = Depends(get_db)): index_obj = Crud.get_indicator_by_iid(db, iid=iid) if not index_obj: raise HTTPException(status_code=404, detail="Indicator Not Found") @@ -83,14 +92,14 @@ def func05(iid: str, db: Session = Depends(get_db)): # 查询指标 @router.post("/search", summary='查询指标', tags=["指标"], response_model=Schemas.SearchIndicatorResBody) -def func06(schema: Schemas.SearchIndicatorReqBody, db: Session = Depends(get_db)): +def func(schema: Schemas.SearchIndicatorReqBody, db: Session = Depends(get_db)): indicators, total = Crud.search_indicators(db, schema=schema) items = [Schemas.ViewIndicatorResBody(**indicator.to_dict()).dict() for indicator in indicators] return {"items": items, "total": total} @router.post("/register", summary='注册指标', tags=["指标"]) -def func07(schema: Schemas.RegisterIndicatorReqBody, db: Session = Depends(get_db)): +def func(schema: Schemas.RegisterIndicatorReqBody, db: Session = Depends(get_db)): index_obj = Crud.get_indicator_by_ename(db, ename=schema.ename) if index_obj: raise HTTPException(status_code=202, detail="Indicator Already Registered") @@ -115,7 +124,7 @@ def func07(schema: Schemas.RegisterIndicatorReqBody, db: Session = Depends(get_d # 新建参数 @router.post("/param/create/{iid}", summary='新建参数', tags=["指标参数"]) -def func08(iid: str, body: Schemas.EditParamReqBody, db: Session = Depends(get_db)): +def func(iid: str, body: Schemas.EditParamReqBody, db: Session = Depends(get_db)): index_obj = Crud.get_indicator_by_iid(db=db, iid=iid) if not index_obj: raise HTTPException(status_code=404, detail="Indicator Not Found") @@ -126,7 +135,7 @@ def func08(iid: str, body: Schemas.EditParamReqBody, db: Session = Depends(get_d @router.post("/param/edit/{pid}", summary='编辑参数', tags=["指标参数"]) -def func09(pid: str, schema: Schemas.EditParamReqBody, db: Session = Depends(get_db)): +def func(pid: str, schema: Schemas.EditParamReqBody, db: Session = Depends(get_db)): data = Crud.get_parameter_by_pid(db=db, pid=pid) if not data: raise HTTPException(status_code=404, detail="Parameter Not Existed") @@ -138,7 +147,7 @@ def func09(pid: str, schema: Schemas.EditParamReqBody, db: Session = Depends(get # 删除参数 @router.post("/param/delete/{pid}", summary='删除参数', tags=["指标参数"]) -def func10(pid: str, db: Session = Depends(get_db)): +def func(pid: str, db: Session = Depends(get_db)): data = Crud.get_parameter_by_pid(db=db, pid=pid) if not data: raise HTTPException(status_code=404, detail="Parameter Not Existed") @@ -149,7 +158,7 @@ def func10(pid: str, db: Session = Depends(get_db)): @router.post("/category/create", summary="新建分类", tags=["指标分类"]) -def func11(schema: Schemas.CreateCategoryReqBody, db: Session = Depends(get_db)): +def func(schema: Schemas.CreateCategoryReqBody, db: Session = Depends(get_db)): data = Crud.get_category_by_name(db=db, title=schema.title) if data: raise HTTPException(status_code=202, detail="Category Already Existed") @@ -160,7 +169,7 @@ def func11(schema: Schemas.CreateCategoryReqBody, db: Session = Depends(get_db)) @router.post("/category/delete", summary="删除分类", tags=["指标分类"]) -def func12(schema: Schemas.DeleteCategoryReqBody, db: Session = Depends(get_db)): +def func(schema: Schemas.DeleteCategoryReqBody, db: Session = Depends(get_db)): data = Crud.get_category_by_id(db=db, category_id=schema.category_id) if not data: raise HTTPException(status_code=404, detail="Category Not Found") @@ -174,6 +183,6 @@ def func12(schema: Schemas.DeleteCategoryReqBody, db: Session = Depends(get_db)) @router.post("/category/list", summary="分类列表", tags=["指标分类"]) -def func13(db: Session = Depends(get_db)): +def func(db: Session = Depends(get_db)): category_objs = Crud.list_category(db=db) return [obj.to_kv() for obj in category_objs]