mdbq 3.6.1__tar.gz → 3.6.2__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {mdbq-3.6.1 → mdbq-3.6.2}/PKG-INFO +1 -1
- {mdbq-3.6.1 → mdbq-3.6.2}/mdbq/mysql/mysql.py +2 -0
- {mdbq-3.6.1 → mdbq-3.6.2}/mdbq/redis/getredis.py +5 -2
- {mdbq-3.6.1 → mdbq-3.6.2}/mdbq.egg-info/PKG-INFO +1 -1
- {mdbq-3.6.1 → mdbq-3.6.2}/setup.py +1 -1
- {mdbq-3.6.1 → mdbq-3.6.2}/README.txt +0 -0
- {mdbq-3.6.1 → mdbq-3.6.2}/mdbq/__init__.py +0 -0
- {mdbq-3.6.1 → mdbq-3.6.2}/mdbq/__version__.py +0 -0
- {mdbq-3.6.1 → mdbq-3.6.2}/mdbq/aggregation/__init__.py +0 -0
- {mdbq-3.6.1 → mdbq-3.6.2}/mdbq/aggregation/aggregation.py +0 -0
- {mdbq-3.6.1 → mdbq-3.6.2}/mdbq/aggregation/datashow.py +0 -0
- {mdbq-3.6.1 → mdbq-3.6.2}/mdbq/aggregation/optimize_data.py +0 -0
- {mdbq-3.6.1 → mdbq-3.6.2}/mdbq/aggregation/query_data.py +0 -0
- {mdbq-3.6.1 → mdbq-3.6.2}/mdbq/bdup/__init__.py +0 -0
- {mdbq-3.6.1 → mdbq-3.6.2}/mdbq/bdup/bdup.py +0 -0
- {mdbq-3.6.1 → mdbq-3.6.2}/mdbq/config/__init__.py +0 -0
- {mdbq-3.6.1 → mdbq-3.6.2}/mdbq/config/myconfig.py +0 -0
- {mdbq-3.6.1 → mdbq-3.6.2}/mdbq/config/products.py +0 -0
- {mdbq-3.6.1 → mdbq-3.6.2}/mdbq/config/set_support.py +0 -0
- {mdbq-3.6.1 → mdbq-3.6.2}/mdbq/dataframe/__init__.py +0 -0
- {mdbq-3.6.1 → mdbq-3.6.2}/mdbq/dataframe/converter.py +0 -0
- {mdbq-3.6.1 → mdbq-3.6.2}/mdbq/log/__init__.py +0 -0
- {mdbq-3.6.1 → mdbq-3.6.2}/mdbq/log/mylogger.py +0 -0
- {mdbq-3.6.1 → mdbq-3.6.2}/mdbq/mongo/__init__.py +0 -0
- {mdbq-3.6.1 → mdbq-3.6.2}/mdbq/mongo/mongo.py +0 -0
- {mdbq-3.6.1 → mdbq-3.6.2}/mdbq/mysql/__init__.py +0 -0
- {mdbq-3.6.1 → mdbq-3.6.2}/mdbq/mysql/recheck_mysql.py +0 -0
- {mdbq-3.6.1 → mdbq-3.6.2}/mdbq/mysql/s_query.py +0 -0
- {mdbq-3.6.1 → mdbq-3.6.2}/mdbq/mysql/year_month_day.py +0 -0
- {mdbq-3.6.1 → mdbq-3.6.2}/mdbq/other/__init__.py +0 -0
- {mdbq-3.6.1 → mdbq-3.6.2}/mdbq/other/download_sku_picture.py +0 -0
- {mdbq-3.6.1 → mdbq-3.6.2}/mdbq/other/porxy.py +0 -0
- {mdbq-3.6.1 → mdbq-3.6.2}/mdbq/other/pov_city.py +0 -0
- {mdbq-3.6.1 → mdbq-3.6.2}/mdbq/other/sku_picture.py +0 -0
- {mdbq-3.6.1 → mdbq-3.6.2}/mdbq/other/ua_sj.py +0 -0
- {mdbq-3.6.1 → mdbq-3.6.2}/mdbq/pbix/__init__.py +0 -0
- {mdbq-3.6.1 → mdbq-3.6.2}/mdbq/pbix/pbix_refresh.py +0 -0
- {mdbq-3.6.1 → mdbq-3.6.2}/mdbq/pbix/refresh_all.py +0 -0
- {mdbq-3.6.1 → mdbq-3.6.2}/mdbq/pbix/refresh_all_old.py +0 -0
- {mdbq-3.6.1 → mdbq-3.6.2}/mdbq/redis/__init__.py +0 -0
- {mdbq-3.6.1 → mdbq-3.6.2}/mdbq/spider/__init__.py +0 -0
- {mdbq-3.6.1 → mdbq-3.6.2}/mdbq/spider/aikucun.py +0 -0
- {mdbq-3.6.1 → mdbq-3.6.2}/mdbq.egg-info/SOURCES.txt +0 -0
- {mdbq-3.6.1 → mdbq-3.6.2}/mdbq.egg-info/dependency_links.txt +0 -0
- {mdbq-3.6.1 → mdbq-3.6.2}/mdbq.egg-info/top_level.txt +0 -0
- {mdbq-3.6.1 → mdbq-3.6.2}/setup.cfg +0 -0
|
@@ -949,6 +949,8 @@ class MysqlUpload:
|
|
|
949
949
|
df['日期'] = pd.to_datetime(df['日期'], format='%Y-%m-%d', errors='ignore')
|
|
950
950
|
min_year = df['日期'].min(skipna=True).year
|
|
951
951
|
min_month = df['日期'].min(skipna=True).month
|
|
952
|
+
if 0 < int(min_month) < 10 and not str(min_month).startswith('0'):
|
|
953
|
+
min_month = f'0{min_month}'
|
|
952
954
|
if str(cut_data).lower() == 'year':
|
|
953
955
|
table_name = f'{table_name}_{min_year}'
|
|
954
956
|
elif str(cut_data).lower() == 'month':
|
|
@@ -131,9 +131,12 @@ class RedisData(object):
|
|
|
131
131
|
before_df1 = before_df[(before_df['日期'] < _min_date)]
|
|
132
132
|
before_df2 = before_df[(before_df['日期'] > _max_date)]
|
|
133
133
|
_df = pd.concat([_df, before_df1, before_df2], ignore_index=True, axis=0)
|
|
134
|
-
if '日期' in _df.columns.tolist():
|
|
134
|
+
# if '日期' in _df.columns.tolist():
|
|
135
|
+
# _df['日期'] = _df['日期'].astype('str')
|
|
136
|
+
for col in _df.columns.tolist():
|
|
135
137
|
# 存入 redis ，需要先格式化为 str，避免日期变整数形式
|
|
136
|
-
_df[
|
|
138
|
+
if _df[col].dtype == 'datetime64[ns]':
|
|
139
|
+
_df[col] = _df[col].astype('str')
|
|
137
140
|
jsondata = _df.to_json(orient='records', force_ascii=False)
|
|
138
141
|
self.redis_engin.set(my_key, jsondata)
|
|
139
142
|
self.redis_engin.expire(my_key, self.minute * 60) # 设置缓存过期时间: 分钟
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|