From bac49d2f723d5ae61863f4a52725c5f6025802ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E4=BC=9F?= <250213850@qq.com>
Date: Mon, 21 Mar 2022 10:05:02 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=EF=BC=8C=E5=BD=93=E6=B8=B8?=
 =?UTF-8?q?=E6=88=8F=E4=B8=BA=E9=AD=94=E6=B3=95=E9=97=A8H5=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=B8=B8=E6=88=8F=E5=8C=BA=E6=9C=8D=E4=B8=80=E8=A7=88?=
 =?UTF-8?q?=E8=A1=A8=E6=B2=A1=E6=9C=89=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/api_v1/endpoints/data_mana.py | 55 +++++++++++++++++++------------
 1 file changed, 34 insertions(+), 21 deletions(-)

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)