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

mdbq/aggregation/aggregation.py

@@ -1213,38 +1213,80 @@ def one_file_to_mysql(file, db_name, table_name):
     )
 
 
-def test():
-    path = r'/Users/xigua/Downloads/京准通'
-
+def cut_as_year_month(as_month=False):
+    """
+    将表格数据按年划分
+    as_month： true 按月重新保存
+    """
+    file_name = '达摩盘_人群报表'
+    path = r'/Users/xigua/Downloads/数据库导出'
 
     for root, dirs, files in os.walk(path, topdown=False):
         for name in files:
             if name.endswith('.csv') and 'baidu' not in name and '~' not in name:
-                # df = pd.read_excel(os.path.join(root, name), header=0)
-                df = pd.read_csv(os.path.join(root, name), encoding='utf-8_sig', header=0, na_filter=False)
-
-                # print(name)
-                if len(df) == 0:
+                pattern = re.findall(r'\d{4}.csv|\d{4}-\d{2}.csv', name)
+                if pattern:
                     continue
-                df['类目ID'] = df['类目ID'].apply(lambda x: 0 if str(x) == 'null' else x)
-                df['类目名称'] = df['类目ID'].apply(lambda x: 0 if str(x) == 'null' else x)
-                df.to_csv(os.path.join(root, name), encoding='utf-8_sig', index=False, header=True)
+                if file_name not in name:
+                    continue
+                # df = pd.read_excel(os.path.join(root, name), header=0)
+                df_before = pd.read_csv(os.path.join(root, name), encoding='utf-8_sig', header=0, na_filter=False)
+                df_before['日期'] = pd.to_datetime(df_before['日期'], format='%Y-%m-%d', errors='ignore')
+                max_date = df_before['日期'].max(skipna=True).year
+                min_date = df_before['日期'].min(skipna=True).year
+                for year in range(min_date, max_date+1):
+                    df = df_before[(df_before['日期'] >= f'{year}-01-01') & (df_before['日期'] <= f'{year}-12-31')]
+                    if as_month:
+                        for month in range(1, 13):
+                            if month < 10:
+                                month = f'0{month}'
+                            for n in range(31, 27, -1):
+                                try:
+                                    end_day = pd.to_datetime(f'{year}-{month}-{n}')
+                                    break
+                                except:
+                                    continue
+                            st_day = pd.to_datetime(f'{year}-{month}-01')
+                            df_month = df[(df['日期'] >= st_day) & (df['日期'] <= end_day)]
+                            if len(df_month) == 0:
+                                continue
+                            df_month.sort_values('日期', ascending=True, ignore_index=True, inplace=True)
+                            df_month = df_month.reset_index(drop=True)
+                            df_month = df_month.reset_index(drop=False)
+                            df_month.pop('id')
+                            df_month.rename(columns={'index': 'id'}, inplace=True)
+                            df_month['id'] = df_month['id'].apply(lambda x: x + 1)
+                            new_name = f'{os.path.splitext(name)[0]}_{year}_{month}.csv'
+                            print(new_name)
+                            df_month.to_csv(os.path.join(root, new_name), encoding='utf-8_sig', index=False, header=True)
+                    else:
+                        df.sort_values('日期', ascending=True, ignore_index=True, inplace=True)
+                        df = df.reset_index(drop=True)
+                        df = df.reset_index(drop=False)
+                        df.pop('id')
+                        df.rename(columns={'index': 'id'}, inplace=True)
+                        df['id'] = df['id'].apply(lambda x: x + 1)
+                        new_name = f'{os.path.splitext(name)[0]}_{year}.csv'
+                        print(new_name)
+                        df.to_csv(os.path.join(root, new_name), encoding='utf-8_sig', index=False, header=True)
 
 
 if __name__ == '__main__':
+    cut_as_year_month(as_month=False)
+
     # username = 'root'
     # password = ''
     # host = ''
     # port = ''
     #
-    # 上传 1 个文件到数据库
-    one_file_to_mysql(
-        file=r'/Users/xigua/Downloads/批量SKU导出-批量任务.xlsx',
-        db_name='属性设置3',
-        table_name='京东商品属性',
-    )
+    # # 上传 1 个文件到数据库
+    # one_file_to_mysql(
+    #     file=r'/Users/xigua/Downloads/批量SKU导出-批量任务.xlsx',
+    #     db_name='属性设置3',
+    #     table_name='京东商品属性',
+    # )
+
 
-    # test()
     # col = 1
     # if col:
     #     # 上传一个目录到指定数据库

mdbq/aggregation/query_data.py

@@ -85,13 +85,17 @@ class MysqlDatasQuery:
             '直接成交金额': 1,
             '店铺名称': 1,
         }
-        df = self.download.data_to_df(
-            db_name='推广数据2',
-            table_name='主体报表',
-            start_date=start_date,
-            end_date=end_date,
-            projection=projection,
-        )
+        __res = []
+        for year in range(2024, datetime.datetime.today().year+1):
+            df = self.download.data_to_df(
+                db_name='推广数据2',
+                table_name=f'主体报表_{year}',
+                start_date=start_date,
+                end_date=end_date,
+                projection=projection,
+            )
+            __res.append(df)
+        df = pd.concat(__res, ignore_index=True)
         df.rename(columns={
             '场景名字': '营销场景',
             '主体id': '商品id',
@@ -233,7 +237,6 @@ class MysqlDatasQuery:
             filename=None,  # 用来追踪处理进度
             reset_id=False,  # 是否重置自增列
             set_typ=set_typ,
-            
         )
         return True
 
@@ -254,13 +257,17 @@ class MysqlDatasQuery:
             '退货量_发货后': 1,
             '店铺名称': 1,
         }
