diff --git a/config_jingbo.py b/config_jingbo.py index 161f7ad..e0f7bc4 100644 --- a/config_jingbo.py +++ b/config_jingbo.py @@ -93,151 +93,13 @@ ClassifyId = 1214 # 变量定义--线上环境 -# 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}: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=", -# "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":"20200101", -# "dateEnd":"20241231", -# "dataItemNoList":["Brentzdj","Brentzgj"] # 数据项编码,代表 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_waring_data_value_list_data = { -# "data": { -# "crudeOilWarningDtoList": [ -# { -# "lastUpdateDate": "20240501", -# "updateSuspensionCycle": 1, -# "dataSource": "8", -# "frequency": "1", -# "indicatorName": "美元指数", -# "indicatorId": "myzs001", -# "warningDate": "2024-05-13" -# } -# ], -# "dataSource": "8" -# }, -# "funcModule": "商品数据同步", -# "funcOperation": "同步" -# } - - -# get_waring_data_value_list_data = { -# "data": "8", "funcModule": "商品数据同步", "funcOperation": "同步"} - - -# # 八大维度数据项编码 -# 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', -# } - - -# # 生产环境数据库 -# 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" +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}:8080/jingbo-dev/api/dw/dataValue/pushDataValueList" +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}:8080/jingbo-dev/api/basicBuiness/crudeOilWarning/crudeSaveOrupdate" # 获取预警数据中取消订阅指标ID @@ -246,9 +108,8 @@ get_waring_data_value_list_url = f"http://{server_host}:8080/jingbo-dev/api/basi login_data = { "data": { - "account": "api_test", - # "password": "MmVmNzNlOWI0MmY0ZDdjZGUwNzE3ZjFiMDJiZDZjZWU=", # Shihua@123456 - "password": "ZTEwYWRjMzk0OWJhNTlhYmJlNTZlMDU3ZjIwZjg4M2U=", # 123456 + "account": "api_dev", + "password": "ZTEwYWRjMzk0OWJhNTlhYmJlNTZlMDU3ZjIwZjg4M2U=", "tenantHashCode": "8a4577dbd919675758d57999a1e891fe", "terminal": "API" }, @@ -256,25 +117,24 @@ login_data = { "funcOperation": "获取token" } + upload_data = { - "groupNo": '', # 用户组id "funcModule": '研究报告信息', "funcOperation": '上传原油价格预测报告', "data": { - "ownerAccount": 'arui', # 报告所属用户账号 + "groupNo": '', # 用户组id + "ownerAccount": '27663', # 报告所属用户账号 27663 - 刘小朋 "reportType": 'OIL_PRICE_FORECAST', # 报告类型，固定为OIL_PRICE_FORECAST - "fileName": '2000-40-5-50--100-原油指标数据.xlsx-Brent活跃合约--2024-09-06-15-01-29-预测报告.pdf', # 文件名称 + "fileName": '', # 文件名称 "fileBase64": '', # 文件内容base64 "categoryNo": 'yyjgycbg', # 研究报告分类编码 "smartBusinessClassCode": 'YCJGYCBG', # 分析报告分类编码 - "reportEmployeeCode": "E40116", # 报告人 - "reportDeptCode": "D0044", # 报告部门 + "reportEmployeeCode": "E40482", # 报告人 E40482 - 管理员 0000027663 - 刘小朋 + "reportDeptCode": "002000621000", # 报告部门 - 002000621000 SH期货研究部 "productGroupCode": "RAW_MATERIAL" # 商品分类 } } - -# 已弃用 warning_data = { "groupNo": '', # 用户组id "funcModule": '原油特征停更预警', @@ -296,6 +156,7 @@ query_data_list_item_nos_data = { } } + push_data_value_list_data = { "funcModule": "数据表信息列表", "funcOperation": "新增", @@ -318,6 +179,7 @@ push_data_value_list_data = { ] } + push_waring_data_value_list_data = { "data": { "crudeOilWarningDtoList": [ @@ -341,30 +203,168 @@ push_waring_data_value_list_data = { get_waring_data_value_list_data = { "data": "8", "funcModule": "商品数据同步", "funcOperation": "同步"} + # 八大维度数据项编码 bdwd_items = { - 'ciri': 'yyycbdwdcr', - 'benzhou': 'yyycbdwdbz', - 'cizhou': 'yyycbdwdcz', - 'gezhou': 'yyycbdwdgz', - 'ciyue': 'yyycbdwdcy', - 'cieryue': 'yyycbdwdcey', - 'cisanyue': 'yyycbdwdcsy', - 'cisiyue': 'yyycbdwdcsiy', + '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', } -# 北京环境数据库 -host = '192.168.101.27' +# 生产环境数据库 +host = 'rm-2zehj3r1n60ttz9x5.mysql.rds.aliyuncs.com' port = 3306 -dbusername = 'root' -password = '123456' -dbname = 'jingbo_test' +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 = { +# "groupNo": '', # 用户组id +# "funcModule": '研究报告信息', +# "funcOperation": '上传原油价格预测报告', +# "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": 'YCJGYCBG', # 分析报告分类编码 +# "reportEmployeeCode": "E40116", # 报告人 +# "reportDeptCode": "D0044", # 报告部门 +# "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": "20200101", +# "dateEnd": "20241231", +# "dataItemNoList": ["Brentzdj", "Brentzgj"] # 数据项编码,代表 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_waring_data_value_list_data = { +# "data": { +# "crudeOilWarningDtoList": [ +# { +# "lastUpdateDate": "20240501", +# "updateSuspensionCycle": 1, +# "dataSource": "8", +# "frequency": "1", +# "indicatorName": "美元指数", +# "indicatorId": "myzs001", +# "warningDate": "2024-05-13" +# } +# ], +# "dataSource": "8" +# }, +# "funcModule": "商品数据同步", +# "funcOperation": "同步" +# } + + +# get_waring_data_value_list_data = { +# "data": "8", "funcModule": "商品数据同步", "funcOperation": "同步"} + +# # 八大维度数据项编码 +# bdwd_items = { +# 'ciri': 'yyycbdwdcr', +# 'benzhou': 'yyycbdwdbz', +# 'cizhou': 'yyycbdwdcz', +# 'gezhou': 'yyycbdwdgz', +# 'ciyue': 'yyycbdwdcy', +# 'cieryue': 'yyycbdwdcey', +# 'cisanyue': 'yyycbdwdcsy', +# 'cisiyue': 'yyycbdwdcsiy', +# } + + +# # 北京环境数据库 +# host = '192.168.101.27' +# port = 3306 +# dbusername = 'root' +# password = '123456' +# dbname = 'jingbo_test' +# table_name = 'v_tbl_crude_oil_warning' + + # 开关 -is_train = False # 是否训练 +is_train = True # 是否训练 is_debug = False # 是否调试 is_eta = True # 是否使用eta接口 is_market = True # 是否通过市场信息平台获取特征 ,在is_eta 为true 的情况下生效 diff --git a/config_jingbo_yuedu.py b/config_jingbo_yuedu.py index 7942a82..07ed40b 100644 --- a/config_jingbo_yuedu.py +++ b/config_jingbo_yuedu.py @@ -146,7 +146,6 @@ modelsindex = [ ] - # eta 上传预测结果的请求体，后面发起请求的时候更改 model datalist 数据 data = { "IndexCode": "", @@ -173,123 +172,18 @@ ClassifyId = 1214 # 变量定义--线上环境 -# 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" - -# 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":"20200101", -# "dateEnd":"20241231", -# "dataItemNoList":["Brentzdj","Brentzgj"] # 数据项编码,代表 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 -# } -# ] -# } -# # 八大维度数据项编码 -# 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', -# } - - -# # 生产环境数据库 -# 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_data_value_list_url = f"http://{server_host}/jingbo-api/api/dw/dataValue/pushDataValueList" login_data = { "data": { - "account": "api_test", - # "password": "MmVmNzNlOWI0MmY0ZDdjZGUwNzE3ZjFiMDJiZDZjZWU=", # Shihua@123456 - "password": "ZTEwYWRjMzk0OWJhNTlhYmJlNTZlMDU3ZjIwZjg4M2U=", # 123456 + "account": "api_dev", + "password": "ZTEwYWRjMzk0OWJhNTlhYmJlNTZlMDU3ZjIwZjg4M2U=", "tenantHashCode": "8a4577dbd919675758d57999a1e891fe", "terminal": "API" }, @@ -297,24 +191,24 @@ login_data = { "funcOperation": "获取token" } + upload_data = { - "groupNo": '', # 用户组id "funcModule": '研究报告信息', "funcOperation": '上传原油价格预测报告', "data": { - "ownerAccount": 'arui', # 报告所属用户账号 + "groupNo": '', # 用户组id + "ownerAccount": '27663', # 报告所属用户账号 27663 - 刘小朋 "reportType": 'OIL_PRICE_FORECAST', # 报告类型，固定为OIL_PRICE_FORECAST - "fileName": '2000-40-5-50--100-原油指标数据.xlsx-Brent活跃合约--2024-09-06-15-01-29-预测报告.pdf', # 文件名称 + "fileName": '', # 文件名称 "fileBase64": '', # 文件内容base64 "categoryNo": 'yyjgycbg', # 研究报告分类编码 "smartBusinessClassCode": 'YCJGYCBG', # 分析报告分类编码 - "reportEmployeeCode": "E40116", # 报告人 - "reportDeptCode": "D0044", # 报告部门 + "reportEmployeeCode": "E40482", # 报告人 E40482 - 管理员 0000027663 - 刘小朋 + "reportDeptCode": "002000621000", # 报告部门 - 002000621000 SH期货研究部 "productGroupCode": "RAW_MATERIAL" # 商品分类 } } - warning_data = { "groupNo": '', # 用户组id "funcModule": '原油特征停更预警', @@ -336,6 +230,7 @@ query_data_list_item_nos_data = { } } + push_data_value_list_data = { "funcModule": "数据表信息列表", "funcOperation": "新增", @@ -359,28 +254,139 @@ push_data_value_list_data = { } # 八大维度数据项编码 bdwd_items = { - 'ciri': 'yyycbdwdcr', - 'benzhou': 'yyycbdwdbz', - 'cizhou': 'yyycbdwdcz', - 'gezhou': 'yyycbdwdgz', - 'ciyue': 'yyycbdwdcy', - 'cieryue': 'yyycbdwdcey', - 'cisanyue': 'yyycbdwdcsy', - 'cisiyue': 'yyycbdwdcsiy', + '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={'yyycbdwdbz': '本周', 'yyycbdwdcey': '次二月', 'yyycbdwdcr': '次日', 'yyycbdwdcsiy': '次四月', - 'yyycbdwdcsy': '次三月', 'yyycbdwdcy': '次月', 'yyycbdwdcz': '次周', 'yyycbdwdgz': '隔周', } -# 北京环境数据库 -host = '192.168.101.27' +columnsrename = { + '原油大数据预测|FORECAST|PRICE|T': '次日', '原油大数据预测|FORECAST|PRICE|W': '本周', + '原油大数据预测|FORECAST|PRICE|W_1': '次周', '原油大数据预测|FORECAST|PRICE|W_2': '隔周', + '原油大数据预测|FORECAST|PRICE|M_1': '次月', '原油大数据预测|FORECAST|PRICE|M_2': '次二月', + '原油大数据预测|FORECAST|PRICE|M_3': '次三月', '原油大数据预测|FORECAST|PRICE|M_4': '次四月' +} + +# 生产环境数据库 +host = 'rm-2zehj3r1n60ttz9x5.mysql.rds.aliyuncs.com' port = 3306 -dbusername = 'root' -password = '123456' -dbname = 'jingbo_test' +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" + +# login_data = { +# "data": { +# "account": "api_test", +# # "password": "MmVmNzNlOWI0MmY0ZDdjZGUwNzE3ZjFiMDJiZDZjZWU=", # Shihua@123456 +# "password": "ZTEwYWRjMzk0OWJhNTlhYmJlNTZlMDU3ZjIwZjg4M2U=", # 123456 +# "tenantHashCode": "8a4577dbd919675758d57999a1e891fe", +# "terminal": "API" +# }, +# "funcModule": "API", +# "funcOperation": "获取token" +# } + +# upload_data = { +# "groupNo": '', # 用户组id +# "funcModule": '研究报告信息', +# "funcOperation": '上传原油价格预测报告', +# "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": 'YCJGYCBG', # 分析报告分类编码 +# "reportEmployeeCode": "E40116", # 报告人 +# "reportDeptCode": "D0044", # 报告部门 +# "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": "20200101", +# "dateEnd": "20241231", +# "dataItemNoList": ["Brentzdj", "Brentzgj"] # 数据项编码,代表 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 +# } +# ] +# } +# # 八大维度数据项编码 +# bdwd_items = { +# 'ciri': 'yyycbdwdcr', +# 'benzhou': 'yyycbdwdbz', +# 'cizhou': 'yyycbdwdcz', +# 'gezhou': 'yyycbdwdgz', +# 'ciyue': 'yyycbdwdcy', +# 'cieryue': 'yyycbdwdcey', +# 'cisanyue': 'yyycbdwdcsy', +# 'cisiyue': 'yyycbdwdcsiy', +# } + +# # 报告中八大维度数据项重命名 +# columnsrename = {'yyycbdwdbz': '本周', 'yyycbdwdcey': '次二月', 'yyycbdwdcr': '次日', 'yyycbdwdcsiy': '次四月', +# 'yyycbdwdcsy': '次三月', 'yyycbdwdcy': '次月', 'yyycbdwdcz': '次周', 'yyycbdwdgz': '隔周', } +# # 北京环境数据库 +# host = '192.168.101.27' +# port = 3306 +# dbusername = 'root' +# password = '123456' +# dbname = 'jingbo_test' +# table_name = 'v_tbl_crude_oil_warning' + + # 开关 is_train = True # 是否训练 is_debug = False # 是否调试 diff --git a/config_jingbo_zhoudu.py b/config_jingbo_zhoudu.py index b1c3d3b..90ca98d 100644 --- a/config_jingbo_zhoudu.py +++ b/config_jingbo_zhoudu.py @@ -119,124 +119,18 @@ ClassifyId = 1214 # 变量定义--线上环境 -# 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" - -# 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":"20200101", -# "dateEnd":"20241231", -# "dataItemNoList":["Brentzdj","Brentzgj"] # 数据项编码,代表 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 -# } -# ] -# } -# # 八大维度数据项编码 -# 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', -# } - - -# # 生产环境数据库 -# 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_data_value_list_url = f"http://{server_host}/jingbo-api/api/dw/dataValue/pushDataValueList" login_data = { "data": { - "account": "api_test", - # "password": "MmVmNzNlOWI0MmY0ZDdjZGUwNzE3ZjFiMDJiZDZjZWU=", # Shihua@123456 - "password": "ZTEwYWRjMzk0OWJhNTlhYmJlNTZlMDU3ZjIwZjg4M2U=", # 123456 + "account": "api_dev", + "password": "ZTEwYWRjMzk0OWJhNTlhYmJlNTZlMDU3ZjIwZjg4M2U=", "tenantHashCode": "8a4577dbd919675758d57999a1e891fe", "terminal": "API" }, @@ -244,24 +138,26 @@ login_data = { "funcOperation": "获取token" } + upload_data = { "funcModule": '研究报告信息', "funcOperation": '上传原油价格预测报告', "data": { - "ownerAccount": 'arui', # 报告所属用户账号 + "groupNo": '', # 用户组id + "ownerAccount": '27663', # 报告所属用户账号 27663 - 刘小朋 "reportType": 'OIL_PRICE_FORECAST', # 报告类型，固定为OIL_PRICE_FORECAST - "fileName": '2000-40-5-50--100-原油指标数据.xlsx-Brent活跃合约--2024-09-06-15-01-29-预测报告.pdf', # 文件名称 + "fileName": '', # 文件名称 "fileBase64": '', # 文件内容base64 "categoryNo": 'yyjgycbg', # 研究报告分类编码 "smartBusinessClassCode": 'YCJGYCBG', # 分析报告分类编码 - "reportEmployeeCode": "E40116", # 报告人 - "reportDeptCode": "D0044", # 报告部门 + "reportEmployeeCode": "E40482", # 报告人 E40482 - 管理员 0000027663 - 刘小朋 + "reportDeptCode": "002000621000", # 报告部门 - 002000621000 SH期货研究部 "productGroupCode": "RAW_MATERIAL" # 商品分类 } } - warning_data = { + "groupNo": '', # 用户组id "funcModule": '原油特征停更预警', "funcOperation": '原油特征停更预警', "data": { @@ -281,6 +177,7 @@ query_data_list_item_nos_data = { } } + push_data_value_list_data = { "funcModule": "数据表信息列表", "funcOperation": "新增", @@ -304,26 +201,129 @@ push_data_value_list_data = { } # 八大维度数据项编码 bdwd_items = { - 'ciri': 'yyycbdwdcr', - 'benzhou': 'yyycbdwdbz', - 'cizhou': 'yyycbdwdcz', - 'gezhou': 'yyycbdwdgz', - 'ciyue': 'yyycbdwdcy', - 'cieryue': 'yyycbdwdcey', - 'cisanyue': 'yyycbdwdcsy', - 'cisiyue': 'yyycbdwdcsiy', + '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', } -# 北京环境数据库 -host = '192.168.101.27' +# 生产环境数据库 +host = 'rm-2zehj3r1n60ttz9x5.mysql.rds.aliyuncs.com' port = 3306 -dbusername = 'root' -password = '123456' -dbname = 'jingbo_test' +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" + +# 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": '上传原油价格预测报告', +# "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": 'YCJGYCBG', # 分析报告分类编码 +# "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", +# "dataItemNoList": ["Brentzdj", "Brentzgj"] # 数据项编码,代表 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 +# } +# ] +# } +# # 八大维度数据项编码 +# bdwd_items = { +# 'ciri': 'yyycbdwdcr', +# 'benzhou': 'yyycbdwdbz', +# 'cizhou': 'yyycbdwdcz', +# 'gezhou': 'yyycbdwdgz', +# 'ciyue': 'yyycbdwdcy', +# 'cieryue': 'yyycbdwdcey', +# 'cisanyue': 'yyycbdwdcsy', +# 'cisiyue': 'yyycbdwdcsiy', +# } + + +# # 北京环境数据库 +# host = '192.168.101.27' +# port = 3306 +# dbusername = 'root' +# password = '123456' +# dbname = 'jingbo_test' +# table_name = 'v_tbl_crude_oil_warning' + + # 开关 is_train = True # 是否训练 is_debug = False # 是否调试 diff --git a/lib/dataread.py b/lib/dataread.py index aa1f21a..4177901 100644 --- a/lib/dataread.py +++ b/lib/dataread.py @@ -877,10 +877,10 @@ def datachuli(df_zhibiaoshuju, df_zhibiaoliebiao, datecol='date', end_time='', y featurePindu(dataset=dataset) # 原油最高最低价列误删重新拼接,后面更新最高价最低价用，计算准确率用 - if 'Brentzgj' not in df.columns and 'Brentzgj' in df_zhibiaoliebiao.columns: - df['Brentzgj'] = df_zhibiaoliebiao['Brentzgj'] - if 'Brentzdj' not in df.columns and 'Brentzdj' in df_zhibiaoliebiao.columns: - df['Brentzdj'] = df_zhibiaoliebiao['Brentzdj'] + if 'Brentzgj' not in df.columns and 'Brentzgj' in df_zhibiaoshuju.columns: + df['Brentzgj'] = df_zhibiaoshuju['Brentzgj'] + if 'Brentzdj' not in df.columns and 'Brentzdj' in df_zhibiaoshuju.columns: + df['Brentzdj'] = df_zhibiaoshuju['Brentzdj'] # 向上填充 df = df.ffill()