diff --git a/config_juxiting_yuedu.py b/config_juxiting_yuedu.py index 43630c1..ad066c5 100644 --- a/config_juxiting_yuedu.py +++ b/config_juxiting_yuedu.py @@ -218,145 +218,19 @@ ClassifyId = 1161 # 变量定义--线上环境 -# server_host = '10.200.32.39' -# login_pushreport_url = "http://10.200.32.39/jingbo-api/api/server/login" -# upload_url = "http://10.200.32.39/jingbo-api/api/analysis/reportInfo/researchUploadReportSave" -# upload_warning_url = "http://10.200.32.39/jingbo-api/api/basicBuiness/crudeOilWarning/save" -# query_data_list_item_nos_url = f"http://{server_host}/jingbo-api/api/warehouse/dwDataItem/queryDataListItemNos" -# # 上传数据项值 -# push_data_value_list_url = f"http://{server_host}/jingbo-api/api/dw/dataValue/pushDataValueList" -# push_png_report_url = f"http://{server_host}/jingbo-api/api/analysis/reportInfo/priceForecastImg" - -# login_data = { -# "data": { -# "account": "api_dev", -# "password": "ZTEwYWRjMzk0OWJhNTlhYmJlNTZlMDU3ZjIwZjg4M2U=", -# "tenantHashCode": "8a4577dbd919675758d57999a1e891fe", -# "terminal": "API" -# }, -# "funcModule": "API", -# "funcOperation": "获取token" -# } - - -# 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" # 商品分类 -# } -# } - -# warning_data = { -# "groupNo":'', # 用户组id -# "funcModule":'原油特征停更预警', -# "funcOperation":'原油特征停更预警', -# "data":{ -# 'WARNING_TYPE_NAME':'特征数据停更预警', -# 'WARNING_CONTENT':'', -# 'WARNING_DATE':'' -# } -# } - -# query_data_list_item_nos_data = { -# "funcModule": "数据项", -# "funcOperation": "查询", -# "data": { -# "dateStart":"20150101", -# "dateEnd":"20301231", -# "dataItemNoList":["MAIN_CONFT_SETTLE_PRICE"] # 数据项编码,代表 brent最低价和最高价 -# } -# } - - -# push_data_value_list_data = { -# "funcModule": "数据表信息列表", -# "funcOperation": "新增", -# "data": [ -# {"dataItemNo": "91230600716676129", -# "dataDate": "20230113", -# "dataStatus": "add", -# "dataValue": 100.11 -# }, -# {"dataItemNo": "91230600716676129P|ETHYL_BEN|CAPACITY", -# "dataDate": "20230113", -# "dataStatus": "add", -# "dataValue": 100.55 -# }, -# {"dataItemNo": "91230600716676129P|ETHYL_BEN|CAPACITY", -# "dataDate": "20230113", -# "dataStatus": "add", -# "dataValue": 100.55 -# } -# ] -# } - -# push_png_report_data = { -# "funcModule": '聚烯烃图片报告', -# "funcOperation": '上传聚烯烃PP价格预测图片报告', -# "data": { -# "groupNo": "000211", -# "updateTime": "2024-09-06 15:01:29", -# "fileBase64": '', # 文件内容base64 -# "title": '2025年8月5日日度周度预测结果', -# "billNo": '', -# } -# } - - - -# # 八大维度数据项编码 -# bdwd_items = { -# 'ciri': '原油大数据预测|FORECAST|PRICE|T', -# 'benzhou': '原油大数据预测|FORECAST|PRICE|W', -# 'cizhou': '原油大数据预测|FORECAST|PRICE|W_1', -# 'gezhou': '原油大数据预测|FORECAST|PRICE|W_2', -# 'ciyue': '原油大数据预测|FORECAST|PRICE|M_1', -# 'cieryue': '原油大数据预测|FORECAST|PRICE|M_2', -# 'cisanyue': '原油大数据预测|FORECAST|PRICE|M_3', -# 'cisiyue': '原油大数据预测|FORECAST|PRICE|M_4', -# } - -# # 报告中八大维度数据项重命名 -# columnsrename = {'jxtppbdwdbz': '本周', 'jxtppbdwdcey': '次二月', 'jxtppbdwdcr': '次日', 'jxtppbdwdcsiy': '次四月', -# 'jxtppbdwdcsany': '次三月', 'jxtppbdwdcy': '次月', 'jxtppbdwdcz': '次周', 'jxtppbdwdgz': '隔周', } - - -# # 生产环境数据库 -# host = 'rm-2zehj3r1n60ttz9x5.mysql.rds.aliyuncs.com' -# port = 3306 -# dbusername ='jingbo' -# password = 'shihua@123' -# dbname = 'jingbo' -# table_name = 'v_tbl_crude_oil_warning' - - -# 变量定义--测试环境 -server_host = '192.168.100.53:8080' # 内网 -# server_host = '183.242.74.28' # 外网 -login_pushreport_url = f"http://{server_host}/jingbo-dev/api/server/login" -upload_url = f"http://{server_host}/jingbo-dev/api/analysis/reportInfo/researchUploadReportSave" -upload_warning_url = f"http://{server_host}/jingbo-dev/api/basicBuiness/crudeOilWarning/save" -query_data_list_item_nos_url = f"http://{server_host}/jingbo-dev/api/warehouse/dwDataItem/queryDataListItemNos" +server_host = '10.200.32.39' +login_pushreport_url = "http://10.200.32.39/jingbo-api/api/server/login" +upload_url = "http://10.200.32.39/jingbo-api/api/analysis/reportInfo/researchUploadReportSave" +upload_warning_url = "http://10.200.32.39/jingbo-api/api/basicBuiness/crudeOilWarning/save" +query_data_list_item_nos_url = f"http://{server_host}/jingbo-api/api/warehouse/dwDataItem/queryDataListItemNos" # 上传数据项值 -push_data_value_list_url = f"http://{server_host}/jingbo-dev/api/dw/dataValue/pushDataValueList" -# 上传图片报告 -push_png_report_url = f"http://{server_host}/jingbo-dev/api/analysis/reportInfo/priceForecastImg" +push_data_value_list_url = f"http://{server_host}/jingbo-api/api/dw/dataValue/pushDataValueList" +push_png_report_url = f"http://{server_host}/jingbo-api/api/analysis/reportInfo/priceForecastImg" login_data = { "data": { - "account": "api_test", - # "password": "MmVmNzNlOWI0MmY0ZDdjZGUwNzE3ZjFiMDJiZDZjZWU=", # Shihua@123456 - "password": "ZTEwYWRjMzk0OWJhNTlhYmJlNTZlMDU3ZjIwZjg4M2U=", # 123456 + "account": "api_dev", + "password": "ZTEwYWRjMzk0OWJhNTlhYmJlNTZlMDU3ZjIwZjg4M2U=", "tenantHashCode": "8a4577dbd919675758d57999a1e891fe", "terminal": "API" }, @@ -364,44 +238,46 @@ login_data = { "funcOperation": "获取token" } + upload_data = { - "funcModule": '研究报告信息', - "funcOperation": '上传聚烯烃PP价格预测报告', - "data": { - "ownerAccount": 'arui', # 报告所属用户账号 - "reportType": 'OIL_PRICE_FORECAST', # 报告类型，固定为OIL_PRICE_FORECAST - "fileName": '2000-40-5-50--100-原油指标数据.xlsx-Brent活跃合约--2024-09-06-15-01-29-预测报告.pdf', # 文件名称 - "fileBase64": '', # 文件内容base64 - "categoryNo": 'yyjgycbg', # 研究报告分类编码 - "smartBusinessClassCode": 'JXTJGYCBG', # 分析报告分类编码 - "reportEmployeeCode": "E40116", # 报告人 - "reportDeptCode": "D0044", # 报告部门 - "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 = { - "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": "20200101", - "dateEnd": "20241231", - # 数据项编码,代表 PP期货 价格 - "dataItemNoList": ["MAIN_CONFT_SETTLE_PRICE"] + "dateStart":"20150101", + "dateEnd":"20301231", + "dataItemNoList":["MAIN_CONFT_SETTLE_PRICE"] # 数据项编码,代表 brent最低价和最高价 } } + push_data_value_list_data = { "funcModule": "数据表信息列表", "funcOperation": "新增", @@ -424,12 +300,11 @@ push_data_value_list_data = { ] } - push_png_report_data = { - "funcModule": '研究报告信息', - "funcOperation": '上传聚烯烃PP价格预测报告', + "funcModule": '聚烯烃图片报告', + "funcOperation": '上传聚烯烃PP价格预测图片报告', "data": { - "groupNo": "000161", + "groupNo": "000211", "updateTime": "2024-09-06 15:01:29", "fileBase64": '', # 文件内容base64 "title": '2025年8月5日日度周度预测结果', @@ -441,19 +316,148 @@ push_png_report_data = { # 八大维度数据项编码 bdwd_items = { - 'ciri': 'jxtppbdwdcr', - 'benzhou': 'jxtppbdwdbz', - 'cizhou': 'jxtppbdwdcz', - 'gezhou': 'jxtppbdwdgz', - 'ciyue': 'jxtppbdwdcy', - 'cieryue': 'jxtppbdwdcey', - 'cisanyue': 'jxtppbdwdcsany', - 'cisiyue': 'jxtppbdwdcsiy', + 'ciri': '251889263|FORECAST|PRICE|T01', + 'cierri': '251889263|FORECAST|PRICE|T02', + 'cisanri': '251889263|FORECAST|PRICE|T03', + 'cisiri': '251889263|FORECAST|PRICE|T04', + 'benzhou': '251889263|FORECAST|PRICE|T05', + 'cizhou': '251889263|FORECAST|PRICE|W_01', + 'gezhou': '251889263|FORECAST|PRICE|W_02', + 'ciyue': '251889263|FORECAST|PRICE|M_01', + 'cieryue': '251889263|FORECAST|PRICE|M_02', + 'cisanyue': '251889263|FORECAST|PRICE|M_03', + 'cisiyue': '251889263|FORECAST|PRICE|M_04', } + # 报告中八大维度数据项重命名 -columnsrename = {'jxtppbdwdbz': '本周', 'jxtppbdwdcey': '次二月', 'jxtppbdwdcr': '次日', 'jxtppbdwdcsiy': '次四月', - 'jxtppbdwdcsany': '次三月', 'jxtppbdwdcy': '次月', 'jxtppbdwdcz': '次周', 'jxtppbdwdgz': '隔周', } +columnsrename = {'251889263|FORECAST|PRICE|T05': '本周', '251889263|FORECAST|PRICE|M_02': '次二月', '251889263|FORECAST|PRICE|T01': '次日', '251889263|FORECAST|PRICE|M_04': '次四月', + '251889263|FORECAST|PRICE|M_03': '次三月', '251889263|FORECAST|PRICE|M_01': '次月', '251889263|FORECAST|PRICE|W_01': '次周', '251889263|FORECAST|PRICE|W_02': '隔周', } + + +# 生产环境数据库 +# host = 'rm-2zehj3r1n60ttz9x5.mysql.rds.aliyuncs.com' +# port = 3306 +# dbusername ='jingbo' +# password = 'shihua@123' +# dbname = 'jingbo' +# table_name = 'v_tbl_crude_oil_warning' + + +# 变量定义--测试环境 +# server_host = '192.168.100.53:8080' # 内网 +# # server_host = '183.242.74.28' # 外网 +# login_pushreport_url = f"http://{server_host}/jingbo-dev/api/server/login" +# upload_url = f"http://{server_host}/jingbo-dev/api/analysis/reportInfo/researchUploadReportSave" +# upload_warning_url = f"http://{server_host}/jingbo-dev/api/basicBuiness/crudeOilWarning/save" +# query_data_list_item_nos_url = f"http://{server_host}/jingbo-dev/api/warehouse/dwDataItem/queryDataListItemNos" +# # 上传数据项值 +# push_data_value_list_url = f"http://{server_host}/jingbo-dev/api/dw/dataValue/pushDataValueList" +# # 上传图片报告 +# push_png_report_url = f"http://{server_host}/jingbo-dev/api/analysis/reportInfo/priceForecastImg" + +# login_data = { +# "data": { +# "account": "api_test", +# # "password": "MmVmNzNlOWI0MmY0ZDdjZGUwNzE3ZjFiMDJiZDZjZWU=", # Shihua@123456 +# "password": "ZTEwYWRjMzk0OWJhNTlhYmJlNTZlMDU3ZjIwZjg4M2U=", # 123456 +# "tenantHashCode": "8a4577dbd919675758d57999a1e891fe", +# "terminal": "API" +# }, +# "funcModule": "API", +# "funcOperation": "获取token" +# } + +# upload_data = { +# "funcModule": '研究报告信息', +# "funcOperation": '上传聚烯烃PP价格预测报告', +# "data": { +# "ownerAccount": 'arui', # 报告所属用户账号 +# "reportType": 'OIL_PRICE_FORECAST', # 报告类型，固定为OIL_PRICE_FORECAST +# "fileName": '2000-40-5-50--100-原油指标数据.xlsx-Brent活跃合约--2024-09-06-15-01-29-预测报告.pdf', # 文件名称 +# "fileBase64": '', # 文件内容base64 +# "categoryNo": 'yyjgycbg', # 研究报告分类编码 +# "smartBusinessClassCode": 'JXTJGYCBG', # 分析报告分类编码 +# "reportEmployeeCode": "E40116", # 报告人 +# "reportDeptCode": "D0044", # 报告部门 +# "productGroupCode": "RAW_MATERIAL" # 商品分类 +# } +# } + + +# warning_data = { +# "funcModule": '原油特征停更预警', +# "funcOperation": '原油特征停更预警', +# "data": { +# 'WARNING_TYPE_NAME': '特征数据停更预警', +# 'WARNING_CONTENT': '', +# 'WARNING_DATE': '' +# } +# } + +# query_data_list_item_nos_data = { +# "funcModule": "数据项", +# "funcOperation": "查询", +# "data": { +# "dateStart": "20200101", +# "dateEnd": "20241231", +# # 数据项编码,代表 PP期货 价格 +# "dataItemNoList": ["MAIN_CONFT_SETTLE_PRICE"] +# } +# } + +# push_data_value_list_data = { +# "funcModule": "数据表信息列表", +# "funcOperation": "新增", +# "data": [ +# {"dataItemNo": "91230600716676129", +# "dataDate": "20230113", +# "dataStatus": "add", +# "dataValue": 100.11 +# }, +# {"dataItemNo": "91230600716676129P|ETHYL_BEN|CAPACITY", +# "dataDate": "20230113", +# "dataStatus": "add", +# "dataValue": 100.55 +# }, +# {"dataItemNo": "91230600716676129P|ETHYL_BEN|CAPACITY", +# "dataDate": "20230113", +# "dataStatus": "add", +# "dataValue": 100.55 +# } +# ] +# } + + +# push_png_report_data = { +# "funcModule": '研究报告信息', +# "funcOperation": '上传聚烯烃PP价格预测报告', +# "data": { +# "groupNo": "000161", +# "updateTime": "2024-09-06 15:01:29", +# "fileBase64": '', # 文件内容base64 +# "title": '2025年8月5日日度周度预测结果', +# "billNo": '', +# } +# } + + + +# # 八大维度数据项编码 +# bdwd_items = { +# 'ciri': 'jxtppbdwdcr', +# 'benzhou': 'jxtppbdwdbz', +# 'cizhou': 'jxtppbdwdcz', +# 'gezhou': 'jxtppbdwdgz', +# 'ciyue': 'jxtppbdwdcy', +# 'cieryue': 'jxtppbdwdcey', +# 'cisanyue': 'jxtppbdwdcsany', +# 'cisiyue': 'jxtppbdwdcsiy', +# } + +# # 报告中八大维度数据项重命名 +# columnsrename = {'jxtppbdwdbz': '本周', 'jxtppbdwdcey': '次二月', 'jxtppbdwdcr': '次日', 'jxtppbdwdcsiy': '次四月', +# 'jxtppbdwdcsany': '次三月', 'jxtppbdwdcy': '次月', 'jxtppbdwdcz': '次周', 'jxtppbdwdgz': '隔周', } # 北京环境数据库 host = '192.168.101.27' diff --git a/config_juxiting_zhoudu.py b/config_juxiting_zhoudu.py index a1bb345..50a7ed3 100644 --- a/config_juxiting_zhoudu.py +++ b/config_juxiting_zhoudu.py @@ -168,24 +168,169 @@ data = { ClassifyId = 1161 -# # 变量定义--线上环境 -# server_host = '10.200.32.39' -# login_pushreport_url = "http://10.200.32.39/jingbo-api/api/server/login" -# upload_url = "http://10.200.32.39/jingbo-api/api/analysis/reportInfo/researchUploadReportSave" -# upload_warning_url = "http://10.200.32.39/jingbo-api/api/basicBuiness/crudeOilWarning/save" -# query_data_list_item_nos_url = f"http://{server_host}/jingbo-api/api/warehouse/dwDataItem/queryDataListItemNos" -# # 上传数据项值 -# push_data_value_list_url = f"http://{server_host}/jingbo-api/api/dw/dataValue/pushDataValueList" -# # 上传停更数据到市场信息平台 -# push_waring_data_value_list_url = f"http://{server_host}/jingbo-api/api/basicBuiness/crudeOilWarning/crudeSaveOrupdate" -# # 获取预警数据中取消订阅指标ID -# get_waring_data_value_list_url = f"http://{server_host}/jingbo-api/api/basicBuiness/crudeOilWarning/dataList" +# 变量定义--线上环境 +server_host = '10.200.32.39' +login_pushreport_url = "http://10.200.32.39/jingbo-api/api/server/login" +upload_url = "http://10.200.32.39/jingbo-api/api/analysis/reportInfo/researchUploadReportSave" +upload_warning_url = "http://10.200.32.39/jingbo-api/api/basicBuiness/crudeOilWarning/save" +query_data_list_item_nos_url = f"http://{server_host}/jingbo-api/api/warehouse/dwDataItem/queryDataListItemNos" +# 上传数据项值 +push_data_value_list_url = f"http://{server_host}/jingbo-api/api/dw/dataValue/pushDataValueList" +# 上传停更数据到市场信息平台 +push_waring_data_value_list_url = f"http://{server_host}/jingbo-api/api/basicBuiness/crudeOilWarning/crudeSaveOrupdate" +# 获取预警数据中取消订阅指标ID +get_waring_data_value_list_url = f"http://{server_host}/jingbo-api/api/basicBuiness/crudeOilWarning/dataList" +login_data = { + "data": { + "account": "api_dev", + "password": "ZTEwYWRjMzk0OWJhNTlhYmJlNTZlMDU3ZjIwZjg4M2U=", + "tenantHashCode": "8a4577dbd919675758d57999a1e891fe", + "terminal": "API" + }, + "funcModule": "API", + "funcOperation": "获取token" +} + + +upload_data = { + "funcModule": '研究报告信息', + "funcOperation": '上传聚烯烃PP价格预测报告', + "data": { + "groupNo": '000211', # 用户组编号 + "ownerAccount": '36541', # 报告所属用户账号  36541 - 贾青雪 + "reportType": 'OIL_PRICE_FORECAST', # 报告类型，固定为OIL_PRICE_FORECAST + "fileName": '', # 文件名称 + "fileBase64": '', # 文件内容base64 + "categoryNo": 'jxtjgycbg', # 研究报告分类编码 + "smartBusinessClassCode": 'JXTJGYCBG', # 分析报告分类编码 + "reportEmployeeCode": "E40482", # 报告人  E40482  - 管理员  0000027663 - 刘小朋   + "reportDeptCode": "JXTJGYCBG", # 报告部门 - 002000621000  SH期货研究部   + "productGroupCode": "RAW_MATERIAL" # 商品分类 + } +} + +warning_data = { + "funcModule": '原油特征停更预警', + "funcOperation": '原油特征停更预警', + "data": { + "groupNo": "000211", + 'WARNING_TYPE_NAME': '特征数据停更预警', + 'WARNING_CONTENT': '', + 'WARNING_DATE': '' + } +} + +query_data_list_item_nos_data = { + "funcModule": "数据项", + "funcOperation": "查询", + "data": { + "dateStart": "20200101", + "dateEnd": "", + # 数据项编码,代表 PP期货 价格 + "dataItemNoList": ["MAIN_CONFT_SETTLE_PRICE"] + } +} + + +push_data_value_list_data = { + "funcModule": "数据表信息列表", + "funcOperation": "新增", + "data": [ + {"dataItemNo": "91230600716676129", + "dataDate": "20230113", + "dataStatus": "add", + "dataValue": 100.11 + }, + {"dataItemNo": "91230600716676129P|ETHYL_BEN|CAPACITY", + "dataDate": "20230113", + "dataStatus": "add", + "dataValue": 100.55 + }, + {"dataItemNo": "91230600716676129P|ETHYL_BEN|CAPACITY", + "dataDate": "20230113", + "dataStatus": "add", + "dataValue": 100.55 + } + ] +} + + +push_waring_data_value_list_data = { + "data": { + "crudeOilWarningDtoList": [ + { + "lastUpdateDate": "20240501", + "updateSuspensionCycle": 1, + "dataSource": "9", + "frequency": "1", + "indicatorName": "美元指数", + "indicatorId": "myzs001", + "warningDate": "2024-05-13" + } + ], + "dataSource": "9" + }, + "funcModule": "商品数据同步", + "funcOperation": "同步" +} + + +get_waring_data_value_list_data = { + "data": "9", "funcModule": "商品数据同步", "funcOperation": "同步"} + + + +# 八大维度数据项编码 +bdwd_items = { + 'ciri': '251889263|FORECAST|PRICE|T01', + 'cierri': '251889263|FORECAST|PRICE|T02', + 'cisanri': '251889263|FORECAST|PRICE|T03', + 'cisiri': '251889263|FORECAST|PRICE|T04', + 'benzhou': '251889263|FORECAST|PRICE|T05', + 'cizhou': '251889263|FORECAST|PRICE|W_01', + 'gezhou': '251889263|FORECAST|PRICE|W_02', + 'ciyue': '251889263|FORECAST|PRICE|M_01', + 'cieryue': '251889263|FORECAST|PRICE|M_02', + 'cisanyue': '251889263|FORECAST|PRICE|M_03', + 'cisiyue': '251889263|FORECAST|PRICE|M_04', +} + + + + +# # 生产环境数据库 +# host = 'rm-2zehj3r1n60ttz9x5.mysql.rds.aliyuncs.com' +# port = 3306 +# dbusername = 'jingbo' +# password = 'shihua@123' +# dbname = 'jingbo' +# table_name = 'v_tbl_crude_oil_warning' + + +# 变量定义--测试环境 +# server_host = '192.168.100.53' # 内网 +# # server_host = '183.242.74.28' # 外网 +# login_pushreport_url = f"http://{server_host}:8080/jingbo-dev/api/server/login" +# # 上传报告 +# upload_url = f"http://{server_host}:8080/jingbo-dev/api/analysis/reportInfo/researchUploadReportSave" +# # 停更预警 +# upload_warning_url = f"http://{server_host}:8080/jingbo-dev/api/basicBuiness/crudeOilWarning/save" +# # 查询数据项编码 +# query_data_list_item_nos_url = f"http://{server_host}:8080/jingbo-dev/api/warehouse/dwDataItem/queryDataListItemNos" +# # 上传数据项值 +# push_data_value_list_url = f"http://{server_host}:8080/jingbo-dev/api/dw/dataValue/pushDataValueList" +# # 上传停更数据到市场信息平台 +# push_waring_data_value_list_url = f"http://{server_host}:8080/jingbo-dev/api/basicBuiness/crudeOilWarning/crudeSaveOrupdate" +# # 获取预警数据中取消订阅指标ID +# get_waring_data_value_list_url = f"http://{server_host}:8080/jingbo-dev/api/basicBuiness/crudeOilWarning/dataList" + # login_data = { # "data": { -# "account": "api_dev", -# "password": "ZTEwYWRjMzk0OWJhNTlhYmJlNTZlMDU3ZjIwZjg4M2U=", +# "account": "api_test", +# # "password": "MmVmNzNlOWI0MmY0ZDdjZGUwNzE3ZjFiMDJiZDZjZWU=", # Shihua@123456 +# "password": "ZTEwYWRjMzk0OWJhNTlhYmJlNTZlMDU3ZjIwZjg4M2U=", # 123456 # "tenantHashCode": "8a4577dbd919675758d57999a1e891fe", # "terminal": "API" # }, @@ -193,29 +338,29 @@ ClassifyId = 1161 # "funcOperation": "获取token" # } - # upload_data = { # "funcModule": '研究报告信息', # "funcOperation": '上传聚烯烃PP价格预测报告', # "data": { -# "groupNo": '000211', # 用户组编号 -# "ownerAccount": '36541', # 报告所属用户账号  36541 - 贾青雪 +# "groupNo": "000127", +# "ownerAccount": 'arui', # 报告所属用户账号 # "reportType": 'OIL_PRICE_FORECAST', # 报告类型，固定为OIL_PRICE_FORECAST -# "fileName": '', # 文件名称 +# "fileName": '2000-40-5-50--100-原油指标数据.xlsx-Brent活跃合约--2024-09-06-15-01-29-预测报告.pdf', # 文件名称 # "fileBase64": '', # 文件内容base64 -# "categoryNo": 'jxtjgycbg', # 研究报告分类编码 +# "categoryNo": 'yyjgycbg', # 研究报告分类编码 # "smartBusinessClassCode": 'JXTJGYCBG', # 分析报告分类编码 -# "reportEmployeeCode": "E40482", # 报告人  E40482  - 管理员  0000027663 - 刘小朋   -# "reportDeptCode": "JXTJGYCBG", # 报告部门 - 002000621000  SH期货研究部   -# "productGroupCode": "RAW_MATERIAL" # 商品分类 +# "reportEmployeeCode": "E40116", # 报告人 +# "reportDeptCode": "D0044", # 报告部门 +# "productGroupCode": "RAW_MATERIAL" # 商品分类 # } # } +# # 已弃用 # warning_data = { # "funcModule": '原油特征停更预警', # "funcOperation": '原油特征停更预警', # "data": { -# "groupNo": "000211", +# "groupNo": "000127", # 'WARNING_TYPE_NAME': '特征数据停更预警', # 'WARNING_CONTENT': '', # 'WARNING_DATE': '' @@ -233,7 +378,6 @@ ClassifyId = 1161 # } # } - # push_data_value_list_data = { # "funcModule": "数据表信息列表", # "funcOperation": "新增", @@ -283,155 +427,17 @@ ClassifyId = 1161 # # 八大维度数据项编码 # bdwd_items = { -# 'ciri': '91371600MAC3TYFN6M|LSBM00007|FORECAST_PRICE', -# 'benzhou': '91371600MAC3TYFN6M|LSBM00007|FORECAST_PRICE01', -# 'cizhou': '91371600MAC3TYFN6M|LSBM00007|FORECAST_PRICE02', -# 'gezhou': '91371600MAC3TYFN6M|LSBM00007|FORECAST_PRICE03', -# 'ciyue': '91371600MAC3TYFN6M|LSBM00007|FORECAST_PRICE04', -# 'cieryue': '91371600MAC3TYFN6M|LSBM00007|FORECAST_PRICE05', -# 'cisanyue': '91371600MAC3TYFN6M|LSBM00007|FORECAST_PRICE06', -# 'cisiyue': '91371600MAC3TYFN6M|LSBM00007|FORECAST_PRICE07', +# 'ciri': 'jxtppbdwdcr', +# 'benzhou': 'jxtppbdwdbz', +# 'cizhou': 'jxtppbdwdcz', +# 'gezhou': 'jxtppbdwdgz', +# 'ciyue': 'jxtppbdwdcy', +# 'cieryue': 'jxtppbdwdcey', +# 'cisanyue': 'jxtppbdwdcsany', +# 'cisiyue': 'jxtppbdwdcsiy', # } -# # 生产环境数据库 -# host = 'rm-2zehj3r1n60ttz9x5.mysql.rds.aliyuncs.com' -# port = 3306 -# dbusername = 'jingbo' -# password = 'shihua@123' -# dbname = 'jingbo' -# table_name = 'v_tbl_crude_oil_warning' - - -# 变量定义--测试环境 -server_host = '192.168.100.53' # 内网 -# server_host = '183.242.74.28' # 外网 -login_pushreport_url = f"http://{server_host}:8080/jingbo-dev/api/server/login" -# 上传报告 -upload_url = f"http://{server_host}:8080/jingbo-dev/api/analysis/reportInfo/researchUploadReportSave" -# 停更预警 -upload_warning_url = f"http://{server_host}:8080/jingbo-dev/api/basicBuiness/crudeOilWarning/save" -# 查询数据项编码 -query_data_list_item_nos_url = f"http://{server_host}:8080/jingbo-dev/api/warehouse/dwDataItem/queryDataListItemNos" -# 上传数据项值 -push_data_value_list_url = f"http://{server_host}:8080/jingbo-dev/api/dw/dataValue/pushDataValueList" -# 上传停更数据到市场信息平台 -push_waring_data_value_list_url = f"http://{server_host}:8080/jingbo-dev/api/basicBuiness/crudeOilWarning/crudeSaveOrupdate" -# 获取预警数据中取消订阅指标ID -get_waring_data_value_list_url = f"http://{server_host}:8080/jingbo-dev/api/basicBuiness/crudeOilWarning/dataList" - -login_data = { - "data": { - "account": "api_test", - # "password": "MmVmNzNlOWI0MmY0ZDdjZGUwNzE3ZjFiMDJiZDZjZWU=", # Shihua@123456 - "password": "ZTEwYWRjMzk0OWJhNTlhYmJlNTZlMDU3ZjIwZjg4M2U=", # 123456 - "tenantHashCode": "8a4577dbd919675758d57999a1e891fe", - "terminal": "API" - }, - "funcModule": "API", - "funcOperation": "获取token" -} - -upload_data = { - "funcModule": '研究报告信息', - "funcOperation": '上传聚烯烃PP价格预测报告', - "data": { - "groupNo": "000127", - "ownerAccount": 'arui', # 报告所属用户账号 - "reportType": 'OIL_PRICE_FORECAST', # 报告类型，固定为OIL_PRICE_FORECAST - "fileName": '2000-40-5-50--100-原油指标数据.xlsx-Brent活跃合约--2024-09-06-15-01-29-预测报告.pdf', # 文件名称 - "fileBase64": '', # 文件内容base64 - "categoryNo": 'yyjgycbg', # 研究报告分类编码 - "smartBusinessClassCode": 'JXTJGYCBG', # 分析报告分类编码 - "reportEmployeeCode": "E40116", # 报告人 - "reportDeptCode": "D0044", # 报告部门 - "productGroupCode": "RAW_MATERIAL" # 商品分类 - } -} - -# 已弃用 -warning_data = { - "funcModule": '原油特征停更预警', - "funcOperation": '原油特征停更预警', - "data": { - "groupNo": "000127", - 'WARNING_TYPE_NAME': '特征数据停更预警', - 'WARNING_CONTENT': '', - 'WARNING_DATE': '' - } -} - -query_data_list_item_nos_data = { - "funcModule": "数据项", - "funcOperation": "查询", - "data": { - "dateStart": "20200101", - "dateEnd": "", - # 数据项编码,代表 PP期货 价格 - "dataItemNoList": ["MAIN_CONFT_SETTLE_PRICE"] - } -} - -push_data_value_list_data = { - "funcModule": "数据表信息列表", - "funcOperation": "新增", - "data": [ - {"dataItemNo": "91230600716676129", - "dataDate": "20230113", - "dataStatus": "add", - "dataValue": 100.11 - }, - {"dataItemNo": "91230600716676129P|ETHYL_BEN|CAPACITY", - "dataDate": "20230113", - "dataStatus": "add", - "dataValue": 100.55 - }, - {"dataItemNo": "91230600716676129P|ETHYL_BEN|CAPACITY", - "dataDate": "20230113", - "dataStatus": "add", - "dataValue": 100.55 - } - ] -} - - -push_waring_data_value_list_data = { - "data": { - "crudeOilWarningDtoList": [ - { - "lastUpdateDate": "20240501", - "updateSuspensionCycle": 1, - "dataSource": "9", - "frequency": "1", - "indicatorName": "美元指数", - "indicatorId": "myzs001", - "warningDate": "2024-05-13" - } - ], - "dataSource": "9" - }, - "funcModule": "商品数据同步", - "funcOperation": "同步" -} - - -get_waring_data_value_list_data = { - "data": "9", "funcModule": "商品数据同步", "funcOperation": "同步"} - - -# 八大维度数据项编码 -bdwd_items = { - 'ciri': 'jxtppbdwdcr', - 'benzhou': 'jxtppbdwdbz', - 'cizhou': 'jxtppbdwdcz', - 'gezhou': 'jxtppbdwdgz', - 'ciyue': 'jxtppbdwdcy', - 'cieryue': 'jxtppbdwdcey', - 'cisanyue': 'jxtppbdwdcsany', - 'cisiyue': 'jxtppbdwdcsiy', -} - - # 北京环境数据库 host = '192.168.101.27' port = 3306 @@ -458,7 +464,7 @@ DEFAULT_CONFIG = { # 开关 is_train = True # 是否训练 is_debug = False # 是否调试 -is_eta = False # 是否使用eta接口 +is_eta = True # 是否使用eta接口 is_market = True # 是否通过市场信息平台获取特征 ,在is_eta 为true 的情况下生效 is_timefurture = True # 是否使用时间特征 is_fivemodels = False # 是否使用之前保存的最佳的5个模型 diff --git a/lib/tools.py b/lib/tools.py index 1dde014..5e047bf 100644 --- a/lib/tools.py +++ b/lib/tools.py @@ -37,6 +37,7 @@ import os import time import logging import json +from PIL import Image from dotenv import load_dotenv @@ -1214,8 +1215,42 @@ def plot_pp_predict_result(y_hat, global_config,wd='yuedu'): pad_inches=1.0 # 增加边距 ) - +def merge_images(image1_path, image2_path, output_path, direction='horizontal'): + img1 = Image.open(image1_path).convert('RGBA') # 保留透明通道 + img2 = Image.open(image2_path).convert('RGBA') + # 获取图片尺寸 + width1, height1 = img1.size + width2, height2 = img2.size + + # 统一尺寸（横向拼接统一高度，纵向拼接统一宽度） + if direction == 'horizontal': + new_height = max(height1, height2) + img1 = img1.resize((int(width1 * new_height / height1), new_height), Image.LANCZOS) + img2 = img2.resize((int(width2 * new_height / height2), new_height), Image.LANCZOS) + else: + new_width = max(width1, width2) + img1 = img1.resize((new_width, int(height1 * new_width / width1)), Image.LANCZOS) + img2 = img2.resize((new_width, int(height2 * new_width / width2)), Image.LANCZOS) + + # 重新获取调整后的尺寸 + width1, height1 = img1.size + width2, height2 = img2.size + + # 创建带透明背景的新图片 + new_img = Image.new('RGBA', ( + width1 + width2 if direction == 'horizontal' else max(width1, width2), + max(height1, height2) if direction == 'horizontal' else height1 + height2 + ), (255, 255, 255, 0)) # 透明背景 + + # 粘贴图片 + new_img.paste(img1, (0, 0)) + new_img.paste(img2, (width1, 0) if direction == 'horizontal' else (0, height1)) + + # 保存为PNG保留透明（如需JPG可转为RGB） + new_img.save(output_path, 'PNG') if __name__ == '__main__': print('This is a tool, not a script.') + + diff --git a/main_juxiting_yuedu.py b/main_juxiting_yuedu.py index 6c4be64..e443ba3 100644 --- a/main_juxiting_yuedu.py +++ b/main_juxiting_yuedu.py @@ -2,7 +2,7 @@ from lib.dataread import * from config_juxiting_yuedu import * -from lib.tools import SendMail, convert_df_to_pydantic_pp, exception_logger, find_best_models, get_modelsname +from lib.tools import SendMail, convert_df_to_pydantic_pp, exception_logger, find_best_models, get_modelsname, merge_images from models.nerulforcastmodels import ex_Model_Juxiting, model_losss_juxiting, pp_bdwd_png, pp_export_pdf import datetime import torch @@ -553,12 +553,21 @@ if __name__ == '__main__': # continue # global_config['end_time'] = '2025-08-13' - # predict_main() + predict_main() # push_market_value() # sql_inset_predict(global_config) # 图片报告 # global_config['end_time'] = '2025-08-12' - logger.info('图片报告ing') - pp_bdwd_png(global_config=global_config) - logger.info('图片报告end') + # logger.info('图片报告ing') + # pp_bdwd_png(global_config=global_config) + # logger.info('图片报告end') + + + # 替换为你的图片路径 + # img1 = 'E:\code\PriceForecast\juxitingyuedudataset\pp_zhouducorrelation.png' + # img2 = 'E:\code\PriceForecast\juxitingdataset\特征重要度1.png' + # output = 'merged_result.png' + + # # 水平拼接（默认） + # merge_images(img1, img2, output, direction='vertical') diff --git a/models/nerulforcastmodels.py b/models/nerulforcastmodels.py index 3ebe94e..6720730 100644 --- a/models/nerulforcastmodels.py +++ b/models/nerulforcastmodels.py @@ -444,7 +444,7 @@ def ex_Model_Juxiting(df, horizon, input_size, train_steps, val_check_steps, ear nf_preds = nf_preds.reset_index() # 保存模型 # 生成文件名，按时间 精确到分 - filename = f'{settings}--{now}.joblib' + filename = f'{settings}.joblib' # 文件名去掉冒号 filename = filename.replace(':', '-') # 替换冒号 dump(nf, os.path.join(config.dataset, filename)) @@ -3585,6 +3585,8 @@ def pp_bdwd_png(global_config): print(y_hat_riduzhoudu) # 绘制PP期货日度周度预测结果的图表 plot_pp_predict_result(y_hat_riduzhoudu, global_config, 'zhoudu') + # 拼接两个图为一个图 + def pp_export_pdf_v1(num_indicators=475, num_models=21, num_dayindicator=202, inputsize=5, dataset='dataset', time='2024-07-30', reportname='report.pdf'):