mdbq 1.2.0__py3-none-any.whl → 1.2.2__py3-none-any.whl

mdbq/aggregation/aggregation.py

@@ -939,8 +939,13 @@ def file_dir(one_file=True):
     one_file: 值为 True 时每个文件夹取一个文件上传数据库，反之上传所有文件夹数据
     """
     filename = '文件目录对照表.csv'
-    path = set_support.SetSupport(dirname='support').dirname  # 根据平台自动适配 support 路径
-    df = pd.read_csv(os.path.join(path, filename), encoding='utf-8_sig', header=0, na_filter=False)
+    if platform.system() == 'Windows':
+        path = 'C:\\同步空间\\BaiduSyncdisk\\原始文件2'
+    else:
+        path = '/Users/xigua/数据中心/原始文件2'
+
+    support_file = set_support.SetSupport(dirname='support').dirname
+    df = pd.read_csv(os.path.join(support_file, filename), encoding='utf-8_sig', header=0, na_filter=False)
     datas = df.to_dict('records')  # 转字典
     for data in datas:
         # print(data)
@@ -973,7 +978,7 @@ def file_dir(one_file=True):
             data.update({'入库进度': 1})  # 更新进度为已上传
     # 将进度信息写回文件
     df = pd.DataFrame.from_dict(datas, orient='columns')
-    df.to_csv(os.path.join(path, filename), encoding='utf-8_sig', index=False, header=True)
+    df.to_csv(os.path.join(support_file, filename), encoding='utf-8_sig', index=False, header=True)
 
 
 if __name__ == '__main__':

mdbq/mysql/mysql.py

@@ -281,7 +281,7 @@ class MysqlUpload:
             return 'mediumtext'
 
     # @try_except
-    def read_mysql(self, table_name, start_date, end_date, db_name='远程数据源', ):
+    def read_mysql(self, table_name, start_date, end_date, db_name='远程数据源', date_name='日期'):
         """ 读取指定数据表，可指定日期范围，返回结果: df """
         start_date = pd.to_datetime(start_date).strftime('%Y-%m-%d')
         end_date = pd.to_datetime(end_date).strftime('%Y-%m-%d')
@@ -310,7 +310,7 @@ class MysqlUpload:
         try:
             with connection.cursor() as cursor:
                 # 获取指定日期范围的数据
-                sql = f"SELECT * FROM {db_name}.{table_name} WHERE {'日期'} BETWEEN '%s' AND '%s'" % (start_date, end_date)
+                sql = f"SELECT * FROM {db_name}.{table_name} WHERE {date_name} BETWEEN '%s' AND '%s'" % (start_date, end_date)
                 cursor.execute(sql)
                 rows = cursor.fetchall()  # 获取查询结果
                 columns = [desc[0] for desc in cursor.description]

{mdbq-1.2.0.dist-info → mdbq-1.2.2.dist-info}/METADATA

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

{mdbq-1.2.0.dist-info → mdbq-1.2.2.dist-info}/RECORD

@@ -1,7 +1,7 @@
 mdbq/__init__.py,sha256=Il5Q9ATdX8yXqVxtP_nYqUhExzxPC_qk_WXQ_4h0exg,16
 mdbq/__version__.py,sha256=y9Mp_8x0BCZSHsdLT_q5tX9wZwd5QgqrSIENLrb6vXA,62
 mdbq/aggregation/__init__.py,sha256=EeDqX2Aml6SPx8363J-v1lz0EcZtgwIBYyCJV6CcEDU,40
-mdbq/aggregation/aggregation.py,sha256=ixp32wsqZPpSc5xnod_9XX9t8FwUsArnD0L3Fk22hds,56107
+mdbq/aggregation/aggregation.py,sha256=-cyucSkFCW9WHfhourcVH2_u4syRsR7VmbICWE82Brg,56259
 mdbq/aggregation/df_types.py,sha256=rHLIgv82PJSFmDvXkZyOJAffXkFyyMyFO23w9tUt8EQ,7525
 mdbq/aggregation/mysql_types.py,sha256=kzUAGM4FYp77tA_dvHjZNGyPoUAOU1WY5QD0uanh9I4,10418
 mdbq/aggregation/optimize_data.py,sha256=jLAWtxPUuhpo4XTVrhKtT4xK3grs7r73ePQfLhxlu1I,779
@@ -25,7 +25,7 @@ mdbq/mongo/__init__.py,sha256=SILt7xMtQIQl_m-ik9WLtJSXIVf424iYgCfE_tnQFbw,13
 mdbq/mongo/mongo.py,sha256=v9qvrp6p1ZRWuPpbSilqveiE0FEcZF7U5xUPI0RN4xs,31880
 mdbq/mysql/__init__.py,sha256=A_DPJyAoEvTSFojiI2e94zP0FKtCkkwKP1kYUCSyQzo,11
 mdbq/mysql/data_types_即将删除.py,sha256=sjBBDKr9674LdjM5N_dwyJACdZPbdB8Beli59jGdgnQ,10378
-mdbq/mysql/mysql.py,sha256=3oj93ZsS6oouvFtKCgBedrstWk0a04sxUfyBczwpdoc,36321
+mdbq/mysql/mysql.py,sha256=Urzkj_qq0-uxE0Z2xzVBzxpVySgn9HN-5zcNYrKh6G8,36340
 mdbq/mysql/s_query.py,sha256=4c24SwbqtnO33o8CgWlTQ_j8sZYl5BRIQkaD9CI-vTY,7901
 mdbq/mysql/year_month_day.py,sha256=VgewoE2pJxK7ErjfviL_SMTN77ki8GVbTUcao3vFUCE,1523
 mdbq/other/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
@@ -36,7 +36,7 @@ mdbq/pbix/__init__.py,sha256=Trtfaynu9RjoTyLLYBN2xdRxTvm_zhCniUkVTAYwcjo,24
 mdbq/pbix/pbix_refresh.py,sha256=JUjKW3bNEyoMVfVfo77UhguvS5AWkixvVhDbw4_MHco,2396
 mdbq/pbix/refresh_all.py,sha256=tgy762608HMaXWynbOURIf2UVMuSPybzrDXQnOOcnZU,6102
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
-mdbq-1.2.0.dist-info/METADATA,sha256=fetztgyzYtDexrUW_I33MBm-sESNkUCNZRxdALg6cdo,245
-mdbq-1.2.0.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
-mdbq-1.2.0.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-1.2.0.dist-info/RECORD,,
+mdbq-1.2.2.dist-info/METADATA,sha256=8J7jj1T-AEP4LVtu84LnG_IvmoXV8JkXodk_F-iJr8I,245
+mdbq-1.2.2.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
+mdbq-1.2.2.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-1.2.2.dist-info/RECORD,,