From 38953fb51a4620f0d4b0b57f3c805d597cde909a Mon Sep 17 00:00:00 2001 From: workpc Date: Mon, 18 Aug 2025 16:23:06 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=9A=E7=83=AF=E7=83=83=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E6=9C=88=E5=BA=A6=E6=8A=A5=E5=91=8A=E9=A2=84=E6=B5=8B=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E8=B0=83=E6=95=B4=E4=B8=BA=E6=9C=88=E5=88=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config_juxiting_yuedu.py | 70 ++++++++++++++++++------------------- juxiting_push_png_report.py | 5 +-- lib/tools.py | 8 +++++ 3 files changed, 45 insertions(+), 38 deletions(-) diff --git a/config_juxiting_yuedu.py b/config_juxiting_yuedu.py index cce174e..e83ad66 100644 --- a/config_juxiting_yuedu.py +++ b/config_juxiting_yuedu.py @@ -240,40 +240,40 @@ login_data = { upload_data = { - "funcModule":'研究报告信息', - "funcOperation":'上传原油价格预测报告', - "data":{ - "groupNo":'', # 用户组id - "ownerAccount":'27663', #报告所属用户账号 27663 - 刘小朋 - "reportType":'OIL_PRICE_FORECAST', # 报告类型，固定为OIL_PRICE_FORECAST - "fileName": '', #文件名称 - "fileBase64": '' ,#文件内容base64 - "categoryNo":'yyjgycbg', # 研究报告分类编码 - "smartBusinessClassCode":'YCJGYCBG', #分析报告分类编码 - "reportEmployeeCode":"E40482" ,# 报告人 E40482 - 管理员 0000027663 - 刘小朋 - "reportDeptCode" :"002000621000", # 报告部门 - 002000621000 SH期货研究部 - "productGroupCode":"RAW_MATERIAL" # 商品分类 - } + "funcModule": '研究报告信息', + "funcOperation": '上传原油价格预测报告', + "data": { + "groupNo": '', # 用户组id + "ownerAccount": '27663', # 报告所属用户账号 27663 - 刘小朋 + "reportType": 'OIL_PRICE_FORECAST', # 报告类型，固定为OIL_PRICE_FORECAST + "fileName": '', # 文件名称 + "fileBase64": '', # 文件内容base64 + "categoryNo": 'yyjgycbg', # 研究报告分类编码 + "smartBusinessClassCode": 'YCJGYCBG', # 分析报告分类编码 + "reportEmployeeCode": "E40482", # 报告人 E40482 - 管理员 0000027663 - 刘小朋 + "reportDeptCode": "002000621000", # 报告部门 - 002000621000 SH期货研究部 + "productGroupCode": "RAW_MATERIAL" # 商品分类 + } } warning_data = { - "groupNo":'', # 用户组id - "funcModule":'原油特征停更预警', - "funcOperation":'原油特征停更预警', - "data":{ - 'WARNING_TYPE_NAME':'特征数据停更预警', - 'WARNING_CONTENT':'', - 'WARNING_DATE':'' - } + "groupNo": '', # 用户组id + "funcModule": '原油特征停更预警', + "funcOperation": '原油特征停更预警', + "data": { + 'WARNING_TYPE_NAME': '特征数据停更预警', + 'WARNING_CONTENT': '', + 'WARNING_DATE': '' + } } query_data_list_item_nos_data = { - "funcModule": "数据项", - "funcOperation": "查询", + "funcModule": "数据项", + "funcOperation": "查询", "data": { - "dateStart":"20150101", - "dateEnd":"20301231", - "dataItemNoList":["MAIN_CONFT_SETTLE_PRICE"] # 数据项编码,代表 brent最低价和最高价 + "dateStart": "20150101", + "dateEnd": "20301231", + "dataItemNoList": ["MAIN_CONFT_SETTLE_PRICE"] # 数据项编码,代表 brent最低价和最高价 } } @@ -313,7 +313,6 @@ push_png_report_data = { } - # 八大维度数据项编码 bdwd_items = { 'ciri': '251889263|FORECAST|PRICE|T01', @@ -338,7 +337,7 @@ columnsrename = {'251889263|FORECAST|PRICE|T05': '本周', '251889263|FORECAST|P # 生产环境数据库 host = 'rm-2zehj3r1n60ttz9x5.mysql.rds.aliyuncs.com' port = 3306 -dbusername ='jingbo' +dbusername = 'jingbo' password = 'shihua@123' dbname = 'jingbo' table_name = 'v_tbl_crude_oil_warning' @@ -442,7 +441,6 @@ table_name = 'v_tbl_crude_oil_warning' # } - # # 八大维度数据项编码 # bdwd_items = { # 'ciri': 'jxtppbdwdcr', @@ -460,12 +458,12 @@ table_name = 'v_tbl_crude_oil_warning' # 'jxtppbdwdcsany': '次三月', 'jxtppbdwdcy': '次月', 'jxtppbdwdcz': '次周', 'jxtppbdwdgz': '隔周', } # 北京环境数据库 -# host = '192.168.101.27' -# port = 3306 -# dbusername = 'root' -# password = '123456' -# dbname = 'jingbo_test' -# table_name = 'v_tbl_crude_oil_warning' +host = '192.168.101.27' +port = 3306 +dbusername = 'root' +password = '123456' +dbname = 'jingbo_test' +table_name = 'v_tbl_crude_oil_warning' DEFAULT_CONFIG = { 'feature_factor_frequency': 'D', diff --git a/juxiting_push_png_report.py b/juxiting_push_png_report.py index b7dab8d..dcfb49b 100644 --- a/juxiting_push_png_report.py +++ b/juxiting_push_png_report.py @@ -116,9 +116,10 @@ if __name__ == '__main__': # 图片报告 try: logger.info('图片报告ing') + global_config['end_time'] = '2025-08-14' pp_bdwd_png(global_config=global_config) logger.info('图片报告end') except Exception as e: logger.info(f'图片报告失败：{e}') - time.sleep(5) - push_png_report() + # time.sleep(5) + # push_png_report() diff --git a/lib/tools.py b/lib/tools.py index 0ac24e1..6c8264b 100644 --- a/lib/tools.py +++ b/lib/tools.py @@ -1114,6 +1114,14 @@ def plot_pp_predict_result(y_hat, global_config, wd='yuedu'): if wd == 'yuedu': y = pd.read_csv(os.path.join( global_config['dataset'], '指标数据.csv'))[['ds', 'y']][-12:] + # 修改ds列的日为1日 + print(y_hat) + y_hat['ds'] = pd.to_datetime(y_hat['ds']) + y_hat['ds'] = y_hat['ds'].dt.strftime('%Y-%m-01') + # ds 转换为日期类型 + y_hat['ds'] = pd.to_datetime(y_hat['ds']) + print(y_hat) + xgx_df = pd.read_csv(os.path.join( global_config['dataset'], '相关系数.csv')) title = 'PP期货月维度预测价格走势'