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 | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 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 b9b65f5..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,
@@ -630,7 +633,7 @@
if (xmlWriter != null) xmlWriter.close();
}
// XML瀛樼洏
- update(simulatAssess);
+ insert(simulatAssess);
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException("缁勮绠楁硶搴撲豢鐪熻绠楃敤妯″瀷XML澶辫触: " + e.getMessage());
@@ -781,6 +784,8 @@
private void addModelsTag(Long taskId,
Long productId,
+ String productName,
+ String productNamePath,
List<XhProductModel> productList,
List<ParamData> paramDataList,
List<TaskPhaseModel> taskPhaseModelAll,
@@ -807,6 +812,8 @@
taskPhaseModel,
gkModelTop.getModelId(),
productId,
+ productName,
+ productNamePath,
productList,
paramDataList,
gkModelsAssembled,
@@ -823,6 +830,8 @@
TaskPhaseModel taskPhaseModel,
Long modelId,
Long productId,
+ String productName,
+ String productNamePath,
List<XhProductModel> productList,
List<ParamData> paramDataList,
List<OperatConditModel> gkModelsAssembled,
@@ -851,6 +860,8 @@
taskPhaseModel,
gkModel.getModelId(),
product.getId(),
+ product.getName(),
+ product.getNamePath(),
productList,
paramDataList,
gkModelsAssembled,
@@ -863,6 +874,8 @@
// 璁惧
Element nodeTag = parent.addElement("node");
nodeTag.addAttribute("name", dataId.toString());
+ nodeTag.addAttribute("real_name", product.getName());
+ nodeTag.addAttribute("name_path", product.getNamePath());
nodeTag.addAttribute("type", "node");
ParamData paramData = paramDataList.stream().filter(item ->
@@ -908,6 +921,8 @@
element.addAttribute("name", algo.getId().toString());
} else {
element.addAttribute("name", productId.toString());
+ element.addAttribute("real_name", productName);
+ element.addAttribute("name_path", productNamePath);
}
if ("series".equals(algo.getAlgorithmType())) {
element.addAttribute("type", "series");
@@ -929,6 +944,8 @@
taskPhaseModel,
modelId,
null,
+ null,
+ null,
productList,
paramDataList,
gkModelsAssembled,
--
Gitblit v1.9.1