diff --git a/api/api_v1/endpoints/data_mana.py b/api/api_v1/endpoints/data_mana.py index f3f8334..3f127e8 100644 --- a/api/api_v1/endpoints/data_mana.py +++ b/api/api_v1/endpoints/data_mana.py @@ -63,7 +63,7 @@ async def edit_data_attr( return schemas.Msg(code=0, msg='ok', data=data_in) -# + # @router.post("/add_select_map") # async def add_map( # request: Request, @@ -88,26 +88,36 @@ async def edit_data_attr( # await crud.select_map.save(db, data_in) # return schemas.Msg(code=0, msg='ok', data=data_in) - -@router.post("/add_select_map") -async def add_select_map( - request: Request, - game: str, - file: bytes = File(...), - db: AsyncIOMotorDatabase = Depends(get_database), - current_user: schemas.UserDB = Depends(deps.get_current_user) -) -> schemas.Msg: - """添加属性值选择映射""" - dfs = pd.read_excel(file, engine='openpyxl', sheet_name=None) - for attr_name, df in dfs.items(): - #将id这列转换成字符串类型 - if len(df) >0: - df['id'] = df['id'].astype(str) - map_ = df.to_dict('records') - data_in = schemas.SelectMap(game=game, attr_name=attr_name, map_=map_) - await crud.select_map.save(db, data_in) - return schemas.Msg(code=0, msg='ok', data=1) - +#在gametoos同步区服了,所以不需要这段代码 +# @router.post("/add_select_map") +# async def add_select_map( +# game: str, +# url: str, +# #file: bytes = File(...), +# db: AsyncIOMotorDatabase = Depends(get_database), +# current_user: schemas.UserDB = Depends(deps.get_current_user) +# ) -> schemas.Msg: +# """添加游戏区服信息选择映射""" + # dfs = pd.read_excel(file, engine='openpyxl', sheet_name=None) + # for attr_name, df in dfs.items(): + # #将id这列转换成字符串类型 + # if len(df) >0: + # df['id'] = df['id'].astype(str) + # map_ = df.to_dict('records') + # data_in = schemas.SelectMap(game=game, attr_name=attr_name, map_=map_) + # await crud.select_map.save(db, data_in) + # return schemas.Msg(code=0, msg='ok', data=1) + # response = requests.get(url) + # data = json.loads(response.text) + # attr_name = 'svrindex' + # map_list = [] + # for k, v in data.items(): + # map_dict = {} + # map_dict[k] = v['servername'] + # map_list.append(map_dict) + # data_in = schemas.SelectMap(game=game, attr_name=attr_name, map_=map_list) + # await crud.select_map.save(db, data_in) + # return schemas.Msg(code=0, msg='ok', data=1) @router.get("/select_list") async def select_list( @@ -117,6 +127,9 @@ async def select_list( current_user: schemas.UserDB = Depends(deps.get_current_user) ) -> schemas.Msg: """属性值选择映射列表""" + #当游戏为魔法门H5时,把game的值改为数据库中对应的值(mdb中的值和ck中的值是不一样的) + if game == 'mfmh5': + game='mzmfmh5' resp = await crud.select_map.get_list(db, game) return schemas.Msg(code=0, msg='ok', data=resp)