-        df = self.download.data_to_df(
-            db_name='生意经3',
-            table_name='宝贝指标',
-            start_date=start_date,
-            end_date=end_date,
-            projection=projection,
-        )
+        __res = []
+        for year in range(2024, datetime.datetime.today().year + 1):
+            df = self.download.data_to_df(
+                db_name='生意经3',
+                table_name=f'宝贝指标_{year}',
+                start_date=start_date,
+                end_date=end_date,
+                projection=projection,
+            )
+            __res.append(df)
+        df = pd.concat(__res, ignore_index=True)
         df['宝贝id'] = df['宝贝id'].astype(str)
         df = df.groupby(['日期', '店铺名称', '宝贝id', '行业类目'], as_index=False).agg(
             **{
@@ -322,7 +329,6 @@ class MysqlDatasQuery:
             filename=None,  # 用来追踪处理进度
             reset_id=False,  # 是否重置自增列
             set_typ=set_typ,
-            
         )
         return True
 
@@ -344,13 +350,17 @@ class MysqlDatasQuery:
             '人群名字': 1,
             '店铺名称': 1,
         }
-        df = self.download.data_to_df(
-            db_name='推广数据2',
-            table_name='人群报表',
-            start_date=start_date,
-            end_date=end_date,
-            projection=projection,
-        )
+        __res = []
+        for year in range(2024, datetime.datetime.today().year + 1):
+            df = self.download.data_to_df(
+                db_name='推广数据2',
+                table_name=f'人群报表_{year}',
+                start_date=start_date,
+                end_date=end_date,
+                projection=projection,
+            )
+            __res.append(df)
+        df = pd.concat(__res, ignore_index=True)
         df.rename(columns={
             '场景名字': '营销场景',
             '主体id': '商品id',
@@ -509,7 +519,6 @@ class MysqlDatasQuery:
             filename=None,  # 用来追踪处理进度
             reset_id=False,  # 是否重置自增列
             set_typ=set_typ,
-            
         )
         return True
 
@@ -532,13 +541,17 @@ class MysqlDatasQuery:
             '直接成交金额': 1,
             '店铺名称': 1,
         }
-        df = self.download.data_to_df(
-            db_name='推广数据2',
-            table_name='关键词报表',
-            start_date=start_date,
-            end_date=end_date,
-            projection=projection,
-        )
+        __res = []
+        for year in range(2024, datetime.datetime.today().year + 1):
+            df = self.download.data_to_df(
+                db_name='推广数据2',
+                table_name=f'关键词报表_{year}',
+                start_date=start_date,
+                end_date=end_date,
+                projection=projection,
+            )
+            __res.append(df)
+        df = pd.concat(__res, ignore_index=True)
         df.rename(columns={
             '场景名字': '营销场景',
             '宝贝id': '商品id',
@@ -642,7 +655,6 @@ class MysqlDatasQuery:
             filename=None,  # 用来追踪处理进度
             reset_id=False,  # 是否重置自增列
             set_typ=set_typ,
-            
         )
         return True
 
@@ -666,13 +678,17 @@ class MysqlDatasQuery:
             '直接成交金额': 1,
             '店铺名称': 1,
         }
-        df = self.download.data_to_df(
-            db_name='推广数据2',
-            table_name='超级直播报表_人群',
-            start_date=start_date,
-            end_date=end_date,
-            projection=projection,
-        )
+        __res = []
+        for year in range(2024, datetime.datetime.today().year + 1):
+            df = self.download.data_to_df(
+                db_name='推广数据2',
+                table_name=f'超级直播报表_人群_{year}',
+                start_date=start_date,
+                end_date=end_date,
+                projection=projection,
+            )
+            __res.append(df)
+        df = pd.concat(__res, ignore_index=True)
         df.rename(columns={
             '观看次数': '观看次数',
             '总购物车数': '加购量',
@@ -763,7 +779,6 @@ class MysqlDatasQuery:
             filename=None,  # 用来追踪处理进度
             reset_id=False,  # 是否重置自增列
             set_typ=set_typ,
-            
         )
         return True
 
@@ -785,13 +800,17 @@ class MysqlDatasQuery:
             # '成交访客数': 1
             '店铺名称': 1,
         }
-        df = self.download.data_to_df(
-            db_name='推广数据2',
-            table_name='品销宝',
-            start_date=start_date,
-            end_date=end_date,
-            projection=projection,
-        )
+        __res = []
+        for year in range(2024, datetime.datetime.today().year + 1):
+            df = self.download.data_to_df(
+                db_name='推广数据2',
+                table_name=f'品销宝_{year}',
+                start_date=start_date,
+                end_date=end_date,
+                projection=projection,
+            )
+            __res.append(df)
+        df = pd.concat(__res, ignore_index=True)
         df = df[df['报表类型'] == '账户']
         df.fillna(value=0, inplace=True)
         df.rename(columns={
@@ -873,18 +892,20 @@ class MysqlDatasQuery:
             filename=None,  # 用来追踪处理进度
             reset_id=False,  # 是否重置自增列
             set_typ=set_typ,
-            
         )
         return True
 
     @try_except
     def idbm(self, db_name='聚合数据', table_name='商品id编码表'):
         """ 用生意经日数据制作商品 id 和编码对照表 """
-        data_values = self.download.columns_to_list(
-            db_name='生意经3',
-            table_name='宝贝指标',
-            columns_name=['宝贝id', '商家编码', '行业类目'],
-        )
+        year = datetime.datetime.today().year
+        data_values = []
+        for year in range(2022, year+1):
+            data_values += self.download.columns_to_list(
+                db_name='生意经3',
+                table_name=f'宝贝指标_{year}',
+                columns_name=['宝贝id', '商家编码', '行业类目'],
+            )
         df = pd.DataFrame(data=data_values)
         df['宝贝id'] = df['宝贝id'].astype(str)
         df.drop_duplicates(subset='宝贝id', keep='last', inplace=True, ignore_index=True)
@@ -898,7 +919,7 @@ class MysqlDatasQuery:
                 df['一级类目'] = df['行业类目']
         df.drop('行业类目', axis=1, inplace=True)
         df.sort_values('宝贝id', ascending=False, inplace=True)
-        df = df[(df['宝贝id'] != '973') & (df['宝贝id'] != '973')]
+        df = df[(df['宝贝id'] != '973') & (df['宝贝id'] != 973) & (df['宝贝id'] != '0')]
         set_typ = {
             '宝贝id': 'bigint',
             '商家编码': 'varchar(100)',
@@ -928,7 +949,6 @@ class MysqlDatasQuery:
             filename=None,  # 用来追踪处理进度
             reset_id=False,  # 是否重置自增列
             set_typ=set_typ,
-            
         )
         return True
 
@@ -1011,13 +1031,17 @@ class MysqlDatasQuery:
             '下单买家数': 1,
             '关注店铺人数': 1,
         }
