|
@@ -21,7 +21,7 @@ def optimize(*inputs,config=None):
|
|
|
config_reader_path = '/mnt/workflow_data'
|
|
config_reader_path = '/mnt/workflow_data'
|
|
|
data_URL = 'http://basedataportal-svc:8080/data/getpointsdata'
|
|
data_URL = 'http://basedataportal-svc:8080/data/getpointsdata'
|
|
|
|
|
|
|
|
- config_reader = ConfigReader(path=f'{config_reader_path}/DHU_AB配置.xlsx')
|
|
|
|
|
|
|
+ config_reader = ConfigReader(path=f'{config_reader_path}/DHU配置.xlsx')
|
|
|
|
|
|
|
|
ALL_RESULT = {
|
|
ALL_RESULT = {
|
|
|
'EXCEPTION':{
|
|
'EXCEPTION':{
|
|
@@ -262,10 +262,6 @@ def optimize_dhu(
|
|
|
config_reader.get_app_info(each_eaup_name,'实时优化','后再生盘管温度下限','float'),
|
|
config_reader.get_app_info(each_eaup_name,'实时优化','后再生盘管温度下限','float'),
|
|
|
config_reader.get_app_info(each_eaup_name,'实时优化','后再生盘管温度上限','float')
|
|
config_reader.get_app_info(each_eaup_name,'实时优化','后再生盘管温度上限','float')
|
|
|
),
|
|
),
|
|
|
- # fan_2_Hz=(
|
|
|
|
|
- # config_reader.get_app_info(each_eaup_name,'实时优化','排风机频率下限','float'),
|
|
|
|
|
- # config_reader.get_app_info(each_eaup_name,'实时优化','排风机频率上限','float')
|
|
|
|
|
- # ),
|
|
|
|
|
fan_2_Hz = None,
|
|
fan_2_Hz = None,
|
|
|
constrains = constrains,
|
|
constrains = constrains,
|
|
|
logging = False,
|
|
logging = False,
|
|
@@ -300,7 +296,7 @@ def push_result(
|
|
|
'name' : '前再生加热温度',
|
|
'name' : '前再生加热温度',
|
|
|
'rcmd_value': opt_result['opt_var'][0].round(1).iat[0,0],
|
|
'rcmd_value': opt_result['opt_var'][0].round(1).iat[0,0],
|
|
|
'curr_value': data_cur.loc[:,['wheel_1_TinR']].round(1).iat[0,0],
|
|
'curr_value': data_cur.loc[:,['wheel_1_TinR']].round(1).iat[0,0],
|
|
|
- 'point_id' : equp_point['wheel_1_TinR_AISP']
|
|
|
|
|
|
|
+ 'point_id' : f'{each_eaup_name}_{equp_point["wheel_1_TinR_AISP"]}'
|
|
|
}
|
|
}
|
|
|
]
|
|
]
|
|
|
},
|
|
},
|
|
@@ -312,22 +308,10 @@ def push_result(
|
|
|
'name' : '后再生加热温度',
|
|
'name' : '后再生加热温度',
|
|
|
'rcmd_value': opt_result['opt_var'][1].round(1).iat[0,0],
|
|
'rcmd_value': opt_result['opt_var'][1].round(1).iat[0,0],
|
|
|
'curr_value': data_cur.loc[:,['wheel_2_TinR']].round(1).iat[0,0],
|
|
'curr_value': data_cur.loc[:,['wheel_2_TinR']].round(1).iat[0,0],
|
|
|
- 'point_id' : equp_point['wheel_2_TinR_AISP']
|
|
|
|
|
|
|
+ 'point_id' : f'{each_eaup_name}_{equp_point["wheel_2_TinR_AISP"]}'
|
|
|
}
|
|
}
|
|
|
]
|
|
]
|
|
|
},
|
|
},
|
|
|
- # {
|
|
|
|
|
- # 'name' : '排风机频率',
|
|
|
|
|
- # 'rcmd_value': opt_result['opt_var'][2].iat[0,0],
|
|
|
|
|
- # 'children' : [
|
|
|
|
|
- # {
|
|
|
|
|
- # 'name' : '排风机频率',
|
|
|
|
|
- # 'rcmd_value': opt_result['opt_var'][2].round(1).iat[0,0],
|
|
|
|
|
- # 'curr_value': data_cur.loc[:,['fan_2_Hz']].round(1).iat[0,0],
|
|
|
|
|
- # 'point_id' : equp_point['fan_2_Hz_AISP']
|
|
|
|
|
- # }
|
|
|
|
|
- # ]
|
|
|
|
|
- # }
|
|
|
|
|
]
|
|
]
|
|
|
else:
|
|
else:
|
|
|
raise Exception('MODEL_TYPE_ERROR')
|
|
raise Exception('MODEL_TYPE_ERROR')
|
|
@@ -335,7 +319,7 @@ def push_result(
|
|
|
if config_reader.get_app_info(each_eaup_name,'实时优化','推送策略','bool'):
|
|
if config_reader.get_app_info(each_eaup_name,'实时优化','推送策略','bool'):
|
|
|
add_ai_rcmd_operation(
|
|
add_ai_rcmd_operation(
|
|
|
code = each_eaup_name_short,
|
|
code = each_eaup_name_short,
|
|
|
- job_id = None,
|
|
|
|
|
|
|
+ job_id = os.environ.get('JOB_ID', None),
|
|
|
rcmd = rcmd,
|
|
rcmd = rcmd,
|
|
|
custom_details = []
|
|
custom_details = []
|
|
|
)
|
|
)
|