From 275125ec506507e7a644ab3b3079f618c64d1fea Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 20 九月 2024 10:23:21 +0800
Subject: [PATCH] 修改

---
 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java |   33 +++++++++++++++++++++++++++------
 1 files changed, 27 insertions(+), 6 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..06a9e79 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");
@@ -928,6 +943,8 @@
                 node2DOM(taskId,
                         taskPhaseModel,
                         modelId,
+                        null,
+                        null,
                         null,
                         productList,
                         paramDataList,
@@ -1006,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);
@@ -1016,7 +1033,9 @@
             throw new RenException("鏂囦欢涓嶅瓨鍦ㄦ垨鑰呮枃浠舵墦涓嶅紑");
         } finally {
             try {
-                in.close();
+                if (in != null) {
+                    in.close();
+                }
             } catch (IOException e) {
                 e.printStackTrace();
             }
@@ -1030,7 +1049,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;
@@ -1130,7 +1149,7 @@
             this.update(simulatAssess);
         }
         String filePath = path + "/" + simulatAssess.getId() + "/" + "result.xml";
-        String xml = null;
+        String xml;
         InputStream in = null;
 
         try {
@@ -1141,7 +1160,9 @@
             throw new RenException("鏂囦欢涓嶅瓨鍦ㄦ垨鑰呮枃浠舵墦涓嶅紑");
         } finally {
             try {
-                in.close();
+                if (in != null) {
+                    in.close();
+                }
             } catch (IOException e) {
                 e.printStackTrace();
             }

--
Gitblit v1.9.1