-        df = self.download.data_to_df(
-            db_name='生意参谋3',
-            table_name='店铺流量来源构成',
-            start_date=start_date,
-            end_date=end_date,
-            projection=projection,
-        )
+        __res = []
+        for year in range(2024, datetime.datetime.today().year+1):
+            df = self.download.data_to_df(
+                db_name='生意参谋3',
+                table_name=f'店铺流量来源构成_{year}',
+                start_date=start_date,
+                end_date=end_date,
+                projection=projection,
+            )
+            __res.append(df)
+        df = pd.concat(__res, ignore_index=True)
         df.drop_duplicates(subset=['日期', '店铺名称', '类别', '来源构成', '一级来源', '二级来源', '三级来源', '访客数'], keep='last', inplace=True, ignore_index=True)
         # 包含三级来源名称和预设索引值列
         # 截取 从上月1日 至 今天的花费数据, 推广款式按此数据从高到低排序（商品图+排序）
@@ -1162,13 +1186,17 @@ class MysqlDatasQuery:
             'spu_id': 1,
             '店铺名称':1,
         }
-        df = self.download.data_to_df(
-            db_name='京东数据3',
-            table_name='推广数据_京准通',
-            start_date=start_date,
-            end_date=end_date,
-            projection=projection,
-        )
+        __res = []
+        for year in range(2024, datetime.datetime.today().year + 1):
+            df = self.download.data_to_df(
+                    db_name='京东数据3',
+                    table_name=f'推广数据_京准通_{year}',
+                    start_date=start_date,
+                    end_date=end_date,
+                    projection=projection,
+                )
+            __res.append(df)
+        df = pd.concat(__res, ignore_index=True)
         df = df.groupby(
             ['日期', '店铺名称', '产品线', '触发sku_id', '跟单sku_id', 'spu_id', '花费', '展现数', '点击数'],
             as_index=False).agg(
@@ -1373,13 +1401,17 @@ class MysqlDatasQuery:
             '商品关注数': 1,
             '店铺关注数': 1,
         }
-        df = self.download.data_to_df(
-            db_name='京东数据3',
-            table_name='推广数据_关键词报表',
-            start_date=start_date,
-            end_date=end_date,
-            projection=projection,
-        )
+        __res = []
+        for year in range(2024, datetime.datetime.today().year + 1):
+            df = self.download.data_to_df(
+                    db_name='京东数据3',
+                    table_name=f'推广数据_关键词报表_{year}',
+                    start_date=start_date,
+                    end_date=end_date,
+                    projection=projection,
+                )
+            __res.append(df)
+        df = pd.concat(__res, ignore_index=True)
         df_lin = df[['计划id', '推广计划']]
         df_lin.drop_duplicates(subset=['计划id'], keep='last', inplace=True, ignore_index=True)
         df = df.groupby(
@@ -1461,13 +1493,17 @@ class MysqlDatasQuery:
             '加购商品件数': 1,
             '加购人数': 1,
         }
-        df = self.download.data_to_df(
-            db_name='京东数据3',
-            table_name='京东商智_sku_商品明细',
-            start_date=start_date,
-            end_date=end_date,
-            projection=projection,
-        )
+        __res = []
+        for year in range(2024, datetime.datetime.today().year + 1):
+            df = self.download.data_to_df(
+                db_name='京东数据3',
+                table_name=f'京东商智_sku_商品明细_{year}',
+                start_date=start_date,
+                end_date=end_date,
+                projection=projection,
+            )
+            __res.append(df)
+        df = pd.concat(__res, ignore_index=True)
         df = df[df['商品id'] != '合计']
         df = df.groupby(['日期', '店铺名称', '商品id', '货号', '访客数', '成交客户数', '加购商品件数', '加购人数'],
                         as_index=False).agg(
@@ -1531,13 +1567,17 @@ class MysqlDatasQuery:
             '加购商品件数': 1,
             '加购人数': 1,
         }
-        df = self.download.data_to_df(
-            db_name='京东数据3',
-            table_name='京东商智_spu_商品明细',
-            start_date=start_date,
-            end_date=end_date,
-            projection=projection,
-        )
+        __res = []
+        for year in range(2024, datetime.datetime.today().year + 1):
+            df = self.download.data_to_df(
+                db_name='京东数据3',
+                table_name=f'京东商智_spu_商品明细_{year}',
+                start_date=start_date,
+                end_date=end_date,
+                projection=projection,
+            )
+            __res.append(df)
+        df = pd.concat(__res, ignore_index=True)
         df = df[df['商品id'] != '合计']
         df = df.groupby(['日期', '店铺名称', '商品id', '货号', '访客数', '成交客户数', '加购商品件数', '加购人数'],
                         as_index=False).agg(
@@ -1606,13 +1646,17 @@ class MysqlDatasQuery:
             '客单价': 1,
             'uv价值': 1,
         }
-        df = self.download.data_to_df(
-            db_name='生意参谋3',
-            table_name='手淘搜索_本店引流词',
-            start_date=start_date,
-            end_date=end_date,
-            projection=projection,
-        )
+        __res = []
+        for year in range(2024, datetime.datetime.today().year+1):
+            df = self.download.data_to_df(
+                db_name='生意参谋3',
+                table_name=f'手淘搜索_本店引流词_{year}',
+                start_date=start_date,
+                end_date=end_date,
+                projection=projection,
+            )
+            __res.append(df)
+        df = pd.concat(__res, ignore_index=True)
         df = df.groupby(
             ['日期', '店铺名称', '词类型', '搜索词'],
             as_index=False).agg(
@@ -1823,13 +1867,17 @@ class MysqlDatasQuery:
             '总成交金额': 1,
             '店铺名称': 1,
         }
