mdbq 3.2.0__py3-none-any.whl → 3.2.2__py3-none-any.whl

mdbq/aggregation/query_data.py

@@ -3082,6 +3082,10 @@ def date_table():
     df['索引'] = p
     df['月索引'] = mon
     df.sort_values('日期', ascending=False, ignore_index=True, inplace=True)
+    df = df.reset_index(drop=True)
+    df = df.reset_index(drop=False)
+    df.rename(columns={'index': 'id'}, inplace=True)
+    df['id'] = df['id'].apply(lambda x: x + 1)
 
     m = mysql.MysqlUpload(
         username=username,
@@ -3113,7 +3117,6 @@ def date_table():
         count=None,
         filename=None,  # 用来追踪处理进度
         set_typ=set_typ,
-        
     )
 
 
@@ -3190,11 +3193,11 @@ def query_(months=1, less_dict=[]):
 
 
 if __name__ == '__main__':
-    main(
-        days=150,  # 清理聚合数据的日期长度
-        months=3  # 生成聚合数据的长度
-    )
-
+    # main(
+    #     days=150,  # 清理聚合数据的日期长度
+    #     months=3  # 生成聚合数据的长度
+    # )
+    date_table()
     # query_(months=3)
 
     # system = platform.system()  # 本机系统

mdbq/mysql/mysql.py

@@ -477,7 +477,7 @@ class MysqlUpload:
                     if str(cut_data).lower() == 'year':
                         table_name = f'{table_name}_{min_year}'
                     elif str(cut_data).lower() == 'month':
-                        table_name = f'{table_name}_{min_year}_{min_month}'
+                        table_name = f'{table_name}_{min_year}-{min_month}'
                     else:
                         print(f'参数不正确，cut_data应为 year 或 month ')
                 except Exception as e:

{mdbq-3.2.0.dist-info → mdbq-3.2.2.dist-info}/METADATA

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

{mdbq-3.2.0.dist-info → mdbq-3.2.2.dist-info}/RECORD

@@ -5,7 +5,7 @@ mdbq/aggregation/aggregation.py,sha256=ltYntRjxeN9YX1uTR2_zoYEik2PVPD70xAF98d4Tc
 mdbq/aggregation/df_types.py,sha256=U9i3q2eRPTDY8qAPTw7irzu-Tlg4CIySW9uYro81wdk,8125
 mdbq/aggregation/mysql_types.py,sha256=YTGyrF9vcRgfkQbpT-e-JdJ7c7VF1dDHgyx9YZRES8w,10934
 mdbq/aggregation/optimize_data.py,sha256=79uwiM2WqNNFxGpE2wKz742PRq-ZGgFjdOV0vgptHdY,3513
-mdbq/aggregation/query_data.py,sha256=E1Pngmf2zp7j2dVe7i1llIEtZxa9jtfB1A5deyfIaJU,143896
+mdbq/aggregation/query_data.py,sha256=CQgfbAZxA36CTDYeO-5kyFiLbh3UGL-pk54WfzyLlv4,144085
 mdbq/aggregation/query_data_bak.py,sha256=r1FU0C4zjXln7oVSrRkElh4Ehl-9mYhGcq57jLbViUA,104071
 mdbq/bdup/__init__.py,sha256=AkhsGk81SkG1c8FqDH5tRq-8MZmFobVbN60DTyukYTY,28
 mdbq/bdup/bdup.py,sha256=LAV0TgnQpc-LB-YuJthxb0U42_VkPidzQzAagan46lU,4234
@@ -27,7 +27,7 @@ mdbq/log/mylogger.py,sha256=oaT7Bp-Hb9jZt52seP3ISUuxVcI19s4UiqTeouScBO0,3258
 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/mysql.py,sha256=Q4j0CTVnMXlrfFRd0yehcxNOMqLYztlx-848EIIet08,62681
+mdbq/mysql/mysql.py,sha256=DiyOEXqTQLdITe6FtqMGxEGM9z2I8UBsXwVko5nbgjo,62681
 mdbq/mysql/recheck_mysql.py,sha256=rgTpvDMWYTyEn7UQdlig-pdXDluTgiU8JG6lkMh8DV0,8665
 mdbq/mysql/s_query.py,sha256=MbIprZ4yJDAZ9AahZPzl7hqS695Vs0P-AJNwAtA_EEc,9287
 mdbq/mysql/year_month_day.py,sha256=VgewoE2pJxK7ErjfviL_SMTN77ki8GVbTUcao3vFUCE,1523
@@ -45,7 +45,7 @@ mdbq/req_post/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
 mdbq/req_post/req_tb.py,sha256=qg7pet73IgKGmCwxaeUyImJIoeK_pBQT9BBKD7fkBNg,36160
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
 mdbq/spider/aikucun.py,sha256=48isoL6nEi_uniV-ja2HwYAI7O8D1i1goO4SzBwDGSU,19036
-mdbq-3.2.0.dist-info/METADATA,sha256=1QsIsKB3o07nr8hpmMy4FLHSOoiskMwtGD0aRoaDThA,243
-mdbq-3.2.0.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-mdbq-3.2.0.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-3.2.0.dist-info/RECORD,,
+mdbq-3.2.2.dist-info/METADATA,sha256=u8DFXVb9EF6Rxp4SWOSdivGHZtBxsz3p6gL51HGgZio,243
+mdbq-3.2.2.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+mdbq-3.2.2.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-3.2.2.dist-info/RECORD,,