From 5c3b9f8639b2abe6f8409dd2c5079eea44cd51f9 Mon Sep 17 00:00:00 2001 From: workpc Date: Tue, 11 Feb 2025 08:53:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=9A=E7=83=AF=E7=83=83=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config_jingbo.py | 2 +- config_jingbo_pro.py | 2 +- config_juxiting.py | 97 +++++++++++++++++++++++--------------------- lib/dataread.py | 4 +- main_yuanyou.py | 2 +- 5 files changed, 55 insertions(+), 52 deletions(-) diff --git a/config_jingbo.py b/config_jingbo.py index 90a610d..f44df2d 100644 --- a/config_jingbo.py +++ b/config_jingbo.py @@ -161,7 +161,7 @@ table_name = 'v_tbl_crude_oil_warning' ### 开关 is_train = False # 是否训练 is_debug = False # 是否调试 -is_eta = True # 是否使用eta接口 +is_eta = False # 是否使用eta接口 is_market = True # 是否通过市场信息平台获取特征 ,在is_eta 为true 的情况下生效 is_timefurture = True # 是否使用时间特征 is_fivemodels = False # 是否使用之前保存的最佳的5个模型 diff --git a/config_jingbo_pro.py b/config_jingbo_pro.py index 0b20700..6e27e32 100644 --- a/config_jingbo_pro.py +++ b/config_jingbo_pro.py @@ -95,7 +95,7 @@ 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-dev/api/warehouse/dwDataItem/queryDataListItemNos" +query_data_list_item_nos_url = f"http://{server_host}/jingbo-api/api/warehouse/dwDataItem/queryDataListItemNos" login_data = { "data": { diff --git a/config_juxiting.py b/config_juxiting.py index c26dc48..d04ba48 100644 --- a/config_juxiting.py +++ b/config_juxiting.py @@ -32,7 +32,8 @@ edbcodelist = ['ID01385938','lmcads03 lme comdty', 'M0066351', 'S0266372', 'S0266438', -'S0266506'] +'S0266506', +'ID01384463'] # 临时写死用指定的列,与上面的edbcode对应，后面更改 edbnamelist = [ @@ -53,10 +54,12 @@ edbnamelist = [ 'PP连续-1月', 'PP连续-5月', 'PP连续-9月', +'PP：拉丝：L5E89：出厂价：华北（第二区域）：内蒙古久泰新材料（日）' ] edbcodenamedict = { 'ID01385938':'PP：拉丝：1102K：市场价：青州：国家能源宁煤（日）', +'ID01384463':'PP：拉丝：L5E89：出厂价：华北（第二区域）：内蒙古久泰新材料（日）', 'lmcads03 lme comdty':'LME铜价', 'GC1 COMB Comdty':'黄金连1合约', 'C2404171822':'Brent-WTI', @@ -128,51 +131,14 @@ ClassifyId = 1161 ### 报告上传配置 # 变量定义--线上环境 -login_pushreport_url = "http://10.200.32.39/jingbo-api/api/server/login" -upload_url = "http://10.200.32.39/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":{ - "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" # 商品分类 - } -} - - - -# # 变量定义--测试环境 -# login_pushreport_url = "http://192.168.100.53:8080/jingbo-dev/api/server/login" -# upload_url = "http://192.168.100.53:8080/jingbo-dev/api/analysis/reportInfo/researchUploadReportSave" -# # upload_url = "http://192.168.100.109:8080/jingbo/api/analysis/reportInfo/researchUploadReportSave" # zhaoqiwei +# login_pushreport_url = "http://10.200.32.39/jingbo-api/api/server/login" +# upload_url = "http://10.200.32.39/jingbo-api/api/dw/dataValue/pushDataValueList" # login_data = { # "data": { -# "account": "api_test", -# "password": "MmVmNzNlOWI0MmY0ZDdjZGUwNzE3ZjFiMDJiZDZjZWU=", +# "account": "api_dev", +# "password": "ZTEwYWRjMzk0OWJhNTlhYmJlNTZlMDU3ZjIwZjg4M2U=", # "tenantHashCode": "8a4577dbd919675758d57999a1e891fe", # "terminal": "API" # }, @@ -180,23 +146,60 @@ upload_data = { # "funcOperation": "获取token" # } + + # upload_data = { # "funcModule":'研究报告信息', # "funcOperation":'上传原油价格预测报告', # "data":{ -# "ownerAccount":'arui', #报告所属用户账号 +# "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" # 商品分类 # } # } + +# # 变量定义--测试环境 +login_pushreport_url = "http://192.168.100.53:8080/jingbo-dev/api/server/login" +upload_url = "http://192.168.100.53:8080/jingbo-dev/api/analysis/reportInfo/researchUploadReportSave" +# upload_url = "http://192.168.100.109:8080/jingbo/api/analysis/reportInfo/researchUploadReportSave" # zhaoqiwei + + +login_data = { + "data": { + "account": "api_test", + "password": "MmVmNzNlOWI0MmY0ZDdjZGUwNzE3ZjFiMDJiZDZjZWU=", + "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" # 商品分类 + } +} + + ### 线上开关 # is_train = True # 是否训练 # is_debug = False # 是否调试 @@ -236,7 +239,7 @@ if add_kdj and is_edbnamelist: y = 'AVG-金能大唐久泰青州' # 原油指标数据的目标变量 avg_cols = [ 'PP：拉丝：1102K：出厂价：青州：国家能源宁煤（日）', - 'PP：拉丝：L5E89：出厂价：华北（第二区域）：内蒙古久泰新材料（日）', + 'PP：拉丝：L5E89：出厂价：华北（第二区域）：内蒙古久泰新材料（日）', 'PP：拉丝：L5E89：出厂价：河北、鲁北：大唐内蒙多伦（日）', 'PP：拉丝：HP550J：市场价：青岛：金能化学（日）' ] diff --git a/lib/dataread.py b/lib/dataread.py index e2d03f4..7401e82 100644 --- a/lib/dataread.py +++ b/lib/dataread.py @@ -41,9 +41,9 @@ plt.rcParams['font.sans-serif'] = ['SimHei'] # 用来正常显示中文标签 plt.rcParams['axes.unicode_minus'] = False # 用来正常显示负号 # from config_jingbo_pro import * -from config_jingbo import * +# from config_jingbo import * # from config_yongan import * -# from config_juxiting import * +from config_juxiting import * diff --git a/main_yuanyou.py b/main_yuanyou.py index b218205..7cf59ea 100644 --- a/main_yuanyou.py +++ b/main_yuanyou.py @@ -291,7 +291,7 @@ if __name__ == '__main__': # global end_time # is_on = True # # 遍历2024-11-25 到 2024-12-3 之间的工作日日期 - # for i_time in pd.date_range('2024-11-4', '2024-12-13', freq='B'): + # for i_time in pd.date_range('2025-1-20', '2025-2-6', freq='B'): # end_time = i_time.strftime('%Y-%m-%d') # predict_main()