-        df_tm = self.download.data_to_df(
-            db_name='推广数据2',
-            table_name='营销场景报表',
-            start_date=start_date,
-            end_date=end_date,
-            projection=projection,
-        )
+        __res = []
+        for year in range(2024, datetime.datetime.today().year + 1):
+            df_tm = self.download.data_to_df(
+                db_name='推广数据2',
+                table_name=f'营销场景报表_{year}',
+                start_date=start_date,
+                end_date=end_date,
+                projection=projection,
+            )
+            __res.append(df_tm)
+        df_tm = pd.concat(__res, ignore_index=True)
         if len(df_tm) > 0:
             df_tm.rename(columns={'场景名字': '营销场景'}, inplace=True)
             df_tm = df_tm.groupby(
@@ -1843,14 +1891,17 @@ class MysqlDatasQuery:
                     '成交金额': ('总成交金额', np.max)
                 }
             )
-
-        df_tb = self.download.data_to_df(
-            db_name='推广数据_淘宝店',
-            table_name='营销场景报表',
-            start_date=start_date,
-            end_date=end_date,
-            projection=projection,
-        )
+        __res = []
+        for year in range(2024, datetime.datetime.today().year + 1):
+            df_tb = self.download.data_to_df(
+                db_name='推广数据_淘宝店',
+                table_name=f'营销场景报表_{year}',
+                start_date=start_date,
+                end_date=end_date,
+                projection=projection,
+            )
+            __res.append(df_tb)
+        df_tb = pd.concat(__res, ignore_index=True)
         if len(df_tb) > 0:
             df_tb.rename(columns={'场景名字': '营销场景'}, inplace=True)
             df_tb = df_tb.groupby(
@@ -1879,13 +1930,17 @@ class MysqlDatasQuery:
                 '总成交金额': 1,
                 '店铺名称': 1,
             }
-            df_tb_qzt = self.download.data_to_df(
-                db_name='推广数据_淘宝店',
-                table_name='全站推广报表',
-                start_date=start_date,
-                end_date=end_date,
-                projection=projection,
-            )
+            __res = []
+            for year in range(2024, datetime.datetime.today().year + 1):
+                df_tb_qzt = self.download.data_to_df(
+                    db_name='推广数据_淘宝店',
+                    table_name=f'全站推广报表_{year}',
+                    start_date=start_date,
+                    end_date=end_date,
+                    projection=projection,
+                )
+                __res.append(df_tb_qzt)
+            df_tb_qzt = pd.concat(__res, ignore_index=True)
             if len(df_tb_qzt) > 0:
                 # 这一步是排重
                 df_tb_qzt = df_tb_qzt.groupby(
@@ -1925,13 +1980,17 @@ class MysqlDatasQuery:
             '成交金额': 1,
             '店铺名称': 1,
         }
-        df_tm_pxb = self.download.data_to_df(
-            db_name='推广数据2',
-            table_name='品销宝',
-            start_date=start_date,
-            end_date=end_date,
-            projection=projection,
-        )
+        __res = []
+        for year in range(2024, datetime.datetime.today().year + 1):
+            df_tm_pxb = self.download.data_to_df(
+                db_name='推广数据2',
+                table_name=f'品销宝_{year}',
+                start_date=start_date,
+                end_date=end_date,
+                projection=projection,
+            )
+            __res.append(df_tm_pxb)
+        df_tm_pxb = pd.concat(__res, ignore_index=True)
         if len(df_tm_pxb) > 0:
             df_tm_pxb = df_tm_pxb[df_tm_pxb['报表类型'] == '账户']
             df_tm_pxb = df_tm_pxb.groupby(
@@ -1961,13 +2020,17 @@ class MysqlDatasQuery:
                 '总成交金额': 1,
                 '店铺名称': 1,
             }
-            df_tm_living = self.download.data_to_df(
-                db_name='推广数据2',
-                table_name='超级直播报表_人群',
-                start_date=start_date,
-                end_date=pd.to_datetime('2024-04-16'),  # 只可以取此日期之前的数据
-                projection=projection,
-            )
+            __res = []
+            for year in range(2024, datetime.datetime.today().year + 1):
+                df_tm_living = self.download.data_to_df(
+                    db_name='推广数据2',
+                    table_name=f'超级直播报表_人群_{year}',
+                    start_date=start_date,
+                    end_date=pd.to_datetime('2024-04-16'),  # 只可以取此日期之前的数据
+                    projection=projection,
+                )
+                __res.append(df_tm_living)
+            df_tm_living = pd.concat(__res, ignore_index=True)
             if len(df_tm_living) > 0:
                 df_tm_living.rename(columns={'场景名字': '营销场景'}, inplace=True)
                 df_tm_living = df_tm_living.groupby(
@@ -1999,13 +2062,17 @@ class MysqlDatasQuery:
             'spu_id': 1,
             '店铺名称': 1,
         }
-        df_jd = self.download.data_to_df(
-            db_name='京东数据3',
-            table_name='推广数据_京准通',
-            start_date=start_date,
-            end_date=end_date,
-            projection=projection,
-        )
+        __res = []
+        for year in range(2024, datetime.datetime.today().year + 1):
+            df_jd = self.download.data_to_df(
+                    db_name='京东数据3',
+                    table_name=f'推广数据_京准通_{year}',
+                    start_date=start_date,
+                    end_date=end_date,
+                    projection=projection,
+                )
+            __res.append(df_jd)
+        df_jd = pd.concat(__res, ignore_index=True)
         if len(df_jd) > 0:
             df_jd = df_jd.groupby(['日期', '店铺名称', '产品线', '触发sku_id', '跟单sku_id', 'spu_id', '花费', '展现数', '点击数'],
                             as_index=False).agg(
@@ -2244,7 +2311,7 @@ class MysqlDatasQuery:
         )
         return True
 
