From 316e1c18d0d55b28d64400923721bab2158ff251 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 13 九月 2024 16:32:35 +0800
Subject: [PATCH] 修改

---
 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java |   34 +++++++++++++++++++++++-----------
 1 files changed, 23 insertions(+), 11 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..ea18bfb 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");
@@ -933,6 +943,8 @@
                 node2DOM(taskId,
                         taskPhaseModel,
                         modelId,
+                        null,
+                        null,
                         null,
                         productList,
                         paramDataList,
@@ -1011,7 +1023,7 @@
         String filePath = path + "/" + fzId + "/" + "result.xml";
         List<WeakDto> list = new ArrayList<>();
         Map<Long, WeakDto> map = new HashMap<>();
-        String xml = null;
+        String xml;
         InputStream in = null;
         try {
             in = new FileInputStream(filePath);
@@ -1035,7 +1047,7 @@
         JSONArray jsonArray = xmlJSONObj.getJSONObject("ResultNodes").getJSONArray("ResultNode");
         for (int i = 0; i < jsonArray.size(); i++) {
             WeakDto data = new WeakDto();
-            Long productId1 = null;
+            Long productId1;
             Object nameValue = jsonArray.getJSONObject(i).get("name");
             if (nameValue instanceof Long) {
                 productId1 = (Long) nameValue;
@@ -1135,7 +1147,7 @@
             this.update(simulatAssess);
         }
         String filePath = path + "/" + simulatAssess.getId() + "/" + "result.xml";
-        String xml = null;
+        String xml;
         InputStream in = null;
 
         try {

--
Gitblit v1.9.1