修改:hpc代码优化,mock用户和租户id
This commit is contained in:
@@ -77,7 +77,7 @@ public class HpcHandler implements ExecutionHandler<Map<String, Object>,HPCExecu
|
||||
}
|
||||
CoreLogger.info("beforeNodeId:{},currentNodeId:{},masterFileRegularStr:{},inputFilesRegularStr:{}",beforeNodeId,currentNodeId,masterFileRegularStr,inputFilesRegularStr);
|
||||
// 初始化用户/租户信息
|
||||
initUserInfo(execution);
|
||||
initUserInfo(execution,params);
|
||||
// params 取只是测试使用
|
||||
String processDefinitionId = (execution==null||StringUtils.isBlank(execution.getProcessDefinitionId()))?
|
||||
params.get("processDefinitionId").toString():execution.getProcessDefinitionId();
|
||||
@@ -136,17 +136,17 @@ public class HpcHandler implements ExecutionHandler<Map<String, Object>,HPCExecu
|
||||
messageFeignClient.sendMessage(req);
|
||||
}
|
||||
|
||||
private void initUserInfo(DelegateExecution execution) {
|
||||
private void initUserInfo(DelegateExecution execution,Map<String, Object> params) {
|
||||
// 获取当前流程实例参数
|
||||
Long userId = (Long) execution.getVariable("userId");
|
||||
String userName = (String) execution.getVariable("userName");
|
||||
Long tenantId = (Long) execution.getVariable("tenantId");
|
||||
log.info("Hpc流程发起,用户id:{},租户id:{}",userId,tenantId);
|
||||
if(Objects.isNull(tenantId)){
|
||||
tenantId=ThreadLocalContext.getTenantId();
|
||||
tenantId=Objects.isNull(params.get("tenantId")) ? null : (Long) params.get("tenantId");
|
||||
}
|
||||
if(Objects.isNull(userId)){
|
||||
tenantId=ThreadLocalContext.getUserId();
|
||||
userId=Objects.isNull(params.get("userId")) ? null : (Long) params.get("userId");
|
||||
}
|
||||
ThreadLocalContext.setUserId(userId);
|
||||
ThreadLocalContext.setUserName(userName);
|
||||
|
||||
Reference in New Issue
Block a user