-    @try_except
+    # @try_except
     def dmp_crowd(self, db_name='聚合数据', table_name='达摩盘_人群报表'):
         start_date, end_date = self.months_data(num=self.months)
         projection = {
@@ -2267,14 +2334,19 @@ class MysqlDatasQuery:
         df_crowd.drop_duplicates(subset=['人群id',], keep='last', inplace=True, ignore_index=True)
         df_crowd.pop('日期')
         df_crowd = df_crowd.astype({'人群id': 'int64'}, errors='ignore')
+
         projection = {}
-        df_dmp = self.download.data_to_df(
-            db_name='达摩盘3',
-            table_name='dmp人群报表',
-            start_date=start_date,
-            end_date=end_date,
-            projection=projection,
-        )
+        __res = []
+        for year in range(2024, datetime.datetime.today().year + 1):
+            df_dmp = self.download.data_to_df(
+                        db_name='达摩盘3',
+                        table_name=f'dmp人群报表_{year}',
+                        start_date=start_date,
+                        end_date=end_date,
+                        projection=projection,
+                    )
+            __res.append(df_dmp)
+        df_dmp = pd.concat(__res, ignore_index=True)
         df_dmp = df_dmp.astype({'人群id': 'int64'}, errors='ignore')
         df_dmp.sort_values('日期', ascending=True, ignore_index=True, inplace=True)
         df_dmp.drop_duplicates(subset=['日期', '人群id', '消耗_元'], keep='last', inplace=True, ignore_index=True)
@@ -2286,8 +2358,8 @@ class MysqlDatasQuery:
         # breakpoint()
         df.rename(columns={'消耗_元': '消耗'}, inplace=True)
         set_typ = {
-            '店铺名称': 'varchar(100)',
             '日期': 'date',
+            '店铺名称': 'varchar(100)',
             '人群id': 'bigint',
             '人群名称': 'varchar(255)',
             '营销渠道': 'varchar(100)',
@@ -2348,7 +2420,6 @@ class MysqlDatasQuery:
             filename=None,  # 用来追踪处理进度
             reset_id=False,  # 是否重置自增列
             set_typ=set_typ,
-            
         )
         return True
 
@@ -2759,7 +2830,6 @@ class MysqlDatasQuery:
             filename=None,  # 用来追踪处理进度
             reset_id=False,  # 是否重置自增列
             set_typ=set_typ,
-            
         )
         return True
 
@@ -2870,7 +2940,6 @@ class MysqlDatasQuery:
             filename=None,  # 用来追踪处理进度
             reset_id=False,  # 是否重置自增列
             set_typ=set_typ,
-            
         )
         return True
 
@@ -2926,8 +2995,8 @@ class MysqlDatasQuery:
         }
         if not self.update_service:
             return
-        min_date = df['日期'].min()
-        max_date = df['日期'].max()
+        min_date = df['日期'].min().strftime("%Y-%m-%d")
+        max_date = df['日期'].max().strftime("%Y-%m-%d")
         now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
         print(f'{now} 正在更新: mysql ({host}:{port}) {db_name}/{table_name} -> {min_date}~{max_date}')
         m_engine.df_to_mysql(
@@ -2942,7 +3011,6 @@ class MysqlDatasQuery:
             filename=None,  # 用来追踪处理进度
             reset_id=False,  # 是否重置自增列
             set_typ=set_typ,
-            
         )
         return True
 
@@ -2964,7 +3032,7 @@ def date_table():
     """
     生成 pbix 使用的日期表
     """
-    start_date = '2022-01-01'  # 日期表的起始日期
+    start_date = '2022-01-07'  # 日期表的起始日期
     yesterday = time.strftime('%Y-%m-%d', time.localtime(time.time() - 86400))
     dic = pd.date_range(start=start_date, end=yesterday)
     df = pd.DataFrame(dic, columns=['日期'])
@@ -2983,6 +3051,34 @@ def date_table():
     df['年月'] = df.apply(lambda x: x['年'] + x['月'], axis=1)
     df['月日'] = df.apply(lambda x: x['月'] + x['日'] + '日', axis=1)
     df['第n周'] = df['日期'].apply(lambda x: x.strftime('第%W周'))
+
+    # 重构 df，添加 1 列，从周五～下周四作为 1 周 汇总
+    df['日期'] = pd.to_datetime(df['日期'], format='%Y-%m-%d', errors='ignore')  # 转换日期列
+    grouped = df.groupby(pd.Grouper(key='日期', freq='7D'))
+    __res = []
+    num = 1
+    for name, group in grouped:
+        if num > 52:
+            num = 1
+        # print(f'Group: {name}')
+        group['第n周_new'] = f'第{num}周'
+        num += 1
+        __res.append(group)
+        # print(group)
+        # break
+    df = pd.concat(__res, ignore_index=True)
+    # df['日期'] = df['日期'].apply(lambda x: pd.to_datetime(x))
+    df['weekname'] = df['日期'].dt.day_name()
+    dict_dt = {
+        'Monday': '星期一',
+        'Tuesday': '星期二',
+        'Wednesday': '星期三',
+        'Thursday': '星期四',
+        'Friday': '星期五',
+        'Saturday': '星期六',
+        'Sunday': '星期日',
+    }
+    df['星期'] = df['weekname'].apply(lambda x: dict_dt[x])
     df['索引'] = p
     df['月索引'] = mon
     df.sort_values('日期', ascending=False, ignore_index=True, inplace=True)
@@ -3001,6 +3097,9 @@ def date_table():
         '年月': 'varchar(50)',
         '月日': 'varchar(50)',
         '第n周': 'varchar(50)',
+        '第n周_new': 'varchar(50)',
+        '星期': 'varchar(50)',
+        'weekname': 'varchar(50)',
         '索引': 'int',
         '月索引': 'int',
     }
@@ -3091,22 +3190,23 @@ def query_(months=1, less_dict=[]):
 
 
 if __name__ == '__main__':
