mdbq 3.6.1__py3-none-any.whl → 3.6.2__py3-none-any.whl

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/mysql/mysql.py CHANGED
@@ -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':
mdbq/redis/getredis.py CHANGED
@@ -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['日期'] = _df['日期'].astype('str')
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) # 设置缓存过期时间: 分钟
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: mdbq
3
- Version: 3.6.1
3
+ Version: 3.6.2
4
4
  Home-page: https://pypi.org/project/mdbq
5
5
  Author: xigua,
6
6
  Author-email: 2587125111@qq.com
@@ -18,7 +18,7 @@ mdbq/log/mylogger.py,sha256=oaT7Bp-Hb9jZt52seP3ISUuxVcI19s4UiqTeouScBO0,3258
18
18
  mdbq/mongo/__init__.py,sha256=SILt7xMtQIQl_m-ik9WLtJSXIVf424iYgCfE_tnQFbw,13
19
19
  mdbq/mongo/mongo.py,sha256=M9DUeUCMPDngkwn9-ui0uTiFrvfNU1kLs22s5SmoNm0,31899
20
20
  mdbq/mysql/__init__.py,sha256=A_DPJyAoEvTSFojiI2e94zP0FKtCkkwKP1kYUCSyQzo,11
21
- mdbq/mysql/mysql.py,sha256=r5YkS1WnV9dGtEHFcwaekjtUBgFcvkdmwif-m52CyHI,99560
21
+ mdbq/mysql/mysql.py,sha256=_jFo2_OC1BNm5wEmoYiBG_TcuNNA2xUWKNhMBfgDiAM,99699
22
22
  mdbq/mysql/recheck_mysql.py,sha256=ppBTfBLgkRWirMVZ31e_ZPULiGPJU7K3PP9G6QBZ3QI,8605
23
23
  mdbq/mysql/s_query.py,sha256=Z0C3lQQcGtnizyVHa62HYIAqZ8R3KeSHP-N0O7Qb5eU,9280
24
24
  mdbq/mysql/year_month_day.py,sha256=VgewoE2pJxK7ErjfviL_SMTN77ki8GVbTUcao3vFUCE,1523
@@ -33,10 +33,10 @@ mdbq/pbix/pbix_refresh.py,sha256=JUjKW3bNEyoMVfVfo77UhguvS5AWkixvVhDbw4_MHco,239
33
33
  mdbq/pbix/refresh_all.py,sha256=OBT9EewSZ0aRS9vL_FflVn74d4l2G00wzHiikCC4TC0,5926
34
34
  mdbq/pbix/refresh_all_old.py,sha256=_pq3WSQ728GPtEG5pfsZI2uTJhU8D6ra-htIk1JXYzw,7192
35
35
  mdbq/redis/__init__.py,sha256=YtgBlVSMDphtpwYX248wGge1x-Ex_mMufz4-8W0XRmA,12
36
- mdbq/redis/getredis.py,sha256=ZnYIaE0bW5Igp7jMPQc7t1zJlzkIazEgIgKZMMTczJI,8508
36
+ mdbq/redis/getredis.py,sha256=zpkdy624Drj2ujvOcldKS4PSN8bfKKmIIRkB0KqL7x0,8657
37
37
  mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
38
38
  mdbq/spider/aikucun.py,sha256=v7VO5gtEXR6_4Q6ujbTyu1FHu7TXHcwSQ6hIO249YH0,22208
39
- mdbq-3.6.1.dist-info/METADATA,sha256=w3q_26jfhrh0Pi7F0BiAdHxeT3J9BUHfSsGz-BhfH2o,243
40
- mdbq-3.6.1.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
41
- mdbq-3.6.1.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
42
- mdbq-3.6.1.dist-info/RECORD,,
39
+ mdbq-3.6.2.dist-info/METADATA,sha256=EtY3g6bo6ZkYkc_47W3VJO6toGHWZXIFVaBgXZtjX_U,243
40
+ mdbq-3.6.2.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
41
+ mdbq-3.6.2.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
42
+ mdbq-3.6.2.dist-info/RECORD,,
@@ -1,5 +1,5 @@
1
1
  Wheel-Version: 1.0
2
- Generator: setuptools (70.1.0)
2
+ Generator: bdist_wheel (0.44.0)
3
3
  Root-Is-Purelib: true
4
4
  Tag: py3-none-any
5
5