From 4a476243e0928236472f0a916467630cb5706ee5 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 17 五月 2024 11:40:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelLineService.java | 82 ++++++++++++++++++++++++++++++++++++----
1 files changed, 73 insertions(+), 9 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..24ca30a 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
@@ -17,10 +17,14 @@
import org.dom4j.DocumentHelper;
import org.dom4j.Document;
import org.dom4j.Element;
+import org.dom4j.io.OutputFormat;
+import org.dom4j.io.XMLWriter;
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 java.io.StringWriter;
import java.util.*;
import java.util.stream.Collectors;
@@ -121,23 +125,67 @@
// 1. 瑙ｆ瀽鍑鸿妭鐐逛笌杈�
getNodeAndLineFromRbd(modelRbd.getId(), rbdJsonArray, modelNodeList, modelLineList, productImgList);
- // 2. 璁＄畻鎵�鏈夎妭鐐圭殑鍏ュ彛绾挎暟鍙婂嚭鍙ｇ嚎鏁�
+ // 2. 瀵逛簬鏈夊鏍瑰叆鍙ｇ嚎鐨勪骇鍝佽妭鐐癸紝灏嗗叾涓婄殑琛ㄥ喅銆佹梺鑱斿叧绯诲墺绂绘垚杩愮畻绗﹁妭鐐癸紝娣诲姞鍒拌鑺傜偣鐨勫墠闈紝骞舵坊鍔犵浉搴旂殑杈�
+ peelOperationFromProductNode(modelRbd.getId(), modelNodeList, modelLineList);
+ // 3. 璁＄畻鎵�鏈夎妭鐐圭殑鍏ュ彛绾挎暟鍙婂嚭鍙ｇ嚎鏁�
calcInOutLineNumAllNode(modelNodeList, modelLineList);
- // 3. 澶嶅埗浜у搧鑺傜偣(node)鍒發ist
+ // 4. 澶嶅埗浜у搧鑺傜偣(node)鍒發ist
List<ModelNode> modelNodeAndVnodeList = modelNodeList.stream().filter(item ->
"node".equals(item.getNodeType())).collect(Collectors.toList());
- // 4. 涓嶆柇灏嗗熀鏈ā鍨嬶紙涓茶仈銆佸苟鑱斻�佹梺鑱斻�佽〃鍐炽�佹ˉ鑱旓級鏇挎崲涓鸿櫄鑺傜偣鑰岀畝鍖栧浘褰紝鐩磋嚦鏃犳硶绠�鍖栦负姝€��
+ // 5. 涓嶆柇灏嗗熀鏈ā鍨嬶紙涓茶仈銆佸苟鑱斻�佹梺鑱斻�佽〃鍐炽�佹ˉ鑱旓級鏇挎崲涓鸿櫄鑺傜偣鑰岀畝鍖栧浘褰紝鐩磋嚦鏃犳硶绠�鍖栦负姝€��
result = getAlgorithmFromRbd(modelRbd, modelNodeList, modelLineList, algorithmList, modelNodeAndVnodeList);
- // 5. 杞崲涓虹畻娉曞簱鎺ュ彛XML
+ // 6. 杞崲涓虹畻娉曞簱鎺ュ彛XML
if (result) {
-// result = createIfXmlFromRbd(modelRbd, algorithmList, modelNodeAndVnodeList);
+ result = createIfXmlFromRbd(modelRbd, algorithmList, modelNodeAndVnodeList);
}
- // 6. 淇濆瓨妯″瀷
+ // 7. 淇濆瓨妯″瀷
if (saveFlag) saveModel(modelRbd, modelNodeList, modelLineList, algorithmList, modelNodeAndVnodeList);
return result;
+ }
+
+ private void peelOperationFromProductNode(Long modelId,
+ List<ModelNode> modelNodeList,
+ List<ModelLine> modelLineList) {
+ List<ModelNode> nodesToAdd = new ArrayList<>();
+ List<ModelLine> linesToAdd = new ArrayList<>();
+ for (ModelNode node: modelNodeList) {
+ List<ModelLine> inLineList = modelLineList.stream().filter(item ->
+ item.getEndCell().equals(node.getPicId())).collect(Collectors.toList());
+ if ("node".equals(node.getNodeType()) &&
+ StringUtils.isNotBlank(node.getNodeTypeExt()) &&
+ inLineList.size() > 1) {
+ // 鏃佽仈or琛ㄥ喅
+ ModelNode nodeNew = new ModelNode();
+ Long nodeNewId = UUIDUtil.generateId();
+ nodeNew.setId(nodeNewId);
+ nodeNew.setPicId(nodeNewId.toString());
+ nodeNew.setModelId(modelId);
+ nodeNew.setNodeType(node.getNodeTypeExt());
+ nodeNew.setName(node.getNodeTypeExt());
+ nodeNew.setVoteNum(node.getVoteNum());
+ nodeNew.setPositionX(node.getPositionX());
+ nodeNew.setPositionY(node.getPositionY());
+ nodesToAdd.add(nodeNew);
+
+ ModelLine lineNew = new ModelLine();
+ Long lineNewId = UUIDUtil.generateId();
+ lineNew.setId(lineNewId);
+ lineNew.setPicId(lineNewId.toString());
+ lineNew.setModelId(modelId);
+ lineNew.setBeginCell(nodeNewId.toString());
+ lineNew.setEndCell(node.getPicId());
+ linesToAdd.add(lineNew);
+
+ for(ModelLine line: inLineList){
+ line.setEndCell(nodeNewId.toString());
+ }
+ }
+ }
+ modelNodeList.addAll(nodesToAdd);
+ modelLineList.addAll(linesToAdd);
}
private boolean createIfXmlFromRbd(ModelRbd modelRbd,
@@ -175,9 +223,20 @@
block = link.addElement("Block");
block.addAttribute("Name", "Start");
- document.setXMLEncoding("UTF-8");
- String xmlString = document.asXML();
- modelRbd.setIfXml(xmlString);
+// document.setXMLEncoding("UTF-8");
+// String xmlString = document.asXML();
+ // 杈撳嚭鏍煎紡鍖杧ml
+ XMLWriter xmlWriter = null;
+ try {
+ OutputFormat format = OutputFormat.createPrettyPrint();
+ format.setEncoding("UTF-8");
+ StringWriter writer = new StringWriter();
+ xmlWriter = new XMLWriter(writer, format);
+ xmlWriter.write(document);
+ modelRbd.setPublishedXml(writer.toString());
+ } finally {
+ if (xmlWriter!=null) xmlWriter.close();
+ }
} catch (Exception e) {
e.printStackTrace();
result = false;
@@ -681,6 +740,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 +936,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 +1032,7 @@
}
}
if (thisNodeSuccess) {
+ modelNodeAndVnodeList.add(opNode);
replaceToVnode(opNode.getNodeType(), modelId, modelNodeList, modelLineList,
algorithmList, modelNodeAndVnodeList, opNode, endNode, branchNodeList);
hasSimplified = true;
@@ -1000,6 +1062,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);
@@ -1158,6 +1221,7 @@
}
// 鏇存柊RBD鏁版嵁
+ modelRbd.setPublishedContent(modelRbd.getContent());
modelRbdDao.updateById(modelRbd);
}
--
Gitblit v1.9.1