mdbq 1.2.0__tar.gz → 1.2.2__tar.gz

{mdbq-1.2.0 → mdbq-1.2.2}/PKG-INFO

@@ -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 → mdbq-1.2.2}/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-1.2.0 → mdbq-1.2.2}/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 → mdbq-1.2.2}/mdbq.egg-info/PKG-INFO

@@ -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 → mdbq-1.2.2}/setup.py

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