Merge remote-tracking branch 'origin/master' into master

公共代码/校验参数数据.py

@@ -14,12 +14,16 @@ from SimilarCharactor.string_similarity import similarity_cn,similarity_en
 def check_data(category_name,path):
 
     df = pd.read_excel(path,converters = {'产品编码':str})
-    df = df.rename(columns = {'Unnamed: 0':'id'})
+    try:
+        check_col = df['Unnamed: 0']
+        df = df.rename(columns = {'Unnamed: 0':'id'})
+    except:
+        df['id'] = df.index.tolist()
     
     
-    #if '无参数，需补充' in df.values:
-    #    print("仍有参数未补充，请补充完整后再继续处理。")
-    #    return False
+    if '无参数，需补充' in df.values:
+        print("仍有参数未补充，请补充完整后再继续处理。")
+        return False
         
     #创建新产品库链接
     conn_zi_new = pymssql.connect(host='123.56.115.207', user='zgcprice3311',password='zgcprice20200628',database= 'ZI_NEW',autocommit=True)
@@ -39,8 +43,8 @@ def check_data(category_name,path):
     
     #subtitle_id_list = dict(zip(db_params['subtitle'].tolist(),db_params['subtitleid'].tolist()))
     #subtitle_type_list = dict(zip(db_params['subtitle'].tolist(),db_params['skuorspu'].tolist()))
-    params_list = df.columns.tolist()[-len(db_params['subtitle']):]
-    recover_params_list = [params[1:] for params in params_list]
+    params_list = df.columns.tolist()
+    recover_params_list = [params.replace("*","") for params in df.columns.tolist()]
     rename_dict = dict(zip(params_list,recover_params_list))
     
     df = df.rename(columns = rename_dict)
@@ -185,7 +189,7 @@ def check_data(category_name,path):
 
 
 category_name = '一体电脑'
-path = '/Users/rico/Work Space/1_Project/Company/中电中采/数据处理项目_重点类信息提取/一体电脑/一体电脑参数确认.xlsx'
+path = '/Users/rico/Work Space/1_Project/Company/中电中采/数据处理项目_重点类信息提取/一体电脑/一体电脑参数确认3.xlsx'
 
 check_data(category_name,path)