mdbq 3.6.13__py3-none-any.whl → 3.6.14__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/aggregation/optimize_data.py +7 -5
- mdbq/aggregation/query_data.py +41 -39
- mdbq/mysql/mysql.py +121 -119
- mdbq/mysql/s_query.py +9 -7
- mdbq/redis/getredis.py +0 -1
- {mdbq-3.6.13.dist-info → mdbq-3.6.14.dist-info}/METADATA +1 -1
- {mdbq-3.6.13.dist-info → mdbq-3.6.14.dist-info}/RECORD +9 -9
- {mdbq-3.6.13.dist-info → mdbq-3.6.14.dist-info}/WHEEL +0 -0
- {mdbq-3.6.13.dist-info → mdbq-3.6.14.dist-info}/top_level.txt +0 -0
@@ -7,6 +7,7 @@ import subprocess
|
|
7
7
|
import psutil
|
8
8
|
import time
|
9
9
|
import platform
|
10
|
+
import logging
|
10
11
|
"""
|
11
12
|
对指定数据库所有冗余数据进行清理
|
12
13
|
"""
|
@@ -22,8 +23,9 @@ elif socket.gethostname() in ['company', 'Mac2.local']:
|
|
22
23
|
username, password, host, port = data['username'], data['password'], data['host'], data['port']
|
23
24
|
service_database = {'company': 'mysql'}
|
24
25
|
if not username:
|
25
|
-
|
26
|
+
logger.info(f'找不到主机:')
|
26
27
|
|
28
|
+
logger = logging.getLogger(__name__)
|
27
29
|
|
28
30
|
|
29
31
|
def restart_mongodb():
|
@@ -39,7 +41,7 @@ def restart_mongodb():
|
|
39
41
|
return None
|
40
42
|
|
41
43
|
if platform.system() == 'Windows':
|
42
|
-
|
44
|
+
logger.info(f'即将重启 mongodb 服务')
|
43
45
|
time.sleep(60)
|
44
46
|
stop_command = f'net stop MongoDB'
|
45
47
|
subprocess.call(stop_command, shell=True) # 停止MongoDB服务
|
@@ -50,7 +52,7 @@ def restart_mongodb():
|
|
50
52
|
time.sleep(30)
|
51
53
|
|
52
54
|
elif platform.system() == 'Darwin':
|
53
|
-
|
55
|
+
logger.info(f'即将重启 mongodb 服务')
|
54
56
|
time.sleep(60)
|
55
57
|
result = get_pid('mongod') # 获取进程号
|
56
58
|
if result: # 有 pid, 重启服务
|
@@ -59,13 +61,13 @@ def restart_mongodb():
|
|
59
61
|
time.sleep(10)
|
60
62
|
command = f'mongod --config /usr/local/mongodb/mongod.conf'
|
61
63
|
subprocess.call(command, shell=True)
|
62
|
-
#
|
64
|
+
# logger.info('已重启服务')
|
63
65
|
else: # 没有启动, 则启动服务
|
64
66
|
command = f'mongod --config /usr/local/mongodb/mongod.conf'
|
65
67
|
subprocess.call(command, shell=True)
|
66
68
|
|
67
69
|
elif platform.system() == 'Linux':
|
68
|
-
|
70
|
+
logger.info(f'即将重启 mongodb 服务')
|
69
71
|
time.sleep(60)
|
70
72
|
command = f'service mongod restart'
|
71
73
|
subprocess.call(command, shell=True)
|
mdbq/aggregation/query_data.py
CHANGED
@@ -20,6 +20,7 @@ import time
|
|
20
20
|
import calendar
|
21
21
|
import concurrent.futures
|
22
22
|
import traceback
|
23
|
+
import logging
|
23
24
|
|
24
25
|
"""
|
25
26
|
|
@@ -73,6 +74,7 @@ else:
|
|
73
74
|
charset='utf8mb4'
|
74
75
|
)
|
75
76
|
targe_host = 'xigua_lx'
|
77
|
+
logger = logging.getLogger(__name__)
|
76
78
|
|
77
79
|
|
78
80
|
class MysqlDatasQuery:
|
@@ -96,13 +98,13 @@ class MysqlDatasQuery:
|
|
96
98
|
try:
|
97
99
|
return func(*args, **kwargs)
|
98
100
|
except Exception as e:
|
99
|
-
|
101
|
+
logger.info(f'{func.__name__}, {e}') # 将异常信息返回
|
100
102
|
with open(error_file, 'a') as f:
|
101
103
|
now = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
|
102
104
|
f.write(f'\n{now}\n')
|
103
105
|
# f.write(f'报错的文件:\n{e.__traceback__.tb_frame.f_globals["__file__"]}\n') # 发生异常所在的文件
|
104
106
|
traceback.print_exc(file=open(error_file, 'a')) # 返回完整的堆栈信息
|
105
|
-
|
107
|
+
logger.info(f'更多信息请查看日志文件: {error_file}')
|
106
108
|
|
107
109
|
return wrapper
|
108
110
|
|
@@ -215,7 +217,7 @@ class MysqlDatasQuery:
|
|
215
217
|
min_date = df['日期'].min()
|
216
218
|
max_date = df['日期'].max()
|
217
219
|
now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
|
218
|
-
|
220
|
+
logger.info(f'{now} 正在更新: mysql ({host}:{port}) {db_name}/{table_name} -> {min_date}~{max_date}')
|
219
221
|
m_engine.df_to_mysql(
|
220
222
|
df=df,
|
221
223
|
db_name=db_name,
|
@@ -276,7 +278,7 @@ class MysqlDatasQuery:
|
|
276
278
|
'更新时间': 'timestamp',
|
277
279
|
}
|
278
280
|
now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
|
279
|
-
|
281
|
+
logger.info(f'{now} 正在更新: mysql ({host}:{port}) 属性设置3/商品索引表_主推排序调用')
|
280
282
|
m_engine.df_to_mysql(
|
281
283
|
df=df_pic,
|
282
284
|
db_name='属性设置3',
|
@@ -400,7 +402,7 @@ class MysqlDatasQuery:
|
|
400
402
|
min_date = df['日期'].min()
|
401
403
|
max_date = df['日期'].max()
|
402
404
|
now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
|
403
|
-
|
405
|
+
logger.info(f'{now} 正在更新: mysql ({host}:{port}) {db_name}/{table_name} -> {min_date}~{max_date}')
|
404
406
|
m_engine.df_to_mysql(
|
405
407
|
df=df,
|
406
408
|
db_name=db_name,
|
@@ -524,7 +526,7 @@ class MysqlDatasQuery:
|
|
524
526
|
min_date = df['日期'].min()
|
525
527
|
max_date = df['日期'].max()
|
526
528
|
now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
|
527
|
-
|
529
|
+
logger.info(f'{now} 正在更新: mysql ({host}:{port}) {db_name}/{table_name} -> {min_date}~{max_date}')
|
528
530
|
m_engine.df_to_mysql(
|
529
531
|
df=df,
|
530
532
|
db_name=db_name,
|
@@ -634,7 +636,7 @@ class MysqlDatasQuery:
|
|
634
636
|
min_date = df['日期'].min()
|
635
637
|
max_date = df['日期'].max()
|
636
638
|
now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
|
637
|
-
|
639
|
+
logger.info(f'{now} 正在更新: mysql ({host}:{port}) {db_name}/{table_name} -> {min_date}~{max_date}')
|
638
640
|
m_engine.df_to_mysql(
|
639
641
|
df=df,
|
640
642
|
db_name=db_name,
|
@@ -866,7 +868,7 @@ class MysqlDatasQuery:
|
|
866
868
|
min_date = df['日期'].min()
|
867
869
|
max_date = df['日期'].max()
|
868
870
|
now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
|
869
|
-
|
871
|
+
logger.info(f'{now} 正在更新: mysql ({host}:{port}) {db_name}/{table_name} -> {min_date}~{max_date}')
|
870
872
|
m_engine.df_to_mysql(
|
871
873
|
df=df,
|
872
874
|
db_name=db_name,
|
@@ -1015,7 +1017,7 @@ class MysqlDatasQuery:
|
|
1015
1017
|
min_date = df['日期'].min()
|
1016
1018
|
max_date = df['日期'].max()
|
1017
1019
|
now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
|
1018
|
-
|
1020
|
+
logger.info(f'{now} 正在更新: mysql ({host}:{port}) {db_name}/{table_name} -> {min_date}~{max_date}')
|
1019
1021
|
m_engine.df_to_mysql(
|
1020
1022
|
df=df,
|
1021
1023
|
db_name=db_name,
|
@@ -1153,7 +1155,7 @@ class MysqlDatasQuery:
|
|
1153
1155
|
min_date = df['日期'].min()
|
1154
1156
|
max_date = df['日期'].max()
|
1155
1157
|
now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
|
1156
|
-
|
1158
|
+
logger.info(f'{now} 正在更新: mysql ({host}:{port}) {db_name}/{table_name} -> {min_date}~{max_date}')
|
1157
1159
|
m_engine.df_to_mysql(
|
1158
1160
|
df=df,
|
1159
1161
|
db_name=db_name,
|
@@ -1279,7 +1281,7 @@ class MysqlDatasQuery:
|
|
1279
1281
|
min_date = df['日期'].min()
|
1280
1282
|
max_date = df['日期'].max()
|
1281
1283
|
now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
|
1282
|
-
|
1284
|
+
logger.info(f'{now} 正在更新: mysql ({host}:{port}) {db_name}/{table_name} -> {min_date}~{max_date}')
|
1283
1285
|
m_engine.df_to_mysql(
|
1284
1286
|
df=df,
|
1285
1287
|
db_name=db_name,
|
@@ -1349,7 +1351,7 @@ class MysqlDatasQuery:
|
|
1349
1351
|
if not self.update_service:
|
1350
1352
|
return
|
1351
1353
|
now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
|
1352
|
-
|
1354
|
+
logger.info(f'{now} 正在更新: mysql ({host}:{port}) {db_name}/{table_name}')
|
1353
1355
|
m_engine.df_to_mysql(
|
1354
1356
|
df=df,
|
1355
1357
|
db_name=db_name,
|
@@ -1419,7 +1421,7 @@ class MysqlDatasQuery:
|
|
1419
1421
|
if not self.update_service:
|
1420
1422
|
return
|
1421
1423
|
now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
|
1422
|
-
|
1424
|
+
logger.info(f'{now} 正在更新: mysql ({host}:{port}) {db_name}/{table_name}')
|
1423
1425
|
m_engine.df_to_mysql(
|
1424
1426
|
df=df,
|
1425
1427
|
db_name=db_name,
|
@@ -1481,7 +1483,7 @@ class MysqlDatasQuery:
|
|
1481
1483
|
p = df.pop('上市年份')
|
1482
1484
|
df.insert(loc=5, column='上市年份', value=p)
|
1483
1485
|
now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
|
1484
|
-
|
1486
|
+
logger.info(f'{now} 正在更新: mysql ({host}:{port}) {db_name}/{table_name}')
|
1485
1487
|
set_typ = {
|
1486
1488
|
'日期': 'date',
|
1487
1489
|
'店铺id': 'bigint',
|
@@ -1632,7 +1634,7 @@ class MysqlDatasQuery:
|
|
1632
1634
|
min_date = df['日期'].min().strftime("%Y-%m-%d")
|
1633
1635
|
max_date = df['日期'].max().strftime("%Y-%m-%d")
|
1634
1636
|
now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
|
1635
|
-
|
1637
|
+
logger.info(f'{now} 正在更新: mysql ({host}:{port}) {db_name}/{table_name} -> {min_date}~{max_date}')
|
1636
1638
|
m_engine.df_to_mysql(
|
1637
1639
|
df=df,
|
1638
1640
|
db_name=db_name,
|
@@ -1755,7 +1757,7 @@ class MysqlDatasQuery:
|
|
1755
1757
|
min_date = df['日期'].min().strftime("%Y-%m-%d")
|
1756
1758
|
max_date = df['日期'].max().strftime("%Y-%m-%d")
|
1757
1759
|
now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
|
1758
|
-
|
1760
|
+
logger.info(f'{now} 正在更新: mysql ({host}:{port}) {db_name}/{table_name} -> {min_date}~{max_date}')
|
1759
1761
|
m_engine.df_to_mysql(
|
1760
1762
|
df=df,
|
1761
1763
|
db_name=db_name,
|
@@ -1815,7 +1817,7 @@ class MysqlDatasQuery:
|
|
1815
1817
|
min_date = pd.to_datetime(df['日期'].min()).strftime('%Y-%m-%d')
|
1816
1818
|
max_date = pd.to_datetime(df['日期'].max()).strftime('%Y-%m-%d')
|
1817
1819
|
now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
|
1818
|
-
|
1820
|
+
logger.info(f'{now} 正在更新: mysql ({host}:{port}) {db_name}/{table_name} -> {min_date}~{max_date}')
|
1819
1821
|
m_engine.df_to_mysql(
|
1820
1822
|
df=df,
|
1821
1823
|
db_name=db_name,
|
@@ -1933,7 +1935,7 @@ class MysqlDatasQuery:
|
|
1933
1935
|
min_date = df['日期'].min()
|
1934
1936
|
max_date = df['日期'].max()
|
1935
1937
|
now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
|
1936
|
-
|
1938
|
+
logger.info(f'{now} 正在更新: mysql ({host}:{port}) {db_name}/{table_name} -> {min_date}~{max_date}')
|
1937
1939
|
m_engine.df_to_mysql(
|
1938
1940
|
df=df,
|
1939
1941
|
db_name=db_name,
|
@@ -1980,7 +1982,7 @@ class MysqlDatasQuery:
|
|
1980
1982
|
# min_date = df['日期'].min()
|
1981
1983
|
# max_date = df['日期'].max()
|
1982
1984
|
# now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
|
1983
|
-
#
|
1985
|
+
# logger.info(f'{now} 正在更新: mysql ({host}:{port}) {db_name}/京东_京准通_按spu -> {min_date}~{max_date}')
|
1984
1986
|
# m_engine.df_to_mysql(
|
1985
1987
|
# df=df,
|
1986
1988
|
# db_name=db_name,
|
@@ -2061,7 +2063,7 @@ class MysqlDatasQuery:
|
|
2061
2063
|
min_date = df['日期'].min()
|
2062
2064
|
max_date = df['日期'].max()
|
2063
2065
|
now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
|
2064
|
-
|
2066
|
+
logger.info(f'{now} 正在更新: mysql ({host}:{port}) {db_name}/{table_name} -> {min_date}~{max_date}')
|
2065
2067
|
m_engine.df_to_mysql(
|
2066
2068
|
df=df,
|
2067
2069
|
db_name=db_name,
|
@@ -2175,7 +2177,7 @@ class MysqlDatasQuery:
|
|
2175
2177
|
min_date = df['日期'].min()
|
2176
2178
|
max_date = df['日期'].max()
|
2177
2179
|
now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
|
2178
|
-
|
2180
|
+
logger.info(f'{now} 正在更新: mysql ({host}:{port}) {db_name}/{table_name} -> {min_date}~{max_date}')
|
2179
2181
|
m_engine.df_to_mysql(
|
2180
2182
|
df=df,
|
2181
2183
|
db_name=db_name,
|
@@ -2267,7 +2269,7 @@ class MysqlDatasQuery:
|
|
2267
2269
|
min_date = df['日期'].min()
|
2268
2270
|
max_date = df['日期'].max()
|
2269
2271
|
now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
|
2270
|
-
|
2272
|
+
logger.info(f'{now} 正在更新: mysql ({host}:{port}) {db_name}/{table_name} -> {min_date}~{max_date}')
|
2271
2273
|
m_engine.df_to_mysql(
|
2272
2274
|
df=df,
|
2273
2275
|
db_name=db_name,
|
@@ -2351,7 +2353,7 @@ class MysqlDatasQuery:
|
|
2351
2353
|
min_date = df['日期'].min()
|
2352
2354
|
max_date = df['日期'].max()
|
2353
2355
|
now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
|
2354
|
-
|
2356
|
+
logger.info(f'{now} 正在更新: mysql ({host}:{port}) {db_name}/{table_name} -> {min_date}~{max_date}')
|
2355
2357
|
m_engine.df_to_mysql(
|
2356
2358
|
df=df,
|
2357
2359
|
db_name=db_name,
|
@@ -2452,7 +2454,7 @@ class MysqlDatasQuery:
|
|
2452
2454
|
min_date = df['日期'].min()
|
2453
2455
|
max_date = df['日期'].max()
|
2454
2456
|
now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
|
2455
|
-
|
2457
|
+
logger.info(f'{now} 正在更新: mysql ({host}:{port}) {db_name}/{table_name} -> {min_date}~{max_date}')
|
2456
2458
|
m_engine.df_to_mysql(
|
2457
2459
|
df=df,
|
2458
2460
|
db_name=db_name,
|
@@ -2603,7 +2605,7 @@ class MysqlDatasQuery:
|
|
2603
2605
|
min_date = df['日期'].min()
|
2604
2606
|
max_date = df['日期'].max()
|
2605
2607
|
now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
|
2606
|
-
|
2608
|
+
logger.info(f'{now} 正在更新: mysql ({host}:{port}) {db_name}/{table_name} -> {min_date}~{max_date}')
|
2607
2609
|
new_dict = {
|
2608
2610
|
'日期': '',
|
2609
2611
|
'店铺名称': '',
|
@@ -3005,7 +3007,7 @@ class MysqlDatasQuery:
|
|
3005
3007
|
min_date = df['日期'].min().strftime('%Y-%m-%d')
|
3006
3008
|
max_date = df['日期'].max().strftime('%Y-%m-%d')
|
3007
3009
|
now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
|
3008
|
-
|
3010
|
+
logger.info(f'{now} 正在更新: mysql ({host}:{port}) {db_name}/{table_name} -> {min_date}~{max_date}')
|
3009
3011
|
m_engine.df_to_mysql(
|
3010
3012
|
df=df,
|
3011
3013
|
db_name=db_name,
|
@@ -3108,7 +3110,7 @@ class MysqlDatasQuery:
|
|
3108
3110
|
min_date = df['日期'].min()
|
3109
3111
|
max_date = df['日期'].max()
|
3110
3112
|
now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
|
3111
|
-
|
3113
|
+
logger.info(f'{now} 正在更新: mysql ({host}:{port}) {db_name}/{table_name} -> {min_date}~{max_date}')
|
3112
3114
|
m_engine.df_to_mysql(
|
3113
3115
|
df=df,
|
3114
3116
|
db_name=db_name,
|
@@ -3173,7 +3175,7 @@ class MysqlDatasQuery:
|
|
3173
3175
|
min_date = df['日期'].min()
|
3174
3176
|
max_date = df['日期'].max()
|
3175
3177
|
now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
|
3176
|
-
|
3178
|
+
logger.info(f'{now} 正在更新: mysql ({host}:{port}) {db_name}/{table_name} -> {min_date}~{max_date}')
|
3177
3179
|
m_engine.df_to_mysql(
|
3178
3180
|
df=df,
|
3179
3181
|
db_name=db_name,
|
@@ -3298,7 +3300,7 @@ class MysqlDatasQuery:
|
|
3298
3300
|
min_date = df['日期'].min()
|
3299
3301
|
max_date = df['日期'].max()
|
3300
3302
|
now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
|
3301
|
-
|
3303
|
+
logger.info(f'{now} 正在更新: mysql ({host}:{port}) {db_name}/{table_name} -> {min_date}~{max_date}')
|
3302
3304
|
m_engine.df_to_mysql(
|
3303
3305
|
df=df,
|
3304
3306
|
db_name=db_name,
|
@@ -3675,7 +3677,7 @@ class MysqlDatasQuery:
|
|
3675
3677
|
'退货量_发货后': ('退货量_发货后', np.sum),
|
3676
3678
|
}
|
3677
3679
|
)
|
3678
|
-
#
|
3680
|
+
# logger.info(df.info())
|
3679
3681
|
|
3680
3682
|
idbm['宝贝id'] = idbm['宝贝id'].astype('int64')
|
3681
3683
|
# 1. id 编码表合并图片表
|
@@ -3684,7 +3686,7 @@ class MysqlDatasQuery:
|
|
3684
3686
|
# 2. df 合并商品成本表
|
3685
3687
|
df_cb = pd.merge(df_cb, cost, how='left', left_on='商家编码', right_on='款号')
|
3686
3688
|
df_cb = df_cb[['宝贝id', '商家编码', '商品图片', '成本价']]
|
3687
|
-
#
|
3689
|
+
# logger.info(df_cb.info())
|
3688
3690
|
# 3. 合并 df
|
3689
3691
|
df = pd.merge(df, df_cb, how='left', left_on='商品id', right_on='宝贝id')
|
3690
3692
|
df.drop(labels='宝贝id', axis=1, inplace=True)
|
@@ -3723,7 +3725,7 @@ class MysqlDatasQuery:
|
|
3723
3725
|
min_date = df['日期'].min()
|
3724
3726
|
max_date = df['日期'].max()
|
3725
3727
|
now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
|
3726
|
-
|
3728
|
+
logger.info(f'{now} 正在更新: mysql ({host}:{port}) {db_name}/{table_name} -> {min_date}~{max_date}')
|
3727
3729
|
m_engine.df_to_mysql(
|
3728
3730
|
df=df,
|
3729
3731
|
db_name=db_name,
|
@@ -3846,7 +3848,7 @@ class MysqlDatasQuery:
|
|
3846
3848
|
min_date = df['日期'].min()
|
3847
3849
|
max_date = df['日期'].max()
|
3848
3850
|
now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
|
3849
|
-
|
3851
|
+
logger.info(f'{now} 正在更新: mysql ({host}:{port}) {db_name}/{table_name} -> {min_date}~{max_date}')
|
3850
3852
|
m_engine.df_to_mysql(
|
3851
3853
|
df=df,
|
3852
3854
|
db_name=db_name,
|
@@ -3930,7 +3932,7 @@ class MysqlDatasQuery:
|
|
3930
3932
|
min_date = df['日期'].min().strftime("%Y-%m-%d")
|
3931
3933
|
max_date = df['日期'].max().strftime("%Y-%m-%d")
|
3932
3934
|
now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
|
3933
|
-
|
3935
|
+
logger.info(f'{now} 正在更新: mysql ({host}:{port}) {db_name}/{table_name} -> {min_date}~{max_date}')
|
3934
3936
|
m_engine.df_to_mysql(
|
3935
3937
|
df=df,
|
3936
3938
|
db_name=db_name,
|
@@ -4005,11 +4007,11 @@ def date_table():
|
|
4005
4007
|
for name, group in grouped:
|
4006
4008
|
if num > 52:
|
4007
4009
|
num = 1
|
4008
|
-
#
|
4010
|
+
# logger.info(f'Group: {name}')
|
4009
4011
|
group['第n周_new'] = f'第{num}周'
|
4010
4012
|
num += 1
|
4011
4013
|
__res.append(group.copy())
|
4012
|
-
#
|
4014
|
+
# logger.info(group)
|
4013
4015
|
# break
|
4014
4016
|
df = pd.concat(__res, ignore_index=True)
|
4015
4017
|
# df['日期'] = df['日期'].apply(lambda x: pd.to_datetime(x))
|
@@ -4072,7 +4074,7 @@ def date_table():
|
|
4072
4074
|
|
4073
4075
|
def query1(months=1, less_dict=[]):
|
4074
4076
|
if months == 0:
|
4075
|
-
|
4077
|
+
logger.info(f'months 不建议为 0 ')
|
4076
4078
|
return
|
4077
4079
|
sdq = MysqlDatasQuery() # 实例化数据处理类
|
4078
4080
|
sdq.months = months # 设置数据周期, 1 表示近 2 个月
|
@@ -4101,7 +4103,7 @@ def query1(months=1, less_dict=[]):
|
|
4101
4103
|
|
4102
4104
|
def query2(months=1, less_dict=[]):
|
4103
4105
|
if months == 0:
|
4104
|
-
|
4106
|
+
logger.info(f'months 不建议为 0 ')
|
4105
4107
|
return
|
4106
4108
|
sdq = MysqlDatasQuery() # 实例化数据处理类
|
4107
4109
|
sdq.months = months # 设置数据周期, 1 表示近 2 个月
|
@@ -4118,7 +4120,7 @@ def query2(months=1, less_dict=[]):
|
|
4118
4120
|
|
4119
4121
|
def query3(months=1, less_dict=[]):
|
4120
4122
|
if months == 0:
|
4121
|
-
|
4123
|
+
logger.info(f'months 不建议为 0 ')
|
4122
4124
|
return
|
4123
4125
|
sdq = MysqlDatasQuery() # 实例化数据处理类
|
4124
4126
|
sdq.months = months # 设置数据周期, 1 表示近 2 个月
|