From 88490578da41d38ed754b6b3e4d63ab2c2ccf666 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 22 三月 2024 00:57:03 +0800
Subject: [PATCH] 修改bug：1）将connect、vote、switch替换成vnode时遗漏了向modelNodeAndVnodeList添加此此节点。2）algorithm中遗漏了设置vote算法的voteNum。
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelLineService.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelLineService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelLineService.java
index 85450d9..ec0f8a3 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelLineService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelLineService.java
@@ -131,7 +131,7 @@
// 5. 杞崲涓虹畻娉曞簱鎺ュ彛XML
if (result) {
-// result = createIfXmlFromRbd(modelRbd, algorithmList, modelNodeAndVnodeList);
+ result = createIfXmlFromRbd(modelRbd, algorithmList, modelNodeAndVnodeList);
}
// 6. 淇濆瓨妯″瀷
@@ -681,6 +681,7 @@
ModelNode endNode = getBranchNodesOneParallel(pathOneGroup, branchNodeList);
if ("connect".equals(startNode.getNodeType()) && pathOneGroup.size()==lines.size()) {
// 鏇挎崲鎴愯櫄鑺傜偣
+ modelNodeAndVnodeList.add(startNode);
replaceToVnode("parallel", modelId, modelNodeList, modelLineList,
algorithmList, modelNodeAndVnodeList, startNode, endNode, branchNodeList);
} else {
@@ -876,6 +877,7 @@
if ("connect".equals(startNode.getNodeType()) && startNode.getInLineNum()==2) {
// 鏇挎崲鎴愯櫄鑺傜偣
+ modelNodeAndVnodeList.add(startNode);
replaceToVnode("bridge", modelId, modelNodeList, modelLineList,
algorithmList, modelNodeAndVnodeList, startNode, endNode, branchNodeList);
} else {
@@ -971,6 +973,7 @@
}
}
if (thisNodeSuccess) {
+ modelNodeAndVnodeList.add(opNode);
replaceToVnode(opNode.getNodeType(), modelId, modelNodeList, modelLineList,
algorithmList, modelNodeAndVnodeList, opNode, endNode, branchNodeList);
hasSimplified = true;
@@ -1000,6 +1003,7 @@
algorithm.setAlgorithmType(type);
algorithm.setComputerList(computerList.get(0));
algorithm.setObjectList(computerList.get(1));
+ if ("vote".equals(type)) algorithm.setVoteNum(startNode.getVoteNum());
algorithm.setStep(algorithmList.size()==0 ? 0 : algorithmList.get(algorithmList.size()-1).getStep()+1);
algorithmList.add(algorithm);
--
Gitblit v1.9.1