From 237d984aae0df1a5993b6b6247757b0f218b753f Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期二, 20 八月 2024 10:22:04 +0800
Subject: [PATCH] 修改bug
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java
index 4eccb68..8047000 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java
@@ -579,6 +579,7 @@
private void assembleModelXml(SimulatAssess simulatAssess) {
Long productId = simulatAssess.getProductId();
+ XhProductModel product = xhProductModelDao.getById(productId);
List<XhProductModel> productList = xhProductModelDao.getByShipId(productId);
List<ParamData> paramDataList = paramDataDao.getDeviceParams(productId);
Long taskId = simulatAssess.getTaskModelId();
@@ -604,6 +605,8 @@
addTasksTag(taskPhaseModelAll, root);
addModelsTag(taskId,
productId,
+ product.getName(),
+ product.getNamePath(),
productList,
paramDataList,
taskPhaseModelAll,
@@ -781,6 +784,8 @@
private void addModelsTag(Long taskId,
Long productId,
+ String productName,
+ String productNamePath,
List<XhProductModel> productList,
List<ParamData> paramDataList,
List<TaskPhaseModel> taskPhaseModelAll,
@@ -803,11 +808,12 @@
"end".equals(item.getAlgorithmType())).collect(Collectors.toList()).get(0);
ModelNode computerNode = modelNodeAndVnodeList.stream().filter(item ->
endAlgo.getComputerList().equals(item.getId().toString())).collect(Collectors.toList()).get(0);
- XhProductModel product = xhProductModelDao.getById(productId);
node2DOM(taskId,
taskPhaseModel,
gkModelTop.getModelId(),
- product,
+ productId,
+ productName,
+ productNamePath,
productList,
paramDataList,
gkModelsAssembled,
@@ -823,7 +829,9 @@
private void node2DOM(Long taskId,
TaskPhaseModel taskPhaseModel,
Long modelId,
- XhProductModel productTop,
+ Long productId,
+ String productName,
+ String productNamePath,
List<XhProductModel> productList,
List<ParamData> paramDataList,
List<OperatConditModel> gkModelsAssembled,
@@ -851,7 +859,9 @@
node2DOM(taskId,
taskPhaseModel,
gkModel.getModelId(),
- productTop,
+ product.getId(),
+ product.getName(),
+ product.getNamePath(),
productList,
paramDataList,
gkModelsAssembled,
@@ -907,12 +917,12 @@
Algorithm algo = algorithmList.stream().filter(item ->
node.getId().equals(item.getId())).collect(Collectors.toList()).get(0);
Element element = parent.addElement("logic");
- if (null == productTop) {
+ if (null == productId) {
element.addAttribute("name", algo.getId().toString());
} else {
- element.addAttribute("name", productTop.getId().toString());
- element.addAttribute("real_name", productTop.getName());
- element.addAttribute("name_path", productTop.getNamePath());
+ element.addAttribute("name", productId.toString());
+ element.addAttribute("real_name", productName);
+ element.addAttribute("name_path", productNamePath);
}
if ("series".equals(algo.getAlgorithmType())) {
element.addAttribute("type", "series");
@@ -934,6 +944,8 @@
taskPhaseModel,
modelId,
null,
+ null,
+ null,
productList,
paramDataList,
gkModelsAssembled,
--
Gitblit v1.9.1