-    # main(
-    #     days=150,  # 清理聚合数据的日期长度
-    #     months=3  # 生成聚合数据的长度
-    # )
-
-    query_(months=3)
-
-    system = platform.system()  # 本机系统
-    host_name = socket.gethostname()  # 本机名
-    conf = myconfig.main()
-    db_list = conf[system][host_name]['mysql']['数据库集']
-    # 4. 清理聚合数据
-    optimize_data.op_data(
-        db_name_lists=['聚合数据'],
-        days=3650,
-        is_mongo=False,
-        is_mysql=True,
+    main(
+        days=150,  # 清理聚合数据的日期长度
+        months=3  # 生成聚合数据的长度
     )
 
+    # query_(months=3)
+
+    # system = platform.system()  # 本机系统
+    # host_name = socket.gethostname()  # 本机名
+    # conf = myconfig.main()
+    # db_list = conf[system][host_name]['mysql']['数据库集']
+    # # 4. 清理聚合数据
+    # optimize_data.op_data(
+    #     # db_name_lists=['聚合数据'],
+    #     db_name_lists=db_list,
+    #     days=3650,
+    #     is_mongo=False,
+    #     is_mysql=True,
+    # )
+

mdbq/mysql/mysql.py

@@ -17,23 +17,12 @@ from mdbq.config import myconfig
 warnings.filterwarnings('ignore')
 """
 建表流程:
-尽可能手动建表，再上传数据
-1. 每个表手动上传一个文件建表
-2. 全部建表完成，建议所有表的数据类型，有问题的在数据库修改
-3. 清空所有数据表，仅保留列信息
-4. 下载所有数据表的 dtypes 信息到 json 文件
-5. 之后可以正常上传数据
+
 
 建表规范:
 1. 数据库和数据表名如果有字母，必须使用小写，大写在建库后会自动变小写，再次上传数据会找不到数据库(macos和linux都有这种情况)
 2. 无论是数据库/表/列名还是值，尽量避免特殊字符或者表情符号，数据库/表/列名尽量都使用 `列名` 转义，避免错误
 3. 小数必须使用 decimal, 禁止 float 和 double, 因为计算精度差异，后续需要聚合数据时会引发很多问题
-4. 日期类型暂时全部用 DATETIME，使用 DATE 在后续可能会重复插入不能排重，因为 df 进来的数据, 日期是带时间的，而数据库中日期不含时间
-5. 目前小数自动适配类型转换，对于文本或者大数全部用 mediumtext, 因为部分表涉及爬虫数据，进来的字符长度未知，暂时统一 mediumtext 避免入库失败
-
-
-
-
 
 """
 
@@ -127,7 +116,7 @@ class MysqlUpload:
         return wrapper
 
     @try_except
-    def dict_to_mysql(self, db_name, table_name, dict_data, icm_update=None, main_key=None, unique_main_key=None, index_length=100, set_typ=None, allow_not_null=False):
+    def dict_to_mysql(self, db_name, table_name, dict_data, icm_update=None, main_key=None, unique_main_key=None, index_length=100, set_typ=None, allow_not_null=False, cut_data=None):
         """
         插入字典数据
         dict_data： 字典
@@ -142,6 +131,21 @@ class MysqlUpload:
             main_key = []
         if not unique_main_key:
             unique_main_key = []
+
+        if cut_data:
+            if '日期' in dict_data.keys():
+                try:
+                    __y = pd.to_datetime(dict_data['日期']).strftime('%Y')
+                    __y_m = pd.to_datetime(dict_data['日期']).strftime('%Y-%m')
+                    if str(cut_data).lower() == 'year':
+                        table_name = f'{table_name}_{__y}'
+                    elif str(cut_data).lower() == 'month':
+                        table_name = f'{table_name}_{__y_m}'
+                    else:
+                        print(f'参数不正确，cut_data应为 year 或 month ')
+                except Exception as e:
+                    print(f'{table_name} 将数据按年/月保存(cut_data)，但在转换日期时报错 -> {e}')
+
         connection = pymysql.connect(**self.config)  # 连接数据库
         with connection.cursor() as cursor:
             cursor.execute(f"SHOW DATABASES LIKE '{db_name}'")  # 检查数据库是否存在
@@ -201,9 +205,9 @@ class MysqlUpload:
                         cursor.execute(sql)
                     if col in unique_main_key:
                         if dtypes[col] == 'mediumtext':
-                            sql = f"ALTER TABLE {table_name} ADD UNIQUE (`{col}`({index_length}))"
+                            sql = f"ALTER TABLE `{table_name}` ADD UNIQUE (`{col}`({index_length}))"
                         else:
-                            sql = f"ALTER TABLE {table_name} ADD UNIQUE (`{col}`)"
+                            sql = f"ALTER TABLE `{table_name}` ADD UNIQUE (`{col}`)"
                         cursor.execute(sql)
                     # if col in main_key or col in unique_main_key:
                     #     sql = f"SHOW INDEXES FROM `{table_name}` WHERE `Column_name` = %s"
@@ -438,7 +442,7 @@ class MysqlUpload:
 
     @try_except
     def df_to_mysql(self, df, db_name, table_name, set_typ=None, icm_update=[], move_insert=False, df_sql=False, drop_duplicates=False,
-                    filename=None, count=None, reset_id=False, allow_not_null=False):
+                    filename=None, count=None, reset_id=False, allow_not_null=False, cut_data=None):
         """
         db_name: 数据库名
         table_name: 表名
@@ -464,6 +468,20 @@ class MysqlUpload:
             print(f'{db_name} 不能为 None')
             return
 
+        if cut_data:
+            if '日期' in df.columns.tolist():
+                try:
+                    df['日期'] = pd.to_datetime(df['日期'], format='%Y-%m-%d', errors='ignore')
+                    min_year = df['日期'].min(skipna=True).year
+                    min_month = df['日期'].min(skipna=True).month
+                    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}'
+                    else:
+                        print(f'参数不正确，cut_data应为 year 或 month ')
+                except Exception as e:
+                    print(f'{table_name} 将数据按年/月保存(cut_data)，但在转换日期时报错 -> {e}')
         # 清理 dataframe 非法值，并转换获取数据类型
         dtypes, df = self.convert_df_dtypes(df)
         if set_typ:
@@ -584,13 +602,13 @@ class MysqlUpload:
                 if reset_id:
                     pass
                     # try:
-                    #     cursor.execute(f"SHOW COLUMNS FROM {table_name} LIKE 'id'")
+                    #     cursor.execute(f"SHOW COLUMNS FROM `{table_name}` LIKE 'id'")
                     #     result = cursor.fetchone()
                     #     if result:
-                    #         cursor.execute(f"ALTER TABLE {table_name} DROP COLUMN id;")  # 删除 id  列
+                    #         cursor.execute(f"ALTER TABLE `{table_name}` DROP COLUMN id;")  # 删除 id  列
                     #     cursor.execute(
