From c400e8082b202fbf20ea0e740a306aa3c62e8fb5 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 12 三月 2024 14:18:46 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/service/ModelLineService.java | 729 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 714 insertions(+), 15 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/service/ModelLineService.java b/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/service/ModelLineService.java
index f1089bf..f60aa9e 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/service/ModelLineService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/service/ModelLineService.java
@@ -9,11 +9,13 @@
import com.zt.life.modules.taskReliability.dao.ModelLineDao;
import com.zt.life.modules.taskReliability.dao.ModelNodeDao;
import com.zt.life.modules.taskReliability.dao.ModelRbdDao;
+import com.zt.life.modules.taskReliability.dto.ModelLinePair;
import com.zt.life.modules.taskReliability.model.Algorithm;
import com.zt.life.modules.taskReliability.model.ModelLine;
import com.zt.life.modules.taskReliability.model.ModelNode;
import com.zt.life.modules.taskReliability.model.ModelRbd;
import org.apache.commons.lang3.StringUtils;
+import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
@@ -66,8 +68,8 @@
@Transactional(rollbackFor = Exception.class)
public void insert(ModelRbd modelRbd) {
if (modelRbd==null) return;
- if (modelRbd.getModelId()==null) return;
- Long modelId = modelRbd.getModelId();
+ if (modelRbd.getId()==null) return;
+ Long modelId = modelRbd.getId();
// 鍒犻櫎鏃㈡湁鏁版嵁
modelRbdDao.deleteByModelId(modelId);
@@ -80,27 +82,696 @@
@Transactional(rollbackFor = Exception.class)
public void update(ModelRbd modelRbd) {
if (modelRbd==null) return;
- if (modelRbd.getModelId()==null) return;
- Long modelId = modelRbd.getModelId();
+ if (modelRbd.getId()==null) return;
+ Long modelId = modelRbd.getId();
// 鍒犻櫎鏃㈡湁鏁版嵁
modelRbdDao.deleteByModelId(modelId);
- // 鎻掑叆鏁版嵁
- modelRbd.setId(UUIDUtil.generateId());
modelRbdDao.insert(modelRbd);
}
@Transactional(rollbackFor = Exception.class)
- public void analyze(ModelRbd modelRbd) {
- if (modelRbd==null) return;
- if (modelRbd.getModelId()==null) return;
- Long modelId = modelRbd.getModelId();
-
- analyzeRbdAndSave(modelId, modelRbd.getContent(), true);
+ public boolean analyze(ModelRbd modelRbd) {
+ boolean result = true;
+ if (modelRbd==null) return result;
+ Long modelId = modelRbd.getId();
+ result = analyzeRbd(modelId, modelRbd.getContent(), true);
+ return result;
}
- public void analyzeRbdAndSave(Long modelId, String content, boolean saveFlag) {
+ private boolean analyzeRbd(Long modelId, String content, boolean saveFlag) {
+ boolean result = true;
+ String rbdsonStr = content;
+
+ JSONArray rbdJsonArray = new JSONObject(rbdsonStr).getJSONArray("cells");
+ if (rbdJsonArray == null) return result;
+
+ // 瑙ｆ瀽缁撴灉瀛樻斁list
+ List<ModelNode> modelNodeList = new ArrayList<>();
+ List<ModelLine> modelLineList = new ArrayList<>();
+ List<Algorithm> algorithmList = new ArrayList<>();
+
+ // 1. 瑙ｆ瀽鍑鸿妭鐐逛笌杈�
+ getNodeAndLineFromRbd(modelId, rbdJsonArray, modelNodeList, modelLineList);
+ // 2. 璁＄畻鎵�鏈夎妭鐐圭殑鍏ュ彛绾挎暟鍙婂嚭鍙ｇ嚎鏁�
+ calcInOutLineNumAllNode(modelNodeList, modelLineList);
+ // 3. 澶嶅埗浜у搧鑺傜偣(node)鍒發ist
+ List<ModelNode> modelNodeAndVnodeList = modelNodeList.stream().filter(item ->
+ "node".equals(item.getNodeType())).collect(Collectors.toList());
+ // 4. 涓嶆柇灏嗗熀鏈ā鍨嬶紙涓茶仈銆佸苟鑱斻�佹梺鑱斻�佽〃鍐炽�佹ˉ鑱旓級鏇挎崲涓鸿櫄鑺傜偣鑰岀畝鍖栧浘褰紝鐩磋嚦鏃犳硶绠�鍖栦负姝€��
+ result = getAlgorithmFromRbd(modelId, modelNodeList, modelLineList, algorithmList, modelNodeAndVnodeList);
+
+ // 5. 淇濆瓨妯″瀷
+ if (saveFlag) saveModel(modelId, modelNodeList, modelLineList, algorithmList);
+
+ return result;
+ }
+
+ private boolean getAlgorithmFromRbd(Long modelId,
+ List<ModelNode> modelNodeList,
+ List<ModelLine> modelLineList,
+ List<Algorithm> algorithmList,
+ List<ModelNode> modelNodeAndVnodeList) {
+ // 鏍规嵁浠ヤ笅鐨勬瀯鍥捐鍒欐潵杩涜绠楁硶鍒嗚В锛�
+ // 1銆佽妭鐐圭殑瀹氫箟
+ // 1-1) 杩愮畻鑺傜偣锛氬叡2涓細鏃佽仈銆佽〃鍐筹紝涓旇繍绠楄妭鐐归渶鏀惧湪琚繍绠楄妭鐐圭殑鍙充晶銆�
+ // 1-2) 浜у搧鑺傜偣锛氫骇鍝佹ā鍨嬩腑鐨勮妭鐐�
+ // 1-3) 杩炴帴鑺傜偣锛氬叡3涓細start銆乪nd銆乧onnect
+ // 1-4) 铏氳妭鐐癸細浠ｆ浛鍩烘湰妯″瀷锛屾瀯鍥捐鍒欎笂绛夋晥浜庝骇鍝佽妭鐐�
+ // 2銆佸熀鏈ā鍨嬬殑瀹氫箟
+ // 2-1) 涓茶仈锛氭病鏈変笓闂ㄧ殑琛ㄧず绗﹀彿锛岀敱鑺傜偣闂寸殑杩炴帴鍏崇郴瀹氫箟銆�2涓強浠ヤ笂鐨勮妭鐐癸紙浜у搧鑺傜偣鎴栬櫄鑺傜偣锛夊彧鏋勬垚1鏉¤矾寰勶紝缁堢鑺傜偣鍙湁1涓嚭鍙ｏ紙鍏ュ彛涓暟鏃犻檺鍒讹級銆�
+ // 2-2) 骞惰仈锛氭病鏈変笓闂ㄧ殑琛ㄧず绗﹀彿锛岀敱鑺傜偣闂寸殑杩炴帴鍏崇郴瀹氫箟銆�2涓強浠ヤ笂鐨勮妭鐐癸紙浜у搧鑺傜偣鎴栬櫄鑺傜偣锛夐兘鍙湁1涓叆鍙ｅ拰鍑哄彛锛屼笖杩欎簺鑺傜偣鎷ユ湁鍚屼竴涓叆鍙ｈ妭鐐瑰拰鍚屼竴涓嚭鍙ｈ妭鐐广��
+ // 2-3) 鏃佽仈锛氱敱涓撻棬鐨勬梺鑱旇繍绠楃琛ㄧず锛屾瘡鏉℃梺鑱旀敮璺彧鏈�1涓妭鐐癸紙浜у搧鑺傜偣鎴栬櫄鑺傜偣锛夛紝杩欎簺鑺傜偣閮戒互璇ユ梺鑱旇妭鐐逛负鍑哄彛鑺傜偣锛屼笖杩欎簺鑺傜偣鎷ユ湁鍚屼竴涓叆鍙ｈ妭鐐广��
+ // 2-4) 琛ㄥ喅锛氱敱涓撻棬鐨勮〃鍐宠繍绠楃琛ㄧず锛屾瘡鏉¤〃鍐虫敮璺彧鏈�1涓妭鐐癸紙浜у搧鑺傜偣鎴栬櫄鑺傜偣锛夛紝杩欎簺鑺傜偣閮戒互璇ヨ〃鍐宠妭鐐逛负鍑哄彛鑺傜偣锛屼笖杩欎簺鑺傜偣鎷ユ湁鍚屼竴涓叆鍙ｈ妭鐐广��
+ // 2-5) 妗ヨ仈锛氭病鏈変笓闂ㄧ殑琛ㄧず绗﹀彿锛岀敱鑺傜偣闂寸殑杩炴帴鍏崇郴瀹氫箟銆�
+ // 3銆佹牴鎹互涓婂熀鏈ā鍨嬬殑瀹氫箟锛屼笉鏂皢鍩烘湰妯″瀷绠�鍖栦负铏氳妭鐐癸紝鐩磋嚦绠�鍖栧畬姣曪紝鎴栬�呮棤娉曠畝鍖栦负姝€��
+ boolean isEnd = false; // 鍥惧舰绠�鍖栧畬姣曪紙鍏ㄩ儴绠�鍖栨病浜嗭級
+ boolean hasSimplified = false; // 鑷冲皯绠�鍖栦簡涓�澶勫浘褰�
+ do {
+ hasSimplified = false;
+ hasSimplified = simplifySeries(modelId, modelNodeList, modelLineList, algorithmList, modelNodeAndVnodeList, hasSimplified);
+ hasSimplified = simplifyParallel(modelId, modelNodeList, modelLineList, algorithmList, modelNodeAndVnodeList, hasSimplified);
+ hasSimplified = simplifyOperator("switch", modelId, modelNodeList, modelLineList, algorithmList, hasSimplified);
+ hasSimplified = simplifyOperator("vote", modelId, modelNodeList, modelLineList, algorithmList, hasSimplified);
+ hasSimplified = simplifyBridge(modelId, modelNodeList, modelLineList, algorithmList, modelNodeAndVnodeList, hasSimplified);
+ isEnd = simplifyEnd(modelId, modelNodeList, modelLineList, algorithmList, modelNodeAndVnodeList);
+ } while (!isEnd && hasSimplified);
+
+ // 鍚堝苟纰庣墖鍖栦簡鐨勪覆鑱�
+
+ // 鍚堝苟纰庣墖鍖栦簡鐨勫苟鑱�
+
+ return isEnd;
+ }
+
+ private boolean simplifyEnd(Long modelId,
+ List<ModelNode> modelNodeList,
+ List<ModelLine> modelLineList,
+ List<Algorithm> algorithmList,
+ List<ModelNode> modelNodeAndVnodeList) {
+ ModelNode endNode = modelNodeList.stream().filter(item ->
+ "end".equals(item.getNodeType())).collect(Collectors.toList()).get(0);
+ if (endNode.getInLineNum()!=1) return false;
+
+ ModelLine lineToEnd = modelLineList.stream().filter(item ->
+ item.getEndCell().equals(endNode.getPicId())).collect(Collectors.toList()).get(0);
+ ModelNode node = modelNodeList.stream().filter(item ->
+ lineToEnd.getBeginCell().equals(item.getPicId())).collect(Collectors.toList()).get(0);
+ if (node.getInLineNum()!=1 || node.getOutLineNum()!=1) return false;
+
+ ModelLine lineToNode = modelLineList.stream().filter(item ->
+ item.getEndCell().equals(node.getPicId())).collect(Collectors.toList()).get(0);
+ ModelNode startNode = modelNodeList.stream().filter(item ->
+ lineToNode.getBeginCell().equals(item.getPicId())).collect(Collectors.toList()).get(0);
+ if (!"start".equals(startNode.getNodeType()) || startNode.getOutLineNum()!=1) return false;
+
+ // 鍒犻櫎鑺傜偣鍙婅繛绾�
+ modelLineList.remove(lineToEnd);
+ modelLineList.remove(lineToNode);
+ modelNodeList.remove(endNode);
+ modelNodeList.remove(node);
+ modelNodeList.remove(startNode);
+
+ // 鐢熸垚缁撴潫鐨勭畻娉曟楠�
+ // 鏂板algorithm
+ Algorithm algorithm = new Algorithm();
+ Long id = UUIDUtil.generateId();
+ algorithm.setId(id);
+ algorithm.setModelId(modelId);
+ algorithm.setComputerId(id);
+ algorithm.setModelType(endNode.getNodeType());
+ algorithm.setAlgorithmType(endNode.getNodeType());
+ algorithm.setComputerList(node.getId().toString());
+ algorithm.setObjectList(node.getName());
+ algorithm.setStep(algorithmList.size());
+ algorithmList.add(algorithm);
+
+ // 鏂板缁撴潫鐨勮櫄鑺傜偣
+ ModelNode vnode = new ModelNode();
+ vnode.setId(id);
+ vnode.setPicId(id.toString());
+ vnode.setModelId(modelId);
+ vnode.setNodeType("vnode");
+ vnode.setName("v"+algorithm.getStep());
+ modelNodeAndVnodeList.add(vnode);
+
+ return true;
+ }
+
+ private boolean simplifySeries(Long modelId,
+ List<ModelNode> modelNodeList,
+ List<ModelLine> modelLineList,
+ List<Algorithm> algorithmList,
+ List<ModelNode> modelNodeAndVnodeList,
+ boolean hasSimplified) {
+ List<ModelNode> startNodes = modelNodeList.stream().filter(item ->
+ "node,vnode,connect,end".contains(item.getNodeType())).collect(Collectors.toList());
+ if (startNodes.size()==0) return hasSimplified;
+
+ for (ModelNode startNode : startNodes) {
+ if (startNode.getInLineNum()!=1) continue;
+
+ List<ModelNode> result = new ArrayList<>();
+ if (!"end".equals(startNode.getNodeType())) result.add(startNode);
+ seekPathSeries(modelNodeList, modelLineList, startNode, result);
+ if (result.size()<2) continue;
+
+ ModelNode endNode = result.get(result.size()-1);
+ if ("start,switch,vote".contains(endNode.getNodeType()) || endNode.getOutLineNum()!=1) {
+ result.remove(endNode);
+ }
+ List<ModelNode> seriesNodes = result.stream().filter(item ->
+ !"connect".equals(item.getNodeType())).collect(Collectors.toList());
+ if (seriesNodes.size()<2) continue;
+
+ // 鏇挎崲鎴愯櫄鑺傜偣
+ replaceToVnodeSeries(modelId, modelNodeList, modelLineList,
+ algorithmList, modelNodeAndVnodeList, result, seriesNodes);
+ hasSimplified = true;
+ }
+
+ return hasSimplified;
+ }
+
+ private void replaceToVnodeSeries(Long modelId,
+ List<ModelNode> modelNodeList,
+ List<ModelLine> modelLineList,
+ List<Algorithm> algorithmList,
+ List<ModelNode> modelNodeAndVnodeList,
+ List<ModelNode> path,
+ List<ModelNode> seriesNodes) {
+ // 鏂板algorithm
+ Algorithm algorithm = new Algorithm();
+ Long id = UUIDUtil.generateId();
+ algorithm.setId(id);
+ algorithm.setModelId(modelId);
+ algorithm.setComputerId(id);
+ algorithm.setModelType("series");
+ algorithm.setAlgorithmType("series");
+ algorithm.setComputerList(joinNodeId(seriesNodes, ","));
+ algorithm.setObjectList(joinNodeName(seriesNodes, ","));
+ algorithm.setStep(algorithmList.size());
+ algorithmList.add(algorithm);
+
+ // 鏂板铏氳妭鐐�
+ ModelNode vnode = new ModelNode();
+ vnode.setId(id);
+ vnode.setPicId(id.toString());
+ vnode.setModelId(modelId);
+ vnode.setNodeType("vnode");
+ vnode.setName("v"+algorithm.getStep());
+ modelNodeList.add(vnode);
+ modelNodeAndVnodeList.add(vnode);
+
+ // 灏唒ath鏇挎崲涓鸿铏氳妭鐐�
+ for (int i=0; i<path.size(); i++) {
+ ModelNode finalNode = path.get(i);
+ if (i==0) {
+ // 灏嗚鑺傜偣鐨勫嚭鍙ｇ嚎鏀逛负杩炴帴鍒拌櫄鑺傜偣
+ List<ModelLine> outLines = modelLineList.stream().filter(item ->
+ item.getBeginCell().equals(finalNode.getPicId())).collect(Collectors.toList());
+ for (ModelLine line : outLines) {
+ line.setBeginCell(vnode.getPicId());
+ }
+ // 灏嗚鑺傜偣鐨勫叆鍙ｇ嚎鍒犻櫎
+ List<ModelLine> inLines = modelLineList.stream().filter(item ->
+ item.getEndCell().equals(finalNode.getPicId())).collect(Collectors.toList());
+ modelLineList.removeAll(inLines);
+ }
+ if (i==path.size()-1) {
+ // 灏嗚鑺傜偣鐨勫叆鍙ｇ嚎鏀逛负杩炴帴鍒拌櫄鑺傜偣
+ List<ModelLine> inLines = modelLineList.stream().filter(item ->
+ item.getEndCell().equals(finalNode.getPicId())).collect(Collectors.toList());
+ for (ModelLine line : inLines) {
+ line.setEndCell(vnode.getPicId());
+ }
+ // 灏嗚鑺傜偣鐨勫嚭鍙ｇ嚎鍒犻櫎
+ List<ModelLine> outLines = modelLineList.stream().filter(item ->
+ item.getBeginCell().equals(finalNode.getPicId())).collect(Collectors.toList());
+ modelLineList.removeAll(outLines);
+ }
+ // 鍒犻櫎璇ヨ妭鐐圭殑鍑哄叆鍙ｇ嚎
+ List<ModelLine> inOutLines = modelLineList.stream().filter(item ->
+ item.getEndCell().equals(finalNode.getPicId()) || item.getBeginCell().equals(finalNode.getPicId())
+ ).collect(Collectors.toList());
+ modelLineList.removeAll(inOutLines);
+ // 鍒犻櫎璇ヨ妭鐐�
+ modelNodeList.remove(finalNode);
+ calcInOutLineNum(finalNode, modelLineList);
+ }
+
+ calcInOutLineNum(vnode, modelLineList);
+ }
+
+ private void seekPathSeries(List<ModelNode> modelNodeList,
+ List<ModelLine> modelLineList,
+ ModelNode startNode,
+ List<ModelNode> result) {
+ ModelLine inLine = modelLineList.stream().filter(item ->
+ item.getEndCell().equals(startNode.getPicId())).collect(Collectors.toList()).get(0);
+ ModelNode pathNode = modelNodeList.stream().filter(item ->
+ inLine.getBeginCell().equals(item.getPicId())).collect(Collectors.toList()).get(0);
+ result.add(pathNode);
+ if (pathNode.getOutLineNum()!=1 || pathNode.getInLineNum()!=1) return;
+ if ("switch,vote".contains(pathNode.getNodeType())) return;
+ seekPathSeries(modelNodeList, modelLineList, pathNode, result);
+ }
+
+ private boolean simplifyParallel(Long modelId,
+ List<ModelNode> modelNodeList,
+ List<ModelLine> modelLineList,
+ List<Algorithm> algorithmList,
+ List<ModelNode> modelNodeAndVnodeList,
+ boolean hasSimplified) {
+ boolean hasSimplifiedMe = false;
+ List<ModelNode> startNodes = modelNodeList.stream().filter(item ->
+ "node,vnode,connect,end".contains(item.getNodeType())).collect(Collectors.toList());
+ if (startNodes.size()==0) return hasSimplified;
+
+ for (ModelNode startNode : startNodes) {
+ if (startNode.getInLineNum()<2) continue;
+ List<ModelLine> inLines = modelLineList.stream().filter(item ->
+ item.getEndCell().equals(startNode.getPicId())).collect(Collectors.toList());
+ hasSimplifiedMe = simplifyParallelGroup(modelId, modelNodeList, modelLineList,
+ algorithmList, modelNodeAndVnodeList, startNode, inLines);
+ if (hasSimplifiedMe) {
+ hasSimplified = true;
+ }
+ }
+
+ return hasSimplified;
+ }
+
+ private boolean simplifyParallelGroup(Long modelId,
+ List<ModelNode> modelNodeList,
+ List<ModelLine> modelLineList,
+ List<Algorithm> algorithmList,
+ List<ModelNode> modelNodeAndVnodeList,
+ ModelNode startNode,
+ List<ModelLine> lines) {
+ boolean hasSimplified = false;
+ List<List<ModelNode>> pathList = new ArrayList<>();
+ for (ModelLine line : lines) {
+ List<ModelNode> path = getOneBranchParallel(modelNodeList, modelLineList, line);
+ if (path.size() > 0) pathList.add(path);
+ }
+ Map<ModelNode, List<List<ModelNode>>> endNodePathsMap = groupingPathByEndNode(pathList);
+ for (Map.Entry<ModelNode, List<List<ModelNode>>> entry : endNodePathsMap.entrySet()) {
+ List<List<ModelNode>> pathOneGroup = entry.getValue();
+ if (pathOneGroup.size()>1) {
+ List<ModelNode> branchNodeList = new ArrayList<>();
+ ModelNode endNode = getBranchNodesOneParallel(pathOneGroup, branchNodeList);
+ if ("connect".equals(startNode.getNodeType()) && pathOneGroup.size()==lines.size()) {
+ // 鏇挎崲鎴愯櫄鑺傜偣
+ replaceToVnode("parallel", modelId, modelNodeList, modelLineList,
+ algorithmList, startNode, endNode, branchNodeList);
+ } else {
+ // 鏂板铏氳妭鐐�
+ ModelNode vnode = new ModelNode();
+ Long id = UUIDUtil.generateId();
+ vnode.setId(id);
+ vnode.setPicId(id.toString());
+ vnode.setModelId(modelId);
+ vnode.setNodeType("vnode");
+ modelNodeList.add(vnode);
+ modelNodeAndVnodeList.add(vnode);
+ ModelLine modelLineNew = new ModelLine();
+ Long picId2 = UUIDUtil.generateId();
+ modelLineNew.setId(picId2);
+ modelLineNew.setPicId(picId2.toString());
+ modelLineNew.setModelId(modelId);
+ modelLineNew.setBeginCell(vnode.getPicId());
+ modelLineNew.setEndCell(startNode.getPicId());
+ modelLineList.add(modelLineNew);
+ replaceToVnode("parallel", modelId, modelNodeList, modelLineList,
+ algorithmList, vnode, endNode, branchNodeList);
+ calcInOutLineNum(startNode, modelLineList);
+ }
+ hasSimplified = true;
+ }
+ }
+
+ return hasSimplified;
+ }
+
+ private List<ModelNode> getOneBranchParallel(List<ModelNode> modelNodeList,
+ List<ModelLine> modelLineList,
+ ModelLine line) {
+ List<ModelNode> path = new ArrayList<>();
+ ModelNode branchNode = modelNodeList.stream().filter(item ->
+ line.getBeginCell().equals(item.getPicId())).collect(Collectors.toList()).get(0);
+ List<ModelLine> inLines = modelLineList.stream().filter(item ->
+ item.getEndCell().equals(branchNode.getPicId())).collect(Collectors.toList());
+ List<ModelLine> outLines = modelLineList.stream().filter(item ->
+ item.getBeginCell().equals(branchNode.getPicId())).collect(Collectors.toList());
+ if (inLines.size()!=1 || outLines.size()!=1) return path;
+ ModelLine lineToBranchNode = inLines.get(0);
+ ModelNode endNode = modelNodeList.stream().filter(item ->
+ lineToBranchNode.getBeginCell().equals(item.getPicId())).collect(Collectors.toList()).get(0);
+ path.add(branchNode);
+ path.add(endNode);
+
+ return path;
+ }
+
+ private Map<ModelNode, List<List<ModelNode>>> groupingPathByEndNode(List<List<ModelNode>> pathList) {
+ Map<ModelNode, List<List<ModelNode>>> endNodePathsMap = new HashMap<>();
+ for (List<ModelNode> path : pathList) {
+ ModelNode endNode = path.get(path.size()-1);
+ if (endNodePathsMap.containsKey(endNode)) {
+ endNodePathsMap.get(endNode).add(path);
+ } else {
+ List<List<ModelNode>> paths = new ArrayList<>();
+ paths.add(path);
+ endNodePathsMap.put(endNode, paths);
+ }
+ }
+ return endNodePathsMap;
+ }
+
+ private ModelNode getBranchNodesOneParallel(List<List<ModelNode>> paths,
+ List<ModelNode> branchNodeList) {
+ ModelNode endNode = null;
+ for (List<ModelNode> path : paths) {
+ branchNodeList.add(path.get(0));
+ endNode = path.get(path.size()-1);
+ }
+ return endNode;
+ }
+
+ private boolean simplifyBridge(Long modelId,
+ List<ModelNode> modelNodeList,
+ List<ModelLine> modelLineList,
+ List<Algorithm> algorithmList,
+ List<ModelNode> modelNodeAndVnodeList,
+ boolean hasSimplified) {
+ boolean hasSimplifiedMe = false;
+ List<ModelNode> startNodes = modelNodeList.stream().filter(item ->
+ "node,vnode,connect,end".contains(item.getNodeType())).collect(Collectors.toList());
+ if (startNodes.size()==0) return hasSimplified;
+
+ for (ModelNode startNode : startNodes) {
+ List<ModelLine> lines = modelLineList.stream().filter(item ->
+ item.getEndCell().equals(startNode.getPicId())).collect(Collectors.toList());
+ if (lines.size()<2) continue;
+ List<ModelLinePair> linePairs = getLinePairs(lines);
+ for (ModelLinePair linePair : linePairs) {
+ hasSimplifiedMe = simplifyBridgeOneLinePair(modelId, modelNodeList, modelLineList,
+ algorithmList, modelNodeAndVnodeList, startNode, linePair);
+ if (hasSimplifiedMe) {
+ hasSimplified = true;
+ break;
+ }
+ }
+ }
+
+ return hasSimplified;
+ }
+
+ private boolean simplifyBridgeOneLinePair(Long modelId,
+ List<ModelNode> modelNodeList,
+ List<ModelLine> modelLineList,
+ List<Algorithm> algorithmList,
+ List<ModelNode> modelNodeAndVnodeList,
+ ModelNode startNode,
+ ModelLinePair linePair) {
+ ModelNode node1 = null;
+ ModelNode node2 = null;
+ ModelNode node3 = null;
+ ModelNode node4 = null;
+ ModelNode node5 = null;
+ ModelNode nodeTmp1 = modelNodeList.stream().filter(item ->
+ linePair.getLine1().getBeginCell().equals(item.getPicId())).collect(Collectors.toList()).get(0);
+ ModelNode nodeTmp2 = modelNodeList.stream().filter(item ->
+ linePair.getLine2().getBeginCell().equals(item.getPicId())).collect(Collectors.toList()).get(0);
+ calcInOutLineNum(nodeTmp1, modelLineList);
+ calcInOutLineNum(nodeTmp2, modelLineList);
+ if (nodeTmp1.getOutLineNum()!=1 || nodeTmp2.getOutLineNum()!=1) return false;
+ if (nodeTmp1.getInLineNum()<1 || nodeTmp1.getInLineNum()>2) return false;
+ if (nodeTmp2.getInLineNum()<1 || nodeTmp2.getInLineNum()>2) return false;
+ if ((nodeTmp1.getInLineNum() + nodeTmp2.getInLineNum())!=3) return false;
+ if (nodeTmp1.getInLineNum()==1) {
+ node2 = nodeTmp1;
+ node5 = nodeTmp2;
+ } else {
+ node2 = nodeTmp2;
+ node5 = nodeTmp1;
+ }
+ ModelNode finalNode = node2;
+ ModelLine line1To2 = modelLineList.stream().filter(item ->
+ item.getEndCell().equals(finalNode.getPicId())).collect(Collectors.toList()).get(0);
+ node1 = modelNodeList.stream().filter(item ->
+ line1To2.getBeginCell().equals(item.getPicId())).collect(Collectors.toList()).get(0);
+ if (node1.getInLineNum()!=1 || node1.getOutLineNum()!=2) return false;
+ ModelNode finalNode1 = node1;
+ List<ModelLine> outLinesFrom1 = modelLineList.stream().filter(item ->
+ item.getBeginCell().equals(finalNode1.getPicId())).collect(Collectors.toList());
+ if (outLinesFrom1.get(0).getEndCell().equals(node2.getPicId())) {
+ node3 = modelNodeList.stream().filter(item ->
+ outLinesFrom1.get(1).getEndCell().equals(item.getPicId())).collect(Collectors.toList()).get(0);
+ } else {
+ node3 = modelNodeList.stream().filter(item ->
+ outLinesFrom1.get(0).getEndCell().equals(item.getPicId())).collect(Collectors.toList()).get(0);
+ }
+ if (node3.getId().equals(node5.getId())) return false;
+ if (node3.getInLineNum()!=1 || node3.getOutLineNum()!=1) return false;
+ ModelNode finalNode2 = node3;
+ ModelLine outLineFrom3 = modelLineList.stream().filter(item ->
+ item.getBeginCell().equals(finalNode2.getPicId())).collect(Collectors.toList()).get(0);
+ if (!outLineFrom3.getEndCell().equals(node5.getPicId())) return false;
+ ModelNode finalNode3 = node5;
+ List<ModelLine> inLinesTo5 = modelLineList.stream().filter(item ->
+ item.getEndCell().equals(finalNode3.getPicId())).collect(Collectors.toList());
+ if (inLinesTo5.get(0).getBeginCell().equals(node3.getPicId())) {
+ node4 = modelNodeList.stream().filter(item ->
+ inLinesTo5.get(1).getBeginCell().equals(item.getPicId())).collect(Collectors.toList()).get(0);
+ } else {
+ node4 = modelNodeList.stream().filter(item ->
+ inLinesTo5.get(0).getBeginCell().equals(item.getPicId())).collect(Collectors.toList()).get(0);
+ }
+ if (node4.getId().equals(node1.getId())) return false;
+ if (node4.getId().equals(node2.getId())) return false;
+ if (node4.getInLineNum()!=1 || node4.getOutLineNum()!=1) return false;
+ ModelNode finalNode4 = node1;
+ ModelLine lineTo1 = modelLineList.stream().filter(item ->
+ item.getEndCell().equals(finalNode4.getPicId())).collect(Collectors.toList()).get(0);
+ ModelNode finalNode5 = node4;
+ ModelLine lineTo4 = modelLineList.stream().filter(item ->
+ item.getEndCell().equals(finalNode5.getPicId())).collect(Collectors.toList()).get(0);
+ nodeTmp1 = modelNodeList.stream().filter(item ->
+ lineTo1.getBeginCell().equals(item.getPicId())).collect(Collectors.toList()).get(0);
+ nodeTmp2 = modelNodeList.stream().filter(item ->
+ lineTo4.getBeginCell().equals(item.getPicId())).collect(Collectors.toList()).get(0);
+ if (!nodeTmp1.getId().equals(nodeTmp2.getId())) return false;
+ ModelNode endNode = nodeTmp1;
+ List<ModelNode> branchNodeList = new ArrayList<>();
+ branchNodeList.add(node1);
+ branchNodeList.add(node2);
+ branchNodeList.add(node3);
+ branchNodeList.add(node4);
+ branchNodeList.add(node5);
+
+ if ("connect".contains(startNode.getNodeType()) && startNode.getInLineNum()==2) {
+ // 鏇挎崲鎴愯櫄鑺傜偣
+ replaceToVnode("bridge", modelId, modelNodeList, modelLineList,
+ algorithmList, startNode, endNode, branchNodeList);
+ } else {
+ // 鏂板铏氳妭鐐�
+ ModelNode vnode = new ModelNode();
+ Long id = UUIDUtil.generateId();
+ vnode.setId(id);
+ vnode.setPicId(id.toString());
+ vnode.setModelId(modelId);
+ vnode.setNodeType("vnode");
+ modelNodeList.add(vnode);
+ modelNodeAndVnodeList.add(vnode);
+ ModelLine modelLineNew = new ModelLine();
+ Long picId2 = UUIDUtil.generateId();
+ modelLineNew.setId(picId2);
+ modelLineNew.setPicId(picId2.toString());
+ modelLineNew.setModelId(modelId);
+ modelLineNew.setBeginCell(vnode.getPicId());
+ modelLineNew.setEndCell(startNode.getPicId());
+ modelLineList.add(modelLineNew);
+ replaceToVnode("bridge", modelId, modelNodeList, modelLineList,
+ algorithmList, vnode, endNode, branchNodeList);
+ calcInOutLineNum(startNode, modelLineList);
+ }
+
+ return true;
+ }
+
+ private void calcInOutLineNumAllNode(List<ModelNode> modelNodeList, List<ModelLine> modelLineList) {
+ for (ModelNode node : modelNodeList) {
+ calcInOutLineNum(node, modelLineList);
+ }
+ }
+
+ private void calcInOutLineNum(ModelNode node, List<ModelLine> modelLineList) {
+ List<ModelLine> inLines = modelLineList.stream().filter(item ->
+ item.getEndCell().equals(node.getPicId())).collect(Collectors.toList());
+ List<ModelLine> outLines = modelLineList.stream().filter(item ->
+ item.getBeginCell().equals(node.getPicId())).collect(Collectors.toList());
+ node.setInLineNum(inLines.size());
+ node.setOutLineNum(outLines.size());
+ }
+
+ // 鎵惧嚭鎵�鏈�2鏍圭嚎鐨勭粍鍚�
+ private List<ModelLinePair> getLinePairs(List<ModelLine> lines) {
+ List<ModelLinePair> linePairs = new ArrayList<>();
+ for (int i=0; i<lines.size()-1; i++) {
+ for (int j=i+1; j<lines.size(); j++) {
+ ModelLinePair linePair = new ModelLinePair();
+ linePair.setLine1(lines.get(i));
+ linePair.setLine2(lines.get(j));
+ linePairs.add(linePair);
+ }
+ }
+ return linePairs;
+ }
+
+ private boolean simplifyOperator(String operator,
+ Long modelId,
+ List<ModelNode> modelNodeList,
+ List<ModelLine> modelLineList,
+ List<Algorithm> algorithmList,
+ boolean hasSimplified) {
+ List<ModelNode> opNodes = modelNodeList.stream().filter(item ->
+ operator.equals(item.getNodeType())).collect(Collectors.toList());
+ if (opNodes.size()==0) return hasSimplified;
+
+ for (ModelNode opNode : opNodes) {
+ List<ModelLine> lines = modelLineList.stream().filter(item ->
+ item.getEndCell().equals(opNode.getPicId())).collect(Collectors.toList());
+ boolean thisNodeSuccess = true;
+ ModelNode endNode = null;
+ List<ModelNode> branchNodeList = new ArrayList<>();
+ for (ModelLine line : lines) {
+ ModelNode curEndNode = handleOneBranch(modelNodeList, modelLineList, line, branchNodeList);
+ if (curEndNode == null) {
+ thisNodeSuccess = false;
+ break;
+ }
+ if (endNode == null) {
+ endNode = curEndNode;
+ } else {
+ if (!endNode.getId().equals(curEndNode.getId())) {
+ thisNodeSuccess = false;
+ break;
+ }
+ }
+ }
+ if (thisNodeSuccess) {
+ replaceToVnode(opNode.getNodeType(), modelId, modelNodeList, modelLineList,
+ algorithmList, opNode, endNode, branchNodeList);
+ hasSimplified = true;
+ }
+ }
+
+ return hasSimplified;
+ }
+
+ private void replaceToVnode(String type,
+ Long modelId,
+ List<ModelNode> modelNodeList,
+ List<ModelLine> modelLineList,
+ List<Algorithm> algorithmList,
+ ModelNode startNode,
+ ModelNode endNode,
+ List<ModelNode> branchNodeList) {
+ // 鏂板algorithm
+ Algorithm algorithm = new Algorithm();
+ Long id = UUIDUtil.generateId();
+ algorithm.setId(id);
+ algorithm.setModelId(modelId);
+ algorithm.setComputerId(id);
+ algorithm.setModelType(type);
+ algorithm.setAlgorithmType(type);
+ algorithm.setComputerList(joinNodeId(branchNodeList, ","));
+ algorithm.setObjectList(joinNodeName(branchNodeList, ","));
+ algorithm.setStep(algorithmList.size());
+ algorithmList.add(algorithm);
+
+ // 鏇挎崲涓鸿櫄鑺傜偣
+ for (ModelNode node : branchNodeList) {
+ List<ModelLine> branchNodeLineList = modelLineList.stream().filter(item ->
+ item.getEndCell().equals(node.getPicId()) || item.getBeginCell().equals(node.getPicId())
+ ).collect(Collectors.toList());
+ modelLineList.removeAll(branchNodeLineList);
+ modelNodeList.remove(node);
+ calcInOutLineNum(node, modelLineList);
+ }
+ startNode.setId(id);
+ startNode.setNodeType("vnode");
+ startNode.setName("v"+algorithm.getStep());
+
+ ModelLine modelLineNew = new ModelLine();
+ Long picId2 = UUIDUtil.generateId();
+ modelLineNew.setId(picId2);
+ modelLineNew.setPicId(picId2.toString());
+ modelLineNew.setModelId(modelId);
+ modelLineNew.setBeginCell(endNode.getPicId());
+ modelLineNew.setEndCell(startNode.getPicId());
+ modelLineList.add(modelLineNew);
+
+ calcInOutLineNum(startNode, modelLineList);
+ calcInOutLineNum(endNode, modelLineList);
+ }
+
+ private ModelNode handleOneBranch(List<ModelNode> modelNodeList,
+ List<ModelLine> modelLineList,
+ ModelLine line,
+ List<ModelNode> branchNodeList
+ ) {
+ ModelNode branchNode = modelNodeList.stream().filter(item ->
+ line.getBeginCell().equals(item.getPicId())).collect(Collectors.toList()).get(0);
+ List<ModelLine> inLines = modelLineList.stream().filter(item ->
+ item.getEndCell().equals(branchNode.getPicId())).collect(Collectors.toList());
+ List<ModelLine> outLines = modelLineList.stream().filter(item ->
+ item.getBeginCell().equals(branchNode.getPicId())).collect(Collectors.toList());
+ if (inLines.size()!=1 || outLines.size()!=1) return null;
+ ModelLine lineToBranchNode = inLines.get(0);
+ ModelNode endNode = modelNodeList.stream().filter(item ->
+ lineToBranchNode.getBeginCell().equals(item.getPicId())).collect(Collectors.toList()).get(0);
+
+ branchNodeList.add(branchNode);
+ return endNode;
+ }
+
+ private void getNodeAndLineFromRbd(Long modelId,
+ JSONArray rbdJsonArray,
+ List<ModelNode> modelNodeList,
+ List<ModelLine> modelLineList) {
+ for (int i = 0; i < rbdJsonArray.size(); i++) {
+ JSONObject jsonObject = rbdJsonArray.getJSONObject(i);
+ String shape = jsonObject.get("shape").toString();
+ if ("edge".equals(shape)) {
+ ModelLine modelLine = new ModelLine();
+ modelLine.setId(UUIDUtil.generateId());
+ modelLine.setModelId(modelId);
+ modelLine.setPicId(jsonObject.get("id").toString());
+ modelLine.setBeginCell(JsonUtils2.getJsonValueByPath(jsonObject, "source/cell".split("/")).toString());
+ modelLine.setEndCell(JsonUtils2.getJsonValueByPath(jsonObject, "target/cell".split("/")).toString());
+ modelLineList.add(modelLine);
+ } else if ("image".equals(shape)){
+ ModelNode modelNode = new ModelNode();
+ modelNode.setId(UUIDUtil.generateId());
+ modelNode.setModelId(modelId);
+ modelNode.setPicId(jsonObject.get("id").toString());
+ modelNode.setNodeType(JsonUtils2.getJsonValueByPath(jsonObject, "data/nodeType".split("/")).toString());
+ if ("node".equals(modelNode.getNodeType())) {
+ modelNode.setDataId(Long.valueOf(JsonUtils2.getJsonValueByPath(jsonObject, "data/dataId".split("/")).toString()));
+// modelNode.setNodeTypeExt(JsonUtils2.getJsonValueByPath(jsonObject, "data/nodeTypeExt".split("/")).toString());
+ Object label = JsonUtils2.getJsonValueByPath(jsonObject, "attrs/label/textWrap/text".split("/"));
+ modelNode.setName(label==null ? "" : label.toString());
+ }
+ modelNodeList.add(modelNode);
+ }
+ }
+ }
+
+ private void analyzeRbdAndSave(Long modelId, String content, boolean saveFlag) {
String diagramJsonStr = content;
// String diagramJsonStr = "{\"cells\":[{\"shape\":\"edge\",\"attrs\":{\"line\":{\"stroke\":\"#5F95FF\"}},\"id\":\"26d1a5a6-0be8-4890-86a0-a33d429e6673\",\"labels\":[{\"attrs\":{\"body\":{\"stroke\":\"#5F95FF\"},\"text\":{\"text\":\"\"}},\"position\":{\"distance\":0.5,\"angle\":180,\"options\":{\"keepGradient\":true,\"ensureLegibility\":true}}}],\"zIndex\":0,\"source\":{\"cell\":\"f91765b1-af48-4396-84ba-eb16e3476aa5\",\"port\":\"839cb2d9-59ca-4a39-a63c-26bf60cc6989\"},\"target\":{\"cell\":\"31585e99-58c7-4a98-8824-8000743b364d\",\"port\":\"01eb49d9-4b1c-466f-8263-935542436c7e\"}},{\"shape\":\"edge\",\"attrs\":{\"line\":{\"stroke\":\"#5F95FF\"}},\"id\":\"f2286e46-84c7-4702-8670-d7cda22c34e5\",\"labels\":[{\"attrs\":{\"body\":{\"stroke\":\"#5F95FF\"},\"text\":{\"text\":\"\"}},\"position\":{\"distance\":0.5,\"angle\":180,\"options\":{\"keepGradient\":true,\"ensureLegibility\":true}}}],\"zIndex\":0,\"source\":{\"cell\":\"f91765b1-af48-4396-84ba-eb16e3476aa5\",\"port\":\"839cb2d9-59ca-4a39-a63c-26bf60cc6989\"},\"target\":{\"cell\":\"5123ad82-18bb-46fe-9d93-138b24b54a15\",\"port\":\"01eb49d9-4b1c-466f-8263-935542436c7e\"}},{\"shape\":\"edge\",\"attrs\":{\"line\":{\"stroke\":\"#5F95FF\"}},\"id\":\"2ab8b7f8-7fe2-490f-89c5-4250d4a62a78\",\"labels\":[{\"attrs\":{\"body\":{\"stroke\":\"#5F95FF\"},\"text\":{\"text\":\"\"}},\"position\":{\"distance\":0.5,\"angle\":180,\"options\":{\"keepGradient\":true,\"ensureLegibility\":true}}}],\"zIndex\":0,\"source\":{\"cell\":\"31585e99-58c7-4a98-8824-8000743b364d\",\"port\":\"a977d555-b8c8-4578-9a8b-3097c405c1a8\"},\"target\":{\"cell\":\"6df9adc8-cb83-405c-8482-633db0f3644f\",\"port\":\"f93ccd2f-dedd-47b1-9ad0-9be20c5db8a4\"}},{\"shape\":\"edge\",\"attrs\":{\"line\":{\"stroke\":\"#5F95FF\"}},\"id\":\"700c05a5-f151-4b28-8135-705ccf013522\",\"labels\":[{\"attrs\":{\"body\":{\"stroke\":\"#5F95FF\"},\"text\":{\"text\":\"\"}},\"position\":{\"distance\":0.5,\"angle\":180,\"options\":{\"keepGradient\":true,\"ensureLegibility\":true}}}],\"zIndex\":0,\"source\":{\"cell\":\"5123ad82-18bb-46fe-9d93-138b24b54a15\",\"port\":\"a977d555-b8c8-4578-9a8b-3097c405c1a8\"},\"target\":{\"cell\":\"6df9adc8-cb83-405c-8482-633db0f3644f\",\"port\":\"f93ccd2f-dedd-47b1-9ad0-9be20c5db8a4\"}},{\"shape\":\"edge\",\"attrs\":{\"line\":{\"stroke\":\"#5F95FF\"}},\"id\":\"feef2a57-3c72-4d69-92a6-c828c736b61a\",\"labels\":[{\"attrs\":{\"body\":{\"stroke\":\"#5F95FF\"},\"text\":{\"text\":\"\"}},\"position\":{\"distance\":0.5,\"angle\":180,\"options\":{\"keepGradient\":true,\"ensureLegibility\":true}}}],\"zIndex\":0,\"source\":{\"cell\":\"6df9adc8-cb83-405c-8482-633db0f3644f\",\"port\":\"80d3bd61-1ed3-493a-b4e8-d4576e6fbfda\"},\"target\":{\"cell\":\"da634b2e-5ffc-4e1b-a636-f86ace9eb082\",\"port\":\"01eb49d9-4b1c-466f-8263-935542436c7e\"}},{\"shape\":\"edge\",\"attrs\":{\"line\":{\"stroke\":\"#5F95FF\"}},\"id\":\"49e36d6f-6a94-4edc-9894-6dd825091706\",\"labels\":[{\"attrs\":{\"body\":{\"stroke\":\"#5F95FF\"},\"text\":{\"text\":\"\"}},\"position\":{\"distance\":0.5,\"angle\":180,\"options\":{\"keepGradient\":true,\"ensureLegibility\":true}}}],\"zIndex\":0,\"source\":{\"cell\":\"f91765b1-af48-4396-84ba-eb16e3476aa5\",\"port\":\"839cb2d9-59ca-4a39-a63c-26bf60cc6989\"},\"target\":{\"cell\":\"2b6df966-4e19-4055-bb13-c4c083b18e58\",\"port\":\"01eb49d9-4b1c-466f-8263-935542436c7e\"}},{\"shape\":\"edge\",\"attrs\":{\"line\":{\"stroke\":\"#5F95FF\"}},\"id\":\"ed8c1bfa-c0a6-4e9b-8697-862aef109bcf\",\"labels\":[{\"attrs\":{\"body\":{\"stroke\":\"#5F95FF\"},\"text\":{\"text\":\"\"}},\"position\":{\"distance\":0.5,\"angle\":180,\"options\":{\"keepGradient\":true,\"ensureLegibility\":true}}}],\"zIndex\":0,\"source\":{\"cell\":\"f91765b1-af48-4396-84ba-eb16e3476aa5\",\"port\":\"839cb2d9-59ca-4a39-a63c-26bf60cc6989\"},\"target\":{\"cell\":\"323f5abe-05ed-419d-9d81-d25c7d3b19f3\",\"port\":\"01eb49d9-4b1c-466f-8263-935542436c7e\"}},{\"shape\":\"edge\",\"attrs\":{\"line\":{\"stroke\":\"#5F95FF\"}},\"id\":\"70c6b5fb-1b48-4a2f-bacd-be0284134818\",\"labels\":[{\"attrs\":{\"body\":{\"stroke\":\"#5F95FF\"},\"text\":{\"text\":\"\"}},\"position\":{\"distance\":0.5,\"angle\":180,\"options\":{\"keepGradient\":true,\"ensureLegibility\":true}}}],\"zIndex\":0,\"source\":{\"cell\":\"2b6df966-4e19-4055-bb13-c4c083b18e58\",\"port\":\"a977d555-b8c8-4578-9a8b-3097c405c1a8\"},\"target\":{\"cell\":\"1f378f5e-066d-49bb-a6cc-de24a8882d65\",\"port\":\"01eb49d9-4b1c-466f-8263-935542436c7e\"}},{\"shape\":\"edge\",\"attrs\":{\"line\":{\"stroke\":\"#5F95FF\"}},\"id\":\"6a134969-623b-428e-9b0c-436bae2d6608\",\"labels\":[{\"attrs\":{\"body\":{\"stroke\":\"#5F95FF\"},\"text\":{\"text\":\"\"}},\"position\":{\"distance\":0.5,\"angle\":180,\"options\":{\"keepGradient\":true,\"ensureLegibility\":true}}}],\"zIndex\":0,\"source\":{\"cell\":\"323f5abe-05ed-419d-9d81-d25c7d3b19f3\",\"port\":\"a977d555-b8c8-4578-9a8b-3097c405c1a8\"},\"target\":{\"cell\":\"1f378f5e-066d-49bb-a6cc-de24a8882d65\",\"port\":\"01eb49d9-4b1c-466f-8263-935542436c7e\"}},{\"shape\":\"edge\",\"attrs\":{\"line\":{\"stroke\":\"#5F95FF\"}},\"id\":\"51de5faf-1766-4dd1-abd0-eec2e867a322\",\"labels\":[{\"attrs\":{\"body\":{\"stroke\":\"#5F95FF\"},\"text\":{\"text\":\"\"}},\"position\":{\"distance\":0.5,\"angle\":180,\"options\":{\"keepGradient\":true,\"ensureLegibility\":true}}}],\"zIndex\":0,\"source\":{\"cell\":\"1f378f5e-066d-49bb-a6cc-de24a8882d65\",\"port\":\"a977d555-b8c8-4578-9a8b-3097c405c1a8\"},\"target\":{\"cell\":\"0bb2ba89-a92d-4b32-b3cd-45df2300fa34\",\"port\":\"61eaafd2-095b-41d6-8e34-862fb470b7a6\"}},{\"shape\":\"edge\",\"attrs\":{\"line\":{\"stroke\":\"#A2B1C3\"}},\"id\":\"161f78dc-1f44-4e43-9ced-e39d345aac78\",\"labels\":[{\"attrs\":{\"body\":{\"stroke\":\"#5F95FF\"},\"text\":{\"text\":\"\"}},\"position\":{\"distance\":0.5,\"angle\":180,\"options\":{\"keepGradient\":true,\"ensureLegibility\":true}}}],\"zIndex\":0,\"source\":{\"cell\":\"da634b2e-5ffc-4e1b-a636-f86ace9eb082\",\"port\":\"a977d555-b8c8-4578-9a8b-3097c405c1a8\"},\"target\":{\"cell\":\"0bb2ba89-a92d-4b32-b3cd-45df2300fa34\",\"port\":\"61eaafd2-095b-41d6-8e34-862fb470b7a6\"}},{\"position\":{\"x\":-350,\"y\":-280},\"size\":{\"width\":60,\"height\":60},\"attrs\":{\"text\":{\"refY\":\"100%\",\"textVerticalAnchor\":\"top\",\"text\":\"logo\",\"style\":{\"color\":\"#080808\"},\"refY2\":4},\"image\":{\"xlink:href\":\"dist/img/logo.36cbc06d.png\"},\"body\":{\"stroke\":\"#5F95FF\"},\"line\":{\"stroke\":\"orange\"}},\"visible\":true,\"shape\":\"image\",\"id\":\"31585e99-58c7-4a98-8824-8000743b364d\",\"data\":{\"dataId\":\"123456\",\"nodeType\":\"node\",\"nodeTypeExt\":\"aaa\"},\"ports\":{\"groups\":{\"top\":{\"position\":\"top\",\"attrs\":{\"circle\":{\"r\":4,\"magnet\":true,\"stroke\":\"#5F95FF\",\"strokeWidth\":1,\"fill\":\"#fff\",\"style\":{\"visibility\":\"hidden\"}}}},\"right\":{\"position\":\"right\",\"attrs\":{\"circle\":{\"r\":4,\"magnet\":true,\"stroke\":\"#5F95FF\",\"strokeWidth\":1,\"fill\":\"#fff\",\"style\":{\"visibility\":\"hidden\"}}}},\"bottom\":{\"position\":\"bottom\",\"attrs\":{\"circle\":{\"r\":4,\"magnet\":true,\"stroke\":\"#5F95FF\",\"strokeWidth\":1,\"fill\":\"#fff\",\"style\":{\"visibility\":\"hidden\"}}}},\"left\":{\"position\":\"left\",\"attrs\":{\"circle\":{\"r\":4,\"magnet\":true,\"stroke\":\"#5F95FF\",\"strokeWidth\":1,\"fill\":\"#fff\",\"style\":{\"visibility\":\"hidden\"}}}}},\"items\":[{\"group\":\"top\",\"id\":\"bc0336ec-7912-4720-aea7-e5869de77692\"},{\"group\":\"right\",\"id\":\"a977d555-b8c8-4578-9a8b-3097c405c1a8\"},{\"group\":\"bottom\",\"id\":\"fef0f533-9581-4831-ba65-427f097a3d17\"},{\"group\":\"left\",\"id\":\"01eb49d9-4b1c-466f-8263-935542436c7e\"}]},\"zIndex\":1,\"labels\":[{\"attrs\":{\"body\":{\"stroke\":\"orange\"}}}]},{\"position\":{\"x\":-350,\"y\":-180},\"size\":{\"width\":60,\"height\":60},\"attrs\":{\"text\":{\"refY\":\"100%\",\"textVerticalAnchor\":\"top\",\"text\":\"logo\",\"style\":{\"color\":\"#080808\"},\"refY2\":4},\"image\":{\"xlink:href\":\"dist/img/logo.36cbc06d.png\"},\"body\":{\"stroke\":\"#5F95FF\"},\"line\":{\"stroke\":\"orange\"}},\"visible\":true,\"shape\":\"image\",\"id\":\"5123ad82-18bb-46fe-9d93-138b24b54a15\",\"data\":{\"dataId\":\"123456\",\"nodeType\":\"node\",\"nodeTypeExt\":\"aaa\"},\"ports\":{\"groups\":{\"top\":{\"position\":\"top\",\"attrs\":{\"circle\":{\"r\":4,\"magnet\":true,\"stroke\":\"#5F95FF\",\"strokeWidth\":1,\"fill\":\"#fff\",\"style\":{\"visibility\":\"hidden\"}}}},\"right\":{\"position\":\"right\",\"attrs\":{\"circle\":{\"r\":4,\"magnet\":true,\"stroke\":\"#5F95FF\",\"strokeWidth\":1,\"fill\":\"#fff\",\"style\":{\"visibility\":\"hidden\"}}}},\"bottom\":{\"position\":\"bottom\",\"attrs\":{\"circle\":{\"r\":4,\"magnet\":true,\"stroke\":\"#5F95FF\",\"strokeWidth\":1,\"fill\":\"#fff\",\"style\":{\"visibility\":\"hidden\"}}}},\"left\":{\"position\":\"left\",\"attrs\":{\"circle\":{\"r\":4,\"magnet\":true,\"stroke\":\"#5F95FF\",\"strokeWidth\":1,\"fill\":\"#fff\",\"style\":{\"visibility\":\"hidden\"}}}}},\"items\":[{\"group\":\"top\",\"id\":\"bc0336ec-7912-4720-aea7-e5869de77692\"},{\"group\":\"right\",\"id\":\"a977d555-b8c8-4578-9a8b-3097c405c1a8\"},{\"group\":\"bottom\",\"id\":\"fef0f533-9581-4831-ba65-427f097a3d17\"},{\"group\":\"left\",\"id\":\"01eb49d9-4b1c-466f-8263-935542436c7e\"}]},\"zIndex\":2,\"labels\":[{\"attrs\":{\"body\":{\"stroke\":\"orange\"}}}]},{\"position\":{\"x\":-620,\"y\":-200},\"size\":{\"width\":60,\"height\":60},\"attrs\":{\"text\":{\"refY\":\"100%\",\"textVerticalAnchor\":\"top\",\"text\":\"start\",\"style\":{\"color\":\"#080808\"},\"refY2\":4},\"image\":{\"xlink:href\":\"dist/img/start.88f586e1.png\"},\"body\":{\"stroke\":\"#5F95FF\"},\"line\":{\"stroke\":\"orange\"}},\"visible\":true,\"shape\":\"image\",\"id\":\"f91765b1-af48-4396-84ba-eb16e3476aa5\",\"data\":{\"dataId\":\"\",\"nodeType\":\"start\",\"nodeTypeExt\":\"\"},\"ports\":{\"groups\":{\"top\":{\"position\":\"top\",\"attrs\":{\"circle\":{\"r\":4,\"magnet\":true,\"stroke\":\"#5F95FF\",\"strokeWidth\":1,\"fill\":\"#fff\",\"style\":{\"visibility\":\"hidden\"}}}},\"right\":{\"position\":\"right\",\"attrs\":{\"circle\":{\"r\":4,\"magnet\":true,\"stroke\":\"#5F95FF\",\"strokeWidth\":1,\"fill\":\"#fff\",\"style\":{\"visibility\":\"hidden\"}}}},\"bottom\":{\"position\":\"bottom\",\"attrs\":{\"circle\":{\"r\":4,\"magnet\":true,\"stroke\":\"#5F95FF\",\"strokeWidth\":1,\"fill\":\"#fff\",\"style\":{\"visibility\":\"hidden\"}}}},\"left\":{\"position\":\"left\",\"attrs\":{\"circle\":{\"r\":4,\"magnet\":true,\"stroke\":\"#5F95FF\",\"strokeWidth\":1,\"fill\":\"#fff\",\"style\":{\"visibility\":\"hidden\"}}}}},\"items\":[{\"group\":\"top\",\"id\":\"2ad6a8d5-d86d-49e6-908a-d317b61997c1\"},{\"group\":\"right\",\"id\":\"839cb2d9-59ca-4a39-a63c-26bf60cc6989\"},{\"group\":\"bottom\",\"id\":\"7048578f-94d9-4f75-b653-eb5f43ff55db\"},{\"group\":\"left\",\"id\":\"e7bb1134-4b4c-401d-89ea-e77ae24cbd03\"}]},\"zIndex\":3,\"labels\":[{\"attrs\":{\"body\":{\"stroke\":\"orange\"}}}]},{\"position\":{\"x\":-153,\"y\":-240},\"size\":{\"width\":60,\"height\":60},\"attrs\":{\"text\":{\"refY\":\"100%\",\"textVerticalAnchor\":\"top\",\"text\":\"switchRight\",\"style\":{\"color\":\"#080808\"},\"refY2\":4},\"image\":{\"xlink:href\":\"dist/img/switchRight.74768797.png\"},\"body\":{\"stroke\":\"#5F95FF\"}},\"visible\":true,\"shape\":\"image\",\"id\":\"6df9adc8-cb83-405c-8482-633db0f3644f\",\"data\":{\"dataId\":\"\",\"nodeType\":\"switchRight\",\"nodeTypeExt\":\"\"},\"ports\":{\"groups\":{\"top\":{\"position\":\"top\",\"attrs\":{\"circle\":{\"r\":4,\"magnet\":true,\"stroke\":\"#5F95FF\",\"strokeWidth\":1,\"fill\":\"#fff\",\"style\":{\"visibility\":\"hidden\"}}}},\"right\":{\"position\":\"right\",\"attrs\":{\"circle\":{\"r\":4,\"magnet\":true,\"stroke\":\"#5F95FF\",\"strokeWidth\":1,\"fill\":\"#fff\",\"style\":{\"visibility\":\"hidden\"}}}},\"bottom\":{\"position\":\"bottom\",\"attrs\":{\"circle\":{\"r\":4,\"magnet\":true,\"stroke\":\"#5F95FF\",\"strokeWidth\":1,\"fill\":\"#fff\",\"style\":{\"visibility\":\"hidden\"}}}},\"left\":{\"position\":\"left\",\"attrs\":{\"circle\":{\"r\":4,\"magnet\":true,\"stroke\":\"#5F95FF\",\"strokeWidth\":1,\"fill\":\"#fff\",\"style\":{\"visibility\":\"hidden\"}}}}},\"items\":[{\"group\":\"top\",\"id\":\"adceedb7-f842-4d1e-be3a-8b3cb0a7e3ce\"},{\"group\":\"right\",\"id\":\"80d3bd61-1ed3-493a-b4e8-d4576e6fbfda\"},{\"group\":\"bottom\",\"id\":\"8fa84779-80b2-4c91-8366-7dd4fa0d93ff\"},{\"group\":\"left\",\"id\":\"f93ccd2f-dedd-47b1-9ad0-9be20c5db8a4\"}]},\"zIndex\":4},{\"position\":{\"x\":-21,\"y\":-240},\"size\":{\"width\":60,\"height\":60},\"attrs\":{\"text\":{\"refY\":\"100%\",\"textVerticalAnchor\":\"top\",\"text\":\"logo\",\"style\":{\"color\":\"#080808\"},\"refY2\":4},\"image\":{\"xlink:href\":\"dist/img/logo.36cbc06d.png\"},\"body\":{\"stroke\":\"#5F95FF\"},\"line\":{\"stroke\":\"orange\"}},\"visible\":true,\"shape\":\"image\",\"id\":\"da634b2e-5ffc-4e1b-a636-f86ace9eb082\",\"data\":{\"dataId\":\"123456\",\"nodeType\":\"node\",\"nodeTypeExt\":\"aaa\"},\"ports\":{\"groups\":{\"top\":{\"position\":\"top\",\"attrs\":{\"circle\":{\"r\":4,\"magnet\":true,\"stroke\":\"#5F95FF\",\"strokeWidth\":1,\"fill\":\"#fff\",\"style\":{\"visibility\":\"hidden\"}}}},\"right\":{\"position\":\"right\",\"attrs\":{\"circle\":{\"r\":4,\"magnet\":true,\"stroke\":\"#5F95FF\",\"strokeWidth\":1,\"fill\":\"#fff\",\"style\":{\"visibility\":\"hidden\"}}}},\"bottom\":{\"position\":\"bottom\",\"attrs\":{\"circle\":{\"r\":4,\"magnet\":true,\"stroke\":\"#5F95FF\",\"strokeWidth\":1,\"fill\":\"#fff\",\"style\":{\"visibility\":\"hidden\"}}}},\"left\":{\"position\":\"left\",\"attrs\":{\"circle\":{\"r\":4,\"magnet\":true,\"stroke\":\"#5F95FF\",\"strokeWidth\":1,\"fill\":\"#fff\",\"style\":{\"visibility\":\"hidden\"}}}}},\"items\":[{\"group\":\"top\",\"id\":\"bc0336ec-7912-4720-aea7-e5869de77692\"},{\"group\":\"right\",\"id\":\"a977d555-b8c8-4578-9a8b-3097c405c1a8\"},{\"group\":\"bottom\",\"id\":\"fef0f533-9581-4831-ba65-427f097a3d17\"},{\"group\":\"left\",\"id\":\"01eb49d9-4b1c-466f-8263-935542436c7e\"}]},\"zIndex\":5,\"labels\":[{\"attrs\":{\"body\":{\"stroke\":\"orange\"}}}]},{\"position\":{\"x\":170,\"y\":-100},\"size\":{\"width\":60,\"height\":60},\"attrs\":{\"text\":{\"refY\":\"100%\",\"textVerticalAnchor\":\"top\",\"text\":\"end\",\"style\":{\"color\":\"#080808\"},\"refY2\":4},\"image\":{\"xlink:href\":\"dist/img/end.814a7041.png\"},\"body\":{\"stroke\":\"#5F95FF\"}},\"visible\":true,\"shape\":\"image\",\"id\":\"0bb2ba89-a92d-4b32-b3cd-45df2300fa34\",\"data\":{\"dataId\":\"\",\"nodeType\":\"end\",\"nodeTypeExt\":\"\"},\"ports\":{\"groups\":{\"top\":{\"position\":\"top\",\"attrs\":{\"circle\":{\"r\":4,\"magnet\":true,\"stroke\":\"#5F95FF\",\"strokeWidth\":1,\"fill\":\"#fff\",\"style\":{\"visibility\":\"hidden\"}}}},\"right\":{\"position\":\"right\",\"attrs\":{\"circle\":{\"r\":4,\"magnet\":true,\"stroke\":\"#5F95FF\",\"strokeWidth\":1,\"fill\":\"#fff\",\"style\":{\"visibility\":\"hidden\"}}}},\"bottom\":{\"position\":\"bottom\",\"attrs\":{\"circle\":{\"r\":4,\"magnet\":true,\"stroke\":\"#5F95FF\",\"strokeWidth\":1,\"fill\":\"#fff\",\"style\":{\"visibility\":\"hidden\"}}}},\"left\":{\"position\":\"left\",\"attrs\":{\"circle\":{\"r\":4,\"magnet\":true,\"stroke\":\"#5F95FF\",\"strokeWidth\":1,\"fill\":\"#fff\",\"style\":{\"visibility\":\"hidden\"}}}}},\"items\":[{\"group\":\"top\",\"id\":\"223c9b3a-6baa-4bb8-99ba-c3300db9a942\"},{\"group\":\"right\",\"id\":\"2806bc8a-4e11-4657-9af9-089907985671\"},{\"group\":\"bottom\",\"id\":\"c56eed35-95fa-4e3c-adba-9847ef705e1c\"},{\"group\":\"left\",\"id\":\"61eaafd2-095b-41d6-8e34-862fb470b7a6\"}]},\"zIndex\":6},{\"position\":{\"x\":-350,\"y\":-54},\"size\":{\"width\":60,\"height\":60},\"attrs\":{\"text\":{\"refY\":\"100%\",\"textVerticalAnchor\":\"top\",\"text\":\"logo\",\"style\":{\"color\":\"#080808\"},\"refY2\":4},\"image\":{\"xlink:href\":\"dist/img/logo.36cbc06d.png\"},\"body\":{\"stroke\":\"#5F95FF\"}},\"visible\":true,\"shape\":\"image\",\"id\":\"2b6df966-4e19-4055-bb13-c4c083b18e58\",\"data\":{\"dataId\":\"123456\",\"nodeType\":\"node\",\"nodeTypeExt\":\"aaa\"},\"ports\":{\"groups\":{\"top\":{\"position\":\"top\",\"attrs\":{\"circle\":{\"r\":4,\"magnet\":true,\"stroke\":\"#5F95FF\",\"strokeWidth\":1,\"fill\":\"#fff\",\"style\":{\"visibility\":\"hidden\"}}}},\"right\":{\"position\":\"right\",\"attrs\":{\"circle\":{\"r\":4,\"magnet\":true,\"stroke\":\"#5F95FF\",\"strokeWidth\":1,\"fill\":\"#fff\",\"style\":{\"visibility\":\"hidden\"}}}},\"bottom\":{\"position\":\"bottom\",\"attrs\":{\"circle\":{\"r\":4,\"magnet\":true,\"stroke\":\"#5F95FF\",\"strokeWidth\":1,\"fill\":\"#fff\",\"style\":{\"visibility\":\"hidden\"}}}},\"left\":{\"position\":\"left\",\"attrs\":{\"circle\":{\"r\":4,\"magnet\":true,\"stroke\":\"#5F95FF\",\"strokeWidth\":1,\"fill\":\"#fff\",\"style\":{\"visibility\":\"hidden\"}}}}},\"items\":[{\"group\":\"top\",\"id\":\"bc0336ec-7912-4720-aea7-e5869de77692\"},{\"group\":\"right\",\"id\":\"a977d555-b8c8-4578-9a8b-3097c405c1a8\"},{\"group\":\"bottom\",\"id\":\"fef0f533-9581-4831-ba65-427f097a3d17\"},{\"group\":\"left\",\"id\":\"01eb49d9-4b1c-466f-8263-935542436c7e\"}]},\"zIndex\":7},{\"position\":{\"x\":-330,\"y\":40},\"size\":{\"width\":60,\"height\":60},\"attrs\":{\"text\":{\"refY\":\"100%\",\"textVerticalAnchor\":\"top\",\"text\":\"logo\",\"style\":{\"color\":\"#080808\"},\"refY2\":4},\"image\":{\"xlink:href\":\"dist/img/logo.36cbc06d.png\"},\"body\":{\"stroke\":\"#5F95FF\"}},\"visible\":true,\"shape\":\"image\",\"id\":\"323f5abe-05ed-419d-9d81-d25c7d3b19f3\",\"data\":{\"dataId\":\"123456\",\"nodeType\":\"node\",\"nodeTypeExt\":\"aaa\"},\"ports\":{\"groups\":{\"top\":{\"position\":\"top\",\"attrs\":{\"circle\":{\"r\":4,\"magnet\":true,\"stroke\":\"#5F95FF\",\"strokeWidth\":1,\"fill\":\"#fff\",\"style\":{\"visibility\":\"hidden\"}}}},\"right\":{\"position\":\"right\",\"attrs\":{\"circle\":{\"r\":4,\"magnet\":true,\"stroke\":\"#5F95FF\",\"strokeWidth\":1,\"fill\":\"#fff\",\"style\":{\"visibility\":\"hidden\"}}}},\"bottom\":{\"position\":\"bottom\",\"attrs\":{\"circle\":{\"r\":4,\"magnet\":true,\"stroke\":\"#5F95FF\",\"strokeWidth\":1,\"fill\":\"#fff\",\"style\":{\"visibility\":\"hidden\"}}}},\"left\":{\"position\":\"left\",\"attrs\":{\"circle\":{\"r\":4,\"magnet\":true,\"stroke\":\"#5F95FF\",\"strokeWidth\":1,\"fill\":\"#fff\",\"style\":{\"visibility\":\"hidden\"}}}}},\"items\":[{\"group\":\"top\",\"id\":\"bc0336ec-7912-4720-aea7-e5869de77692\"},{\"group\":\"right\",\"id\":\"a977d555-b8c8-4578-9a8b-3097c405c1a8\"},{\"group\":\"bottom\",\"id\":\"fef0f533-9581-4831-ba65-427f097a3d17\"},{\"group\":\"left\",\"id\":\"01eb49d9-4b1c-466f-8263-935542436c7e\"}]},\"zIndex\":8},{\"position\":{\"x\":-153,\"y\":-20},\"size\":{\"width\":60,\"height\":60},\"attrs\":{\"text\":{\"refY\":\"100%\",\"textVerticalAnchor\":\"top\",\"text\":\"logo\",\"style\":{\"color\":\"#080808\"},\"refY2\":4},\"image\":{\"xlink:href\":\"dist/img/logo.36cbc06d.png\"},\"body\":{\"stroke\":\"#5F95FF\"},\"line\":{\"stroke\":\"orange\"}},\"visible\":true,\"shape\":\"image\",\"id\":\"1f378f5e-066d-49bb-a6cc-de24a8882d65\",\"data\":{\"dataId\":\"123456\",\"nodeType\":\"node\",\"nodeTypeExt\":\"aaa\"},\"ports\":{\"groups\":{\"top\":{\"position\":\"top\",\"attrs\":{\"circle\":{\"r\":4,\"magnet\":true,\"stroke\":\"#5F95FF\",\"strokeWidth\":1,\"fill\":\"#fff\",\"style\":{\"visibility\":\"hidden\"}}}},\"right\":{\"position\":\"right\",\"attrs\":{\"circle\":{\"r\":4,\"magnet\":true,\"stroke\":\"#5F95FF\",\"strokeWidth\":1,\"fill\":\"#fff\",\"style\":{\"visibility\":\"hidden\"}}}},\"bottom\":{\"position\":\"bottom\",\"attrs\":{\"circle\":{\"r\":4,\"magnet\":true,\"stroke\":\"#5F95FF\",\"strokeWidth\":1,\"fill\":\"#fff\",\"style\":{\"visibility\":\"hidden\"}}}},\"left\":{\"position\":\"left\",\"attrs\":{\"circle\":{\"r\":4,\"magnet\":true,\"stroke\":\"#5F95FF\",\"strokeWidth\":1,\"fill\":\"#fff\",\"style\":{\"visibility\":\"hidden\"}}}}},\"items\":[{\"group\":\"top\",\"id\":\"bc0336ec-7912-4720-aea7-e5869de77692\"},{\"group\":\"right\",\"id\":\"a977d555-b8c8-4578-9a8b-3097c405c1a8\"},{\"group\":\"bottom\",\"id\":\"fef0f533-9581-4831-ba65-427f097a3d17\"},{\"group\":\"left\",\"id\":\"01eb49d9-4b1c-466f-8263-935542436c7e\"}]},\"zIndex\":9,\"labels\":[{\"attrs\":{\"body\":{\"stroke\":\"orange\"}}}]}]}";
@@ -131,6 +802,7 @@
if ("node".equals(modelNode.getNodeType())) {
modelNode.setDataId(Long.valueOf(JsonUtils2.getJsonValueByPath(jsonObject, "data/dataId".split("/")).toString()));
modelNode.setNodeTypeExt(JsonUtils2.getJsonValueByPath(jsonObject, "data/nodeTypeExt".split("/")).toString());
+ modelNode.setName(JsonUtils2.getJsonValueByPath(jsonObject, "attrs/label/textWrap/text".split("/")).toString());
}
modelNodeList.add(modelNode);
}
@@ -251,27 +923,35 @@
List<Algorithm> algoList,
int stepNo) {
String computerList = "";
+ String objectList = "";
for (List<ModelNode> path : listPath) {
path.remove(path.get(path.size()-1));
Long id = null;
+ String name = "";
if (path.size()==0) {
return stepNo;
} else if (path.size()==1) {
+ if ("end".equals(opNode.getNodeType()) && !"start".equals(lastNode.getNodeType())) return stepNo;
id = path.get(path.size()-1).getId();
+ name = path.get(path.size()-1).getName();
} else {
id = UUIDUtil.generateId();
+ name = id.toString();
Algorithm algo = new Algorithm();
algo.setId(id);
algo.setModelId(modelId);
algo.setComputerId(id);
algo.setModelType("series");
algo.setAlgorithmType("series");
- algo.setComputerList(StringUtils.join(path.stream().map(ModelNode::getId).collect(Collectors.toSet()), ","));
+ algo.setComputerList(joinNodeId(path, ","));
+ algo.setObjectList(joinNodeName(path, ","));
algo.setStep(stepNo);
stepNo++;
algoList.add(algo);
+ name = "v"+ algo.getStep();
}
computerList = computerList.equals("") ? id.toString() : computerList + "," + id.toString();
+ objectList = objectList.equals("") ? name : objectList + "," + name;
for (ModelNode node : path) {
List<ModelLine> lineList4 = modelLineList.stream().filter(item ->
item.getEndCell().equals(node.getPicId()) || item.getBeginCell().equals(node.getPicId())).collect(Collectors.toList());
@@ -287,14 +967,15 @@
algo.setModelType(opNode.getNodeType());
algo.setAlgorithmType(opNode.getNodeType());
algo.setComputerList(computerList);
+ algo.setObjectList(objectList);
algo.setStep(stepNo);
stepNo++;
algoList.add(algo);
//灏嗗師杩愮畻鑺傜偣鏀规垚铏氳妭鐐�
opNode.setId(id);
-// opNode.setPicId(id.toString());
opNode.setNodeType("vnode");
+ opNode.setName("v"+algo.getStep());
ModelLine modelLineNew = new ModelLine();
Long picId2 = UUIDUtil.generateId();
@@ -308,6 +989,24 @@
return stepNo;
}
+ private String joinNodeId(List<ModelNode> nodeList, String sep) {
+ String result = "";
+ for (int i = 0; i < nodeList.size(); i++) {
+ if (i > 0) result = result + sep;
+ result = result + nodeList.get(i).getId().toString();
+ }
+ return result;
+ }
+
+ private String joinNodeName(List<ModelNode> nodeList, String sep) {
+ String result = "";
+ for (int i = 0; i < nodeList.size(); i++) {
+ if (i > 0) result = result + sep;
+ result = result + nodeList.get(i).getName();
+ }
+ return result;
+ }
+
private void saveModel(Long modelId,
List<ModelNode> modelNodeList,
List<ModelLine> modelLineList,
--
Gitblit v1.9.1