mdbq 2.1.7__tar.gz → 2.1.9__tar.gz

{mdbq-2.1.7 → mdbq-2.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mdbq
-Version: 2.1.7
+Version: 2.1.9
 Home-page: https://pypi.org/project/mdbsql
 Author: xigua, 
 Author-email: 2587125111@qq.com

{mdbq-2.1.7 → mdbq-2.1.9}/mdbq/aggregation/query_data.py

@@ -557,11 +557,14 @@ class MysqlDatasQuery:
 
         df_tb = self.download.data_to_df(
             db_name='推广数据_淘宝店',
-            table_name='账户报表',
+            table_name='营销场景报表',
             start_date=start_date,
             end_date=end_date,
             projection=projection,
         )
+        # print(df_tb)
+        # df_tm.to_csv('/Users/xigua/Downloads/test2.csv', index=False, header=True, encoding='utf-8_sig')
+        # df_tb.to_csv('/Users/xigua/Downloads/test.csv', index=False, header=True, encoding='utf-8_sig')
         df_tb.rename(columns={'场景名字': '营销场景'}, inplace=True)
         df_tb = df_tb.groupby(
             ['日期', '营销场景', '花费'],

{mdbq-2.1.7 → mdbq-2.1.9}/mdbq/company/copysh.py

@@ -252,16 +252,23 @@ class TbFiles:
             else:
                 print(f'{src} 所需同步的文件不存在，请检查：pd_list参数')
 
+        # 刷新共享位置的指定文件/文件夹
         excel_path = os.path.join(self.share_path, 'EXCEL报表')
         files = os.listdir(excel_path)
         r = refresh_all.RefreshAll()
         for file in files:
+            if '~' in file or 'DS_Store' in file or 'baidu' in file or 'xunlei' in name:
+                continue
             if file.endswith('.xlsx'):
                 # now = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
                 # print(f'{now}正在刷新 excel: {file}')
                 r.refresh_excel2(excel_file=os.path.join(excel_path, file))
             time.sleep(10)
 
+        # 临时加的
+        excel_file = f'\\\\192.168.1.198\\时尚事业部\\01.运营部\\0-电商周报-每周五更新\\WLM 周报-模版V1.xlsx'
+        r.refresh_excel2(excel_file=excel_file)
+
         self.before_max_time = self.check_change()  # 重置值, 避免重复同步
 
         now = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
@@ -399,4 +406,3 @@ if __name__ == '__main__':
     main()
     # # 聚合数据，并清理聚合数据
     # query_data.data_aggregation(service_databases=[{'company': 'mysql'}], months=1)
-

{mdbq-2.1.7 → mdbq-2.1.9}/mdbq/mysql/s_query.py

@@ -79,6 +79,7 @@ class QueryDatas:
                 else:  # 没有指定获取列，且数据表也没有日期列，则返回全部列的全部数据
                     all_col = ', '.join([f"`{item}`" for item in cols_exist if item != 'id'])
                     sql = f"SELECT %s FROM `%s`.`%s`" % (all_col, db_name, table_name)
+            # print(sql)
             cursor.execute(sql)
             rows = cursor.fetchall()  # 获取查询结果
             columns = [desc[0] for desc in cursor.description]

{mdbq-2.1.7 → mdbq-2.1.9}/mdbq.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mdbq
-Version: 2.1.7
+Version: 2.1.9
 Home-page: https://pypi.org/project/mdbsql
 Author: xigua, 
 Author-email: 2587125111@qq.com

{mdbq-2.1.7 → mdbq-2.1.9}/setup.py

@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 
 setup(name='mdbq',
-      version='2.1.7',
+      version='2.1.9',
       author='xigua, ',
       author_email="2587125111@qq.com",
       url='https://pypi.org/project/mdbsql',