-                    #         f"ALTER TABLE {table_name} ADD column id INT AUTO_INCREMENT PRIMARY KEY FIRST;")
-                    #     cursor.execute(f"ALTER TABLE {table_name} AUTO_INCREMENT = 1")  # 设置自增从 1 开始
+                    #         f"ALTER TABLE `{table_name}` ADD column id INT AUTO_INCREMENT PRIMARY KEY FIRST;")
+                    #     cursor.execute(f"ALTER TABLE `{table_name}` AUTO_INCREMENT = 1")  # 设置自增从 1 开始
                     # except Exception as e:
                     #     print(f'{e}')
                     #     connection.rollback()
@@ -689,13 +707,13 @@ class MysqlUpload:
 
             # # 6. 重置自增列
             # try:
-            #     cursor.execute(f"SHOW COLUMNS FROM {table_name} LIKE 'id'")
+            #     cursor.execute(f"SHOW COLUMNS FROM `{table_name}` LIKE 'id'")
             #     result = cursor.fetchone()
             #     if result:
-            #         cursor.execute(f"ALTER TABLE {table_name} DROP COLUMN id;")  # 删除 id  列
+            #         cursor.execute(f"ALTER TABLE `{table_name}` DROP COLUMN id;")  # 删除 id  列
             #     cursor.execute(
-            #         f"ALTER TABLE {table_name} ADD column id INT AUTO_INCREMENT PRIMARY KEY FIRST;")
-            #     cursor.execute(f"ALTER TABLE {table_name} AUTO_INCREMENT = 1")  # 设置自增从 1 开始
+            #         f"ALTER TABLE `{table_name}` ADD column id INT AUTO_INCREMENT PRIMARY KEY FIRST;")
+            #     cursor.execute(f"ALTER TABLE `{table_name}` AUTO_INCREMENT = 1")  # 设置自增从 1 开始
             # except Exception as e:
             #     print(f'{table_name}, -> {e}')
             #     connection.rollback()
@@ -732,7 +750,7 @@ class MysqlUpload:
         try:
             with connection.cursor() as cursor:
                 # 获取指定日期范围的数据
-                sql = f"SELECT * FROM {db_name}.{table_name} WHERE {date_name} 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]
@@ -892,7 +910,8 @@ class OptimizeDatas:
                 self.config.update({'database': self.db_name})  # 添加更新 config 字段
                 self.connection = pymysql.connect(**self.config)
                 with self.connection.cursor() as cursor:
-                    sql = f"SELECT 1 FROM {table_name} LIMIT 1"
+                    sql = f"SELECT 1 FROM `{table_name}` LIMIT 1"
+                    # print(sql)
                     cursor.execute(sql)
                     result = cursor.fetchone()
                     if not result:
@@ -900,7 +919,7 @@ class OptimizeDatas:
                         print(f'{now}数据表: {table_name}, 数据长度为 0')
                         continue  # 检查数据表是否为空
 
-                    cursor.execute(f"SHOW FULL COLUMNS FROM {table_name}")  # 查询数据表的列信息
+                    cursor.execute(f"SHOW FULL COLUMNS FROM `{table_name}`")  # 查询数据表的列信息
                     columns = cursor.fetchall()
                     date_exist = False
                     for col in columns:  # 遍历列信息，检查是否存在类型为日期的列
@@ -908,8 +927,8 @@ class OptimizeDatas:
                             date_exist = True
                             break
                     if date_exist:  # 存在日期列
-                        sql_max = f"SELECT MAX(日期) AS max_date FROM {table_name}"
-                        sql_min = f"SELECT MIN(日期) AS min_date FROM {table_name}"
+                        sql_max = f"SELECT MAX(日期) AS max_date FROM `{table_name}`"
+                        sql_min = f"SELECT MIN(日期) AS min_date FROM `{table_name}`"
                         cursor.execute(sql_max)
                         max_result = cursor.fetchone()
                         cursor.execute(sql_min)
@@ -931,13 +950,13 @@ class OptimizeDatas:
 
                     # # 5. 重置自增列 (id 列)
                     # try:
-                    #     cursor.execute(f"SHOW COLUMNS FROM {table_name} LIKE 'id'")
+                    #     cursor.execute(f"SHOW COLUMNS FROM `{table_name}` LIKE 'id'")
                     #     result = cursor.fetchone()
                     #     if result:
-                    #         cursor.execute(f"ALTER TABLE {table_name} DROP COLUMN id;")  # 删除 id  列
+                    #         cursor.execute(f"ALTER TABLE `{table_name}` DROP COLUMN id;")  # 删除 id  列
                     #     cursor.execute(
-                    #         f"ALTER TABLE {table_name} ADD column id INT AUTO_INCREMENT PRIMARY KEY FIRST;")
-                    #     cursor.execute(f"ALTER TABLE {table_name} AUTO_INCREMENT = 1")  # 设置自增从 1 开始
+                    #         f"ALTER TABLE `{table_name}` ADD column id INT AUTO_INCREMENT PRIMARY KEY FIRST;")
+                    #     cursor.execute(f"ALTER TABLE `{table_name}` AUTO_INCREMENT = 1")  # 设置自增从 1 开始
                     # except Exception as e:
                     #     print(f'{e}')
                     #     self.connection.rollback()
@@ -974,7 +993,7 @@ class OptimizeDatas:
             with self.connection.cursor() as cursor:
                 placeholders = ', '.join(['%s'] * len(duplicate_id))
                 # 移除冗余数据
-                sql = f"DELETE FROM {table_name} WHERE id IN ({placeholders})"
+                sql = f"DELETE FROM `{table_name}` WHERE id IN ({placeholders})"
                 cursor.execute(sql, duplicate_id)
                 now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S ")
                 print(f"{now}{table_name} -> {date.strftime('%Y-%m-%d')} before: {len(datas)}, remove: {cursor.rowcount}")
@@ -985,7 +1004,7 @@ class OptimizeDatas:
 
     def delete_duplicate2(self, table_name, except_key=['更新时间']):
         with self.connection.cursor() as cursor:
