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 | 189 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 143 insertions(+), 46 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 0cf4c28..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
@@ -5,26 +5,22 @@
import com.zt.common.service.BaseService;
import com.zt.common.utils.JsonUtils2;
import com.zt.common.utils.UUIDUtil;
+import com.zt.life.modules.mainPart.basicInfo.dao.ParamDataDao;
+import com.zt.life.modules.mainPart.basicInfo.dao.XhProductModelDao;
+import com.zt.life.modules.mainPart.basicInfo.model.ParamData;
import com.zt.life.modules.mainPart.basicInfo.model.ProductImg;
+import com.zt.life.modules.mainPart.basicInfo.model.XhProductModel;
import com.zt.life.modules.mainPart.taskReliability.dao.*;
import com.zt.life.modules.mainPart.taskReliability.dto.ModelLinePair;
import com.zt.life.modules.mainPart.taskReliability.model.*;
import org.apache.commons.lang3.StringUtils;
+import org.dom4j.DocumentHelper;
+import org.dom4j.Document;
+import org.dom4j.Element;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
import org.springframework.transaction.annotation.Transactional;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import java.io.StringWriter;
import java.util.*;
import java.util.stream.Collectors;
@@ -47,6 +43,10 @@
private AlgorithmDao algorithmDao;
@Autowired
private ModelNodeAlgorithmDao modelNodeAlgorithmDao;
+ @Autowired
+ private XhProductModelDao xhProductModelDao;
+ @Autowired
+ private ParamDataDao paramDataDao;
/**
* 鍒嗛〉鏌ヨ
@@ -117,7 +117,7 @@
List<ModelNode> modelNodeList = new ArrayList<>();
List<ModelLine> modelLineList = new ArrayList<>();
List<Algorithm> algorithmList = new ArrayList<>();
- List<ProductImg> productImgList = new ArrayList<>();
+ List<ProductImg> productImgList = new ArrayList<>(); // 鏆備笉浣跨敤锛堣�屼娇鐢ㄦ暟鎹簱涓殑鍙潬鎬у弬鏁帮級
// 1. 瑙ｆ瀽鍑鸿妭鐐逛笌杈�
getNodeAndLineFromRbd(modelRbd.getId(), rbdJsonArray, modelNodeList, modelLineList, productImgList);
@@ -127,11 +127,11 @@
List<ModelNode> modelNodeAndVnodeList = modelNodeList.stream().filter(item ->
"node".equals(item.getNodeType())).collect(Collectors.toList());
// 4. 涓嶆柇灏嗗熀鏈ā鍨嬶紙涓茶仈銆佸苟鑱斻�佹梺鑱斻�佽〃鍐炽�佹ˉ鑱旓級鏇挎崲涓鸿櫄鑺傜偣鑰岀畝鍖栧浘褰紝鐩磋嚦鏃犳硶绠�鍖栦负姝€��
- result = getAlgorithmFromRbd(modelRbd, modelNodeList, modelLineList, algorithmList, modelNodeAndVnodeList, productImgList);
+ result = getAlgorithmFromRbd(modelRbd, modelNodeList, modelLineList, algorithmList, modelNodeAndVnodeList);
// 5. 杞崲涓虹畻娉曞簱鎺ュ彛XML
if (result) {
- result = createIfXmlFromRbd(modelRbd, algorithmList, modelNodeAndVnodeList, productImgList);
+ result = createIfXmlFromRbd(modelRbd, algorithmList, modelNodeAndVnodeList);
}
// 6. 淇濆瓨妯″瀷
@@ -142,22 +142,41 @@
private boolean createIfXmlFromRbd(ModelRbd modelRbd,
List<Algorithm> algorithmList,
- List<ModelNode> modelNodeAndVnodeList,
- List<ProductImg> productImgList) {
+ List<ModelNode> modelNodeAndVnodeList) {
boolean result = true;
- try {
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- DocumentBuilder builder = factory.newDocumentBuilder();
- Document doc = builder.newDocument();
- Element rootElement = doc.createElement("DES");
- doc.appendChild(rootElement);
- TransformerFactory tf = TransformerFactory.newInstance();
- Transformer transformer = tf.newTransformer();
- transformer.setOutputProperty(OutputKeys.INDENT, "yes");
- StringWriter writer = new StringWriter();
- transformer.transform(new DOMSource(doc), new StreamResult(writer));
- String xmlString = writer.getBuffer().toString();
+ try {
+ Document document = DocumentHelper.createDocument();
+ // 娣诲姞root鑺傜偣
+ Element root = document.addElement("DES");
+ root.addAttribute("Name", "A System");
+ // 娣诲姞terminal鑺傜偣鍒皉oot1
+ Element terminal = root.addElement("Node");
+ terminal.addAttribute("Name", "Terminal");
+ terminal.addAttribute("Type", "NODE");
+
+ // 灏嗘ā鍨嬭浆鎹负DOM锛屾坊鍔犲埌root
+ Algorithm endAlgo = algorithmList.stream().filter(item ->
+ "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);
+ node2DOM(algorithmList, modelNodeAndVnodeList, computerNode, root);
+
+ // 娣诲姞start鑺傜偣鍒皉oot
+ Element start = root.addElement("Node");
+ start.addAttribute("Name", "Start");
+ start.addAttribute("Type", "NODE");
+ // 娣诲姞link锛堣矾寰勶級鍒皉oot
+ Element link = root.addElement("Link");
+ Element block = link.addElement("Block");
+ block.addAttribute("Name", "Terminal");
+ block = link.addElement("Block");
+ block.addAttribute("Name", computerNode.getId().toString());
+ block = link.addElement("Block");
+ block.addAttribute("Name", "Start");
+
+ document.setXMLEncoding("UTF-8");
+ String xmlString = document.asXML();
modelRbd.setIfXml(xmlString);
} catch (Exception e) {
e.printStackTrace();
@@ -167,12 +186,82 @@
return result;
}
+ // 閫掑綊鍑芥暟
+ private void node2DOM(List<Algorithm> algorithmList,
+ List<ModelNode> modelNodeAndVnodeList,
+ ModelNode node,
+ Element parent) {
+ if ("node".equals(node.getNodeType())) {
+ Long dataId = node.getDataId();
+ XhProductModel xhProductModel = xhProductModelDao.getById(dataId);
+ if (xhProductModel == null) return;
+ if ("1".equals(xhProductModel.getProductType())) {
+ // 璁惧
+ ParamData paramData = paramDataDao.getParamData(dataId, "expect");
+ if (paramData == null) return;
+ Element element = parent.addElement("Node");
+ element.addAttribute("Name", dataId.toString());
+ element.addAttribute("Type", "NODE");
+ Element failureTag = element.addElement("Failure");
+ failureTag.addAttribute("Dist", "EXP"); // TODO:闇�璁句负鍏蜂綋鐨勫垎甯�
+ Element argsTag = failureTag.addElement("Args");
+ Double value = new Double(paramData.getTaskMtbcfRegulate());
+ value = 1.0/value;
+ argsTag.addAttribute("value", value.toString());
+ if (1==paramData.getRepairable()) {
+ Element repairTag = element.addElement("Repair");
+ repairTag.addAttribute("Dist", "EXP"); // TODO:闇�璁句负鍏蜂綋鐨勫垎甯�
+ argsTag = repairTag.addElement("Args");
+ value = new Double(paramData.getRepairMttcr());
+ value = 1.0/value;
+ argsTag.addAttribute("value", value.toString());
+ Element repairTimeLimitTag = element.addElement("RepairTimeLimit");
+ repairTimeLimitTag.setText(paramData.getRepairMttcr());
+ }
+ } else if ("10".equals(xhProductModel.getProductType())) {
+ // 铏氬崟浣�
+ ModelRbd rbdXDY = modelRbdDao.getDiagramOfXDY(dataId);
+ if (rbdXDY == null) return;
+ List<Algorithm> algorithmListXDY = algorithmDao.getListByModelId(rbdXDY.getId());
+ List<ModelNode> modelNodeAndVnodeListXDY =modelNodeAlgorithmDao.getListByModelId(rbdXDY.getId());
+ Algorithm endAlgo = algorithmListXDY.stream().filter(item ->
+ "end".equals(item.getAlgorithmType())).collect(Collectors.toList()).get(0);
+ ModelNode computerNode = modelNodeAndVnodeListXDY.stream().filter(item ->
+ endAlgo.getComputerList().equals(item.getId().toString())).collect(Collectors.toList()).get(0);
+ node2DOM(algorithmListXDY, modelNodeAndVnodeListXDY, computerNode, parent);
+ }
+ } else {
+ // vnode锛堣繍绠楄妭鐐癸級
+ Algorithm algo = algorithmList.stream().filter(item ->
+ node.getId().equals(item.getId())).collect(Collectors.toList()).get(0);
+ Element element = parent.addElement("Logic");
+ element.addAttribute("Name", algo.getId().toString());
+ if ("series".equals(algo.getAlgorithmType())) {
+ element.addAttribute("Type", "SERIES");
+ } else if ("parallel".equals(algo.getAlgorithmType())) {
+ element.addAttribute("Type", "PARALLEL");
+ } else if ("vote".equals(algo.getAlgorithmType())) {
+ element.addAttribute("Type", "VOTE");
+ element.addAttribute("VoteValue", algo.getVoteNum().toString());
+ } else if ("switch".equals(algo.getAlgorithmType())) {
+ element.addAttribute("Type", "STANDBY");
+ } else if ("bridge".equals(algo.getAlgorithmType())) {
+ element.addAttribute("Type", "BRIDGE");
+ }
+ String[] computerNodeListStr = algo.getComputerList().split(",");
+ for (String nodeStr : computerNodeListStr) {
+ ModelNode nd = modelNodeAndVnodeList.stream().filter(item ->
+ nodeStr.equals(item.getId().toString())).collect(Collectors.toList()).get(0);
+ node2DOM(algorithmList, modelNodeAndVnodeList, nd, element);
+ }
+ }
+ }
+
private boolean getAlgorithmFromRbd(ModelRbd modelRbd,
List<ModelNode> modelNodeList,
List<ModelLine> modelLineList,
List<Algorithm> algorithmList,
- List<ModelNode> modelNodeAndVnodeList,
- List<ProductImg> productImgList) {
+ List<ModelNode> modelNodeAndVnodeList) {
// 鏍规嵁浠ヤ笅鐨勬瀯鍥捐鍒欐潵杩涜绠楁硶鍒嗚В锛�
// 1銆佽妭鐐圭殑瀹氫箟
// 1-1) 杩愮畻鑺傜偣锛氬叡2涓細鏃佽仈銆佽〃鍐筹紝涓旇繍绠楄妭鐐归渶鏀惧湪琚繍绠楄妭鐐圭殑鍙充晶銆�
@@ -592,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 {
@@ -787,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 {
@@ -882,6 +973,7 @@
}
}
if (thisNodeSuccess) {
+ modelNodeAndVnodeList.add(opNode);
replaceToVnode(opNode.getNodeType(), modelId, modelNodeList, modelLineList,
algorithmList, modelNodeAndVnodeList, opNode, endNode, branchNodeList);
hasSimplified = true;
@@ -911,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);
@@ -997,23 +1090,27 @@
modelNode.setName(name==null ? "" : name.toString());
productImg.setDataId(dataId);
- Object obj = JsonUtils2.getJsonValueByPath(jsonObject, "data/reliabDistribType".split("/"));
- if (obj!=null && StringUtils.isNotBlank(obj.toString())) {
- productImg.setReliabDistribType(Integer.valueOf(obj.toString()));
- }
- productImg.setTaskMtbcf(JsonUtils2.getJsonValueByPath(jsonObject, "data/taskMtbcf".split("/")).toString());
- productImg.setTaskMtbcfOther(JsonUtils2.getJsonValueByPath(jsonObject, "data/taskMtbcfOther".split("/")).toString());
- obj = JsonUtils2.getJsonValueByPath(jsonObject, "data/isRepair".split("/"));
- if (obj!=null && StringUtils.isNotBlank(obj.toString())) {
- productImg.setIsRepair(Integer.valueOf(obj.toString()));
- }
- if (1==productImg.getIsRepair()) {
- obj = JsonUtils2.getJsonValueByPath(jsonObject, "data/repairDistribType".split("/"));
- if (obj!=null && StringUtils.isNotBlank(obj.toString())) {
- productImg.setRepairDistribType(Integer.valueOf(obj.toString()));
+ String productType = JsonUtils2.getJsonValueByPath(jsonObject, "data/productType".split("/")).toString();
+ productImg.setProductType(productType);
+ if ("product_sb".equals(productType)) {
+ Object obj = JsonUtils2.getJsonValueByPath(jsonObject, "data/reliabDistribType".split("/"));
+ if (obj != null && StringUtils.isNotBlank(obj.toString())) {
+ productImg.setReliabDistribType(Integer.valueOf(obj.toString()));
}
- productImg.setRepairMttcr(JsonUtils2.getJsonValueByPath(jsonObject, "data/repairMttcr".split("/")).toString());
- productImg.setRepairMttcrOther(JsonUtils2.getJsonValueByPath(jsonObject, "data/repairMttcrOther".split("/")).toString());
+ productImg.setTaskMtbcf(JsonUtils2.getJsonValueByPath(jsonObject, "data/taskMtbcf".split("/")).toString());
+ productImg.setTaskMtbcfOther(JsonUtils2.getJsonValueByPath(jsonObject, "data/taskMtbcfOther".split("/")).toString());
+ obj = JsonUtils2.getJsonValueByPath(jsonObject, "data/isRepair".split("/"));
+ if (obj != null && StringUtils.isNotBlank(obj.toString())) {
+ productImg.setIsRepair(Integer.valueOf(obj.toString()));
+ }
+ if (1 == productImg.getIsRepair()) {
+ obj = JsonUtils2.getJsonValueByPath(jsonObject, "data/repairDistribType".split("/"));
+ if (obj != null && StringUtils.isNotBlank(obj.toString())) {
+ productImg.setRepairDistribType(Integer.valueOf(obj.toString()));
+ }
+ productImg.setRepairMttcr(JsonUtils2.getJsonValueByPath(jsonObject, "data/repairMttcr".split("/")).toString());
+ productImg.setRepairMttcrOther(JsonUtils2.getJsonValueByPath(jsonObject, "data/repairMttcrOther".split("/")).toString());
+ }
}
productImgList.add(productImg);
}
--
Gitblit v1.9.1