1、getTaskTree返回值新增flowTemplateName字段
This commit is contained in:
@@ -162,6 +162,7 @@ public class TaskNodePo extends NodeAllBase {
|
||||
@JsonProperty("bCapacity")
|
||||
private String bCapacity;
|
||||
private String flowTemplate;
|
||||
private String flowTemplateName;
|
||||
private String englishName;
|
||||
private String description;
|
||||
|
||||
|
||||
@@ -15,10 +15,12 @@ import com.sdm.common.entity.req.system.SendMsgReq;
|
||||
import com.sdm.common.entity.req.system.UserQueryReq;
|
||||
import com.sdm.common.entity.req.task.TaskTreeExportExcelFormat;
|
||||
import com.sdm.common.entity.req.task.TaskTreeExportExcelParam;
|
||||
import com.sdm.common.entity.resp.capability.FlowTemplateResp;
|
||||
import com.sdm.common.entity.resp.data.FileMetadataInfoResp;
|
||||
import com.sdm.common.entity.resp.project.SpdmTaskVo;
|
||||
import com.sdm.common.entity.resp.project.TaskNodeExtraPo;
|
||||
import com.sdm.common.entity.resp.system.CIDUserResp;
|
||||
import com.sdm.common.feign.impl.capability.SimulationFlowFeignClientImpl;
|
||||
import com.sdm.common.feign.impl.data.DataClientFeignClientImpl;
|
||||
import com.sdm.common.feign.impl.system.MessageFeignClientImpl;
|
||||
import com.sdm.common.feign.impl.system.SysUserFeignClientImpl;
|
||||
@@ -111,6 +113,9 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
|
||||
@Autowired
|
||||
private LyricVProjectStationPlanToDmService lyricVProjectStationPlanToDmService;
|
||||
|
||||
@Autowired
|
||||
private SimulationFlowFeignClientImpl flowFeignClient;
|
||||
|
||||
@Value("${commitmentDeadlineStatusTask.schedule.calculationInterval:5}")
|
||||
private int calculationInterval;
|
||||
|
||||
@@ -725,6 +730,21 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
|
||||
}
|
||||
taskNodePo.setStandardName(String.join(";", fileNameList));
|
||||
}
|
||||
if (StringUtils.isNotBlank(taskNodePo.getFlowTemplate())) {
|
||||
// 转换模板名称
|
||||
List<String> flowTemplateNameList = new ArrayList<>();
|
||||
String[] flowTemplateArr = taskNodePo.getFlowTemplate().split(",");
|
||||
for (String flowTemplate : flowTemplateArr) {
|
||||
SdmResponse<FlowTemplateResp> flowTemplateResp = flowFeignClient.queryFlowTemplateInfoByTemplateCode(flowTemplate);
|
||||
if (flowTemplateResp.getData() == null) {
|
||||
continue;
|
||||
}
|
||||
flowTemplateNameList.add(flowTemplateResp.getData().getTemplateName());
|
||||
}
|
||||
if (CollectionUtils.isNotEmpty(flowTemplateNameList)) {
|
||||
taskNodePo.setFlowTemplateName(String.join(",", flowTemplateNameList));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 查询当前任务下指标
|
||||
|
||||
@@ -2839,7 +2839,7 @@ public class TaskServiceImpl implements ITaskService {
|
||||
log.info("flowTemplate为:{}",spdmExportNewTaskVo.getFlowTemplate());
|
||||
if (StringUtils.isNotBlank(spdmExportNewTaskVo.getFlowTemplate())) {
|
||||
List<String> flowTemplateNameList = new ArrayList<>();
|
||||
String[] flowTemplateArr = spdmExportNewTaskVo.getFlowTemplate().split(";");
|
||||
String[] flowTemplateArr = spdmExportNewTaskVo.getFlowTemplate().split(",");
|
||||
for (String flowTemplate : flowTemplateArr) {
|
||||
log.info("查询flowTemplate为:{}",flowTemplate);
|
||||
SdmResponse<FlowTemplateResp> flowTemplateResp = flowFeignClient.queryFlowTemplateInfoByTemplateCode(flowTemplate);
|
||||
|
||||
Reference in New Issue
Block a user