-            sql = f"SELECT * FROM {table_name}"  # 如果不包含日期列，则获取全部数据
+            sql = f"SELECT * FROM `{table_name}`"  # 如果不包含日期列，则获取全部数据
             cursor.execute(sql)
             datas = cursor.fetchall()
         if not datas:
@@ -1012,7 +1031,7 @@ class OptimizeDatas:
             with self.connection.cursor() as cursor:
                 placeholders = ', '.join(['%s'] * len(duplicate_id))
                 # 移除冗余数据
-                sql = f"DELETE FROM {table_name} WHERE id IN ({placeholders})"
+                sql = f"DELETE FROM `{table_name}` WHERE id IN ({placeholders})"
                 cursor.execute(sql, duplicate_id)
                 now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S ")
                 print(f"{now}{table_name} -> before: {len(datas)}, "
@@ -1064,7 +1083,7 @@ class OptimizeDatas:
         connection = pymysql.connect(**self.config)
         try:
             with connection.cursor() as cursor:
-                sql = f"SELECT * FROM {table_name} WHERE {'日期'} BETWEEN '%s' AND '%s'" % (date, date)
+                sql = f"SELECT * FROM `{table_name}` WHERE {'日期'} BETWEEN '%s' AND '%s'" % (date, date)
                 cursor.execute(sql)
                 results = cursor.fetchall()
         except Exception as e:
@@ -1096,14 +1115,14 @@ class OptimizeDatas:
                 self.config.update({'database': self.db_name})  # 添加更新 config 字段
                 self.connection = pymysql.connect(**self.config)
                 with self.connection.cursor() as cursor:
-                    cursor.execute(f"SHOW FULL COLUMNS FROM {table_name}")  # 查询数据表的列信息
+                    cursor.execute(f"SHOW FULL COLUMNS FROM `{table_name}`")  # 查询数据表的列信息
                     columns = cursor.fetchall()
                     columns = [{column['Field']: column['Type']} for column in columns]
                     for column in columns:
                         for key, value in column.items():
                             if key.endswith('_'):
                                 new_name = re.sub(r'_+$', '', key)
-                                sql = f"ALTER TABLE {table_name} CHANGE COLUMN {key} {new_name} {value}"
+                                sql = f"ALTER TABLE `{table_name}` CHANGE COLUMN {key} {new_name} {value}"
                                 cursor.execute(sql)
                 self.connection.commit()
         if self.connection:

mdbq/mysql/s_query.py

@@ -60,7 +60,7 @@ class QueryDatas:
 
         self.config.update({'database': db_name})
         connection = pymysql.connect(**self.config)  # 重新连接数据库
-        # try:
+
         with connection.cursor() as cursor:
             # 3. 获取数据表的所有列信息
             sql = 'SELECT `COLUMN_NAME` FROM information_schema.columns WHERE table_schema = %s AND table_name = %s'
@@ -98,18 +98,21 @@ class QueryDatas:
             rows = cursor.fetchall()  # 获取查询结果
             columns = [desc[0] for desc in cursor.description]
             df = pd.DataFrame(rows, columns=columns)  # 转为 df
-        # except Exception as e:
-        #     print(f'{e}')
-            return df
-        # finally:
+            if 'id' in df.columns.tolist():
+                df.pop('id')  # 默认不返回 id 列
+            if len(df) == 0:
+                print(f'database: {db_name}, table: {table_name} 查询的数据为空1')
             connection.close()
+            return df
 
-        if len(df) == 0:
-            print(f'database: {db_name}, table: {table_name} 查询的数据为空')
-            return pd.DataFrame()
-        cv = converter.DataFrameConverter()
-        df = cv.convert_df_cols(df)
-        return df
+        # if len(df) == 0:
+        #     print(f'database: {db_name}, table: {table_name} 查询的数据为空2')
+        #     return pd.DataFrame()
+        # cv = converter.DataFrameConverter()
+        # df = cv.convert_df_cols(df)
+        # if 'id' in df.columns.tolist():
+        #     df.pop('id')  # 默认不返回 id 列
+        # return df
 
     def columns_to_list(self, db_name, table_name,  columns_name) -> list:
         """

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

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

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

@@ -1,11 +1,11 @@
 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=vgswBnIvXPmll6M1DGoCWozmlM6jdQDSHPdD4NJgqgg,72179
+mdbq/aggregation/aggregation.py,sha256=ltYntRjxeN9YX1uTR2_zoYEik2PVPD70xAF98d4TcAo,74732
 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=L8JtjWpvowbauRgvXn6ukPIbUvcpgdSgatEU6vaZPRA,138540
+mdbq/aggregation/query_data.py,sha256=E1Pngmf2zp7j2dVe7i1llIEtZxa9jtfB1A5deyfIaJU,143896
 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,9 +27,9 @@ 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=mIxlamozTv0smBRDCQF16ayqn4-OTmZD9QkNgnNftIw,61666
+mdbq/mysql/mysql.py,sha256=Q4j0CTVnMXlrfFRd0yehcxNOMqLYztlx-848EIIet08,62681
 mdbq/mysql/recheck_mysql.py,sha256=rgTpvDMWYTyEn7UQdlig-pdXDluTgiU8JG6lkMh8DV0,8665
-mdbq/mysql/s_query.py,sha256=30WilUkm6lsiI5HfGphnnBSVbAXiNsgn2mEPd7AhKJs,9055
+mdbq/mysql/s_query.py,sha256=MbIprZ4yJDAZ9AahZPzl7hqS695Vs0P-AJNwAtA_EEc,9287
 mdbq/mysql/year_month_day.py,sha256=VgewoE2pJxK7ErjfviL_SMTN77ki8GVbTUcao3vFUCE,1523
 mdbq/other/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
 mdbq/other/download_sku_picture.py,sha256=tlGh3oApJyH1vNva2PsMA-mdwl13tHdyLIOLO1FOyfo,45826
@@ -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.1.8.dist-info/METADATA,sha256=3BkKptvgeELXXFhf9InK7NKm01QvWcYkPRNaQQra2qE,243
-mdbq-3.1.8.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-mdbq-3.1.8.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-3.1.8.dist-info/RECORD,,
+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,,