toolchaintechnologycenter/spdm-backend
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:更新报告模板绑定工况&导出报告指标入库优化

Browse Source
This commit is contained in:
zhuxinru
2026-03-24 20:09:44 +08:00
parent 17bf2bd462
commit e9df6b0d8d
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
capability/src/main/java/com/sdm/capability/service/impl/SimulationReportTemplateServiceImpl.java
View File

@@ -184,6 +184,13 @@ public class SimulationReportTemplateServiceImpl extends ServiceImpl<SimulationR
SimulationReportTemplate reportTemplate = new SimulationReportTemplate();
BeanUtils.copyProperties(templateDto, reportTemplate);
this.updateById(reportTemplate);
// 解析工况库信息JSON字符串
if (StringUtils.isNotBlank(templateDto.getSimulationPoolInfoListStr())) {
List<SimulationFlowTaskBindInfo> simulationPoolInfoList = JSON.parseArray(templateDto.getSimulationPoolInfoListStr(), SimulationFlowTaskBindInfo.class);
// 绑定工况
bindReportTemplateAndTask(reportTemplate.getTemplateCode(), simulationPoolInfoList);
}
return SdmResponse.success(reportTemplate.getId());
}

9
project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java
View File

@@ -5,6 +5,7 @@ import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
@@ -2211,7 +2212,9 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
newPerformance.setCreator(userId);
}
} else {
Map<String, List<SimulationPerformance>> oldPerformanceMap = oldPerformances.stream().collect(Collectors.groupingBy(SimulationPerformance::getNodeName));
Map<String, List<SimulationPerformance>> oldPerformanceMap = oldPerformances.stream()
.filter(p -> p.getNodeName() != null)
.collect(Collectors.groupingBy(SimulationPerformance::getNodeName));
for (SimulationPerformance newPerformance : performanceList) {
List<SimulationPerformance> oldPerformanceByNodeName = oldPerformanceMap.get(newPerformance.getNodeName());
if (CollectionUtils.isNotEmpty(oldPerformanceByNodeName)) {
@@ -2267,6 +2270,8 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
public List<SimulationPerformance> extractPerformance(String jsonData) {
List<SimulationPerformance> performances = new ArrayList<>();
ObjectMapper objectMapper = new ObjectMapper();
// 配置ObjectMapper：忽略未知字段
objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
try {
JsonNode rootNode = objectMapper.readTree(jsonData);
@@ -2281,7 +2286,7 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
}
}
} catch (Exception e) {
e.printStackTrace();
log.error("解析指标数据失败：", e);
}
// 去重
performances = new ArrayList<>(performances.stream()