From 23b4b0e764ba8d7bf73f9c7d999f4144427d31cd Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 13 九月 2024 16:35:35 +0800
Subject: [PATCH] 新增可靠性框图自动排版功能
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelNode.java | 12
web/src/views/modules/taskReliability/RBD-edit-img.vue | 23 +
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/RbdTreeNode.java | 37 ++
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelLineService.java | 685 ++++++++++++++++++++++++++++++++--------------------
4 files changed, 488 insertions(+), 269 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelNode.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelNode.java
index b2e0031..b6cf7b5 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelNode.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelNode.java
@@ -65,13 +65,21 @@
@TableField(exist = false)
private Double positionY;
+ @ApiModelProperty(value = "姘村钩鏂瑰悜绗嚑涓猚ell")
+ @TableField(exist = false)
+ private Double positionCellX;
+
+ @ApiModelProperty(value = "鍨傜洿鏂瑰悜绗嚑涓猚ell")
+ @TableField(exist = false)
+ private Double positionCellY;
+
@ApiModelProperty(value = "澶у皬锛氭í鍚戝搴�")
@TableField(exist = false)
- private Integer width;
+ private Double width;
@ApiModelProperty(value = "澶у皬锛氱旱鍚戦珮搴�")
@TableField(exist = false)
- private Integer height;
+ private Double height;
@ApiModelProperty(value = "澶у皬锛氳嚜鍔ㄥ竷灞�妯悜鍗犵敤鍗曞厓鏍兼暟")
@TableField(exist = false)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/RbdTreeNode.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/RbdTreeNode.java
new file mode 100644
index 0000000..8ae480c
--- /dev/null
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/RbdTreeNode.java
@@ -0,0 +1,37 @@
+package com.zt.life.modules.mainPart.taskReliability.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class RbdTreeNode {
+ @ApiModelProperty(value = "妯″瀷鑺傜偣ID")
+ private Long id;
+ private Long pid;
+ private String name;
+ private String picId;
+ private String pairStartNodeId;
+ private String pairEndNodeId;
+ private String nodeType;
+ private String algorithmType;
+ private double blockX;
+ private double blockY;
+ private double descentWidth;
+ private double descentHeight;
+
+ private double blockWidth;
+ private double blockHeight;
+
+ private double blockWidthNum;
+ private double blockHeightNum;
+
+ private double myWidth;
+ private double myHeight;
+
+ private List<RbdTreeNode> children = new ArrayList<>();
+
+}
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 7ad020c..9c74487 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
@@ -1,5 +1,6 @@
package com.zt.life.modules.mainPart.taskReliability.service;
+import cn.hutool.core.convert.Convert;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import com.zt.common.service.BaseService;
@@ -29,11 +30,11 @@
/**
* model_line
*
- * @author zt generator
+ * @author zt generator
* @since 1.0.0 2024-02-28
*/
@Service
-public class ModelLineService extends BaseService<ModelLineDao, ModelLine> {
+public class ModelLineService extends BaseService<ModelLineDao, ModelLine> {
private static final Logger logger = LoggerFactory.getLogger(ModelLineService.class);
// 杩愮畻
@@ -110,8 +111,8 @@
@Transactional(rollbackFor = Exception.class)
public void insert(ModelRbd modelRbd) {
- if (modelRbd==null) return;
- if (modelRbd.getId()==null) return;
+ if (modelRbd == null) return;
+ if (modelRbd.getId() == null) return;
Long modelId = modelRbd.getId();
// 鍒犻櫎鏃㈡湁鏁版嵁
@@ -125,8 +126,8 @@
@Transactional(rollbackFor = Exception.class)
public void update(ModelRbd modelRbd) {
- if (modelRbd==null) return;
- if (modelRbd.getId()==null) return;
+ if (modelRbd == null) return;
+ if (modelRbd.getId() == null) return;
Long modelId = modelRbd.getId();
// 鍒犻櫎鏃㈡湁鏁版嵁
@@ -139,7 +140,7 @@
@Transactional(rollbackFor = Exception.class)
public boolean layout(ModelRbd modelRbd) {
boolean result = true;
- if (modelRbd==null) return result;
+ if (modelRbd == null) return result;
Long modelId = modelRbd.getId();
result = layoutRbd(modelRbd);
return result;
@@ -172,26 +173,177 @@
// 6. 閫掑綊璁＄畻RBD鐨勫竷灞�绌洪棿澶у皬
calcLayoutSize(modelRbd, algorithmList, modelNodeAndVnodeList);
+ Collections.reverse(algorithmList);
+ RbdTreeNode root2 = listToTree(algorithmList.get(0).getComputerList(), algorithmList, modelNodeAndVnodeList);
+
+ RbdTreeNode root = new RbdTreeNode();
+
+ root.setId(Convert.toLong("20000"));
+
+ root.setName("end");
+ root.setNodeType("vnode");
+ root.setAlgorithmType("parallel");
+ root.setPicId("20000");
+ root.setPairStartNodeId("10000");
+
+ root.setBlockWidthNum(root2.getBlockWidthNum() + 2);
+ root.setBlockHeightNum(root2.getBlockHeightNum());
+ root.getChildren().add(root2);
+
// 7. 閫掑綊璁＄畻RBD鐨勫竷灞�绌洪棿鍙傛暟锛坸銆亂鍧愭爣锛�
- calcLayoutPosition(modelRbd, algorithmList, modelNodeAndVnodeList);
+ root.setBlockX(0);
+ root.setBlockY(0);
+ calcPosition(rbdJsonArray, root);
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("cells", rbdJsonArray);
+ modelRbd.setContent(jsonObject.toString());
+ // calcLayoutPosition(modelRbd, algorithmList, modelNodeAndVnodeList);
// 8. 淇濆瓨鑷姩甯冨眬妯″瀷
// 鏇存柊RBD鏁版嵁
// modelRbd.setAutoLayoutContent("娴嬭瘯鏂囧瓧");
- modelRbdDao.updateById(modelRbd);
+// modelRbdDao.updateById(modelRbd);
return result;
}
+ private void setNodePositionXY(JSONArray rbdJsonArray, RbdTreeNode block) {
+ Double x = block.getBlockX() + (block.getBlockWidth() - block.getMyWidth()) / 2;
+ Double y = block.getBlockY() + (block.getBlockHeight() - block.getMyHeight()) / 2;
+ setRbdNodePosition(rbdJsonArray, block.getPicId(), x, y);
+ }
+
+ private void calcPosition(JSONArray rbdJsonArray, RbdTreeNode block) {
+ if (block.getNodeType().equals("node")) {
+ setNodePositionXY(rbdJsonArray, block);
+ } else {
+ double blockWidth = block.getBlockWidthNum() * LAYOUT_CELL_SIZE_X;
+ double blockHeight = block.getBlockHeightNum() * LAYOUT_CELL_SIZE_Y;
+
+ Double descentWidth = block.getDescentWidth();
+ if (descentWidth == null || descentWidth == 0.0) {
+ descentWidth = blockWidth;
+ }
+ Double descentHeight = block.getDescentHeight();
+ if (descentHeight == null || descentHeight == 0.0) {
+ descentHeight = blockHeight;
+ }
+
+ block.setBlockWidth(blockWidth);
+ block.setBlockHeight(blockHeight);
+ List<RbdTreeNode> children = block.getChildren();
+
+ if (OPE_TYPE_SERIES.equals(block.getAlgorithmType())) {
+ Double subBlockX = block.getBlockX();
+ for (RbdTreeNode child : children) {
+
+ child.setDescentWidth(blockWidth);
+ child.setDescentHeight(blockHeight);
+
+ double selfWidth = child.getBlockWidthNum() * LAYOUT_CELL_SIZE_X * descentWidth / blockWidth;
+ child.setBlockWidth(selfWidth);
+ child.setBlockHeight(blockHeight);
+
+ child.setBlockY(block.getBlockY());
+ child.setBlockX(subBlockX);
+ calcPosition(rbdJsonArray, child);
+ subBlockX = subBlockX + selfWidth;
+
+ }
+ } else {
+
+ Double subBlockY = block.getBlockY()+(descentHeight-blockHeight)/2;
+ Double firstSubBlockY = subBlockY;
+
+ // 璁剧疆connect鐨勪綅缃�
+ RbdTreeNode connectBlock = new RbdTreeNode();
+ connectBlock.setMyWidth(getRbdNodeInfo(rbdJsonArray, block.getPairStartNodeId(), "size/width"));
+ connectBlock.setMyHeight(getRbdNodeInfo(rbdJsonArray, block.getPairStartNodeId(), "size/height"));
+ connectBlock.setPicId(block.getPairStartNodeId());
+ connectBlock.setBlockX(block.getBlockX());
+ connectBlock.setBlockY(firstSubBlockY);
+ connectBlock.setBlockWidth(LAYOUT_CELL_SIZE_X);
+ connectBlock.setBlockHeight(blockHeight);
+ setNodePositionXY(rbdJsonArray, connectBlock);
+
+ for (RbdTreeNode child : children) {
+ child.setDescentWidth(block.getBlockWidth() - 2 * LAYOUT_CELL_SIZE_X);
+ child.setDescentHeight(blockHeight);
+
+ child.setBlockWidth(block.getBlockWidth() - 2 * LAYOUT_CELL_SIZE_X);
+ child.setBlockHeight(child.getBlockHeightNum() * LAYOUT_CELL_SIZE_Y);
+
+ child.setBlockX(block.getBlockX() + LAYOUT_CELL_SIZE_X);
+ child.setBlockY(subBlockY);
+ subBlockY = subBlockY + child.getBlockHeightNum() * LAYOUT_CELL_SIZE_Y;
+ calcPosition(rbdJsonArray, child);
+ }
+
+ // 璁剧疆杩愮畻绗︾殑浣嶇疆
+ RbdTreeNode opeBlock = new RbdTreeNode();
+
+ opeBlock.setPicId(block.getPicId());
+ opeBlock.setMyWidth(getRbdNodeInfo(rbdJsonArray, block.getPicId(), "size/width"));
+ opeBlock.setMyHeight(getRbdNodeInfo(rbdJsonArray, block.getPicId(), "size/height"));
+ opeBlock.setBlockX(block.getBlockX() + blockWidth - LAYOUT_CELL_SIZE_X);
+ opeBlock.setBlockY(firstSubBlockY);
+ opeBlock.setBlockWidth(LAYOUT_CELL_SIZE_X);
+ opeBlock.setBlockHeight(blockHeight);
+ setNodePositionXY(rbdJsonArray, opeBlock);
+ }
+ }
+
+ }
+
+ private RbdTreeNode listToTree(String id,
+ List<Algorithm> algorithmList,
+ List<ModelNode> modelNodeAndVnodeList) {
+
+ List<Algorithm> algos = algorithmList.stream().filter(item ->
+ id.equals(item.getId().toString())).collect(Collectors.toList());
+
+ RbdTreeNode subNode = new RbdTreeNode();
+ subNode.setId(Convert.toLong(id));
+ ModelNode nd = modelNodeAndVnodeList.stream().filter(item ->
+ id.equals(item.getId().toString())).collect(Collectors.toList()).get(0);
+ subNode.setName(nd.getName());
+ subNode.setNodeType(nd.getNodeType());
+ subNode.setPicId(nd.getPicId());
+
+ if (!"vnode".equals(nd.getNodeType())) {
+ subNode.setMyWidth(nd.getWidth());
+ subNode.setMyHeight(nd.getHeight());
+ }
+ subNode.setBlockWidthNum(nd.getVnodeCellNumX());
+ subNode.setBlockHeightNum(nd.getVnodeCellNumY());
+ subNode.setPairStartNodeId(nd.getPairStartNodeId());
+ subNode.setPairEndNodeId(nd.getPairEndNodeId());
+ if (algos.size() > 0) {
+ Algorithm algo = algos.get(0);
+ subNode.setAlgorithmType(algo.getAlgorithmType());
+ String str = algo.getComputerList();
+ String[] ids = str.split(",");
+ for (String subId : ids) {
+ subNode.getChildren().add(listToTree(subId, algorithmList, modelNodeAndVnodeList));
+ }
+ }
+ return subNode;
+ }
+
+ /*
+ */
+
/**
* 鏍规嵁椤跺眰RBD鐨勪綅缃紙x锛寉锛夛紝鑷《鍚戜笅閫掑綊璁＄畻鍚勪釜鑺傜偣鐨勪綅缃紙x锛寉锛�
+ *
* @param modelRbd
* @param algorithmList
* @param modelNodeAndVnodeList
- */
+ *//*
+
private void calcLayoutPosition(ModelRbd modelRbd,
- List<Algorithm> algorithmList,
- List<ModelNode> modelNodeAndVnodeList) {
+ List<Algorithm> algorithmList,
+ List<ModelNode> modelNodeAndVnodeList) {
String rbdsonStr = modelRbd.getContent();
JSONArray rbdJsonArray = new JSONObject(rbdsonStr).getJSONArray("cells");
Algorithm endAlgo = algorithmList.stream().filter(item ->
@@ -200,152 +352,153 @@
endAlgo.getComputerList().equals(item.getId().toString())).collect(Collectors.toList()).get(0);
Algorithm topAlgo = algorithmList.stream().filter(item ->
endAlgo.getComputerList().equals(item.getId().toString())).collect(Collectors.toList()).get(0);
- // 灏唗oNode鐨勪腑蹇冨潗鏍囧畾涓�(0锛�0)锛屽弽绠楁墍鏈夎妭鐐圭殑鍧愭爣
- // 1. 璁＄畻骞惰缃畇tart鐨勪綅缃�
- double x = -topNode.getVnodeCellNumX()*LAYOUT_CELL_SIZE_X/2 - LAYOUT_START_END_SIZE_X;
- double y = -LAYOUT_START_END_SIZE_Y/2;
- setRbdNodePosition(rbdJsonArray, "10000", x, y);
- // 2. 璁＄畻骞惰缃妭鐐圭殑浣嶇疆
- calcNodeLayoutPosition(rbdJsonArray, algorithmList, modelNodeAndVnodeList, topNode, topAlgo, 0, 0);
- // 3. 璁＄畻骞惰缃甧nd鐨勪綅缃�
- x = topNode.getVnodeCellNumX()*LAYOUT_CELL_SIZE_X/2;
- setRbdNodePosition(rbdJsonArray, "20000", x ,y);
+ // 灏唗opNode鐨勫潗鏍囧畾涓篊ell(0锛�0)锛屽弽绠楁墍鏈夎妭鐐圭殑鍧愭爣
+ // 1. 璁＄畻鑺傜偣鐨凜ell浣嶇疆
+ calcNodeLayoutPositionCell(rbdJsonArray, algorithmList, modelNodeAndVnodeList, topNode, topAlgo, 0, 0,
+ topNode.getVnodeCellNumX(), topNode.getVnodeCellNumY());
+ // 2. 璁＄畻鑺傜偣鐨剎锛寉鍧愭爣浣嶇疆
+ calcNodeLayoutPosition(rbdJsonArray, algorithmList, modelNodeAndVnodeList, topNode, topAlgo);
+ // 3. 璁剧疆start鐨勪綅缃�
+ double distance = 200.0;
+ double y = (topNode.getPositionCellY() + topNode.getVnodeCellNumY() / 2) * LAYOUT_CELL_SIZE_Y + (LAYOUT_CELL_SIZE_Y - LAYOUT_START_END_SIZE_Y) / 2;
+ setRbdNodePosition(rbdJsonArray, "10000", 0 - distance, y);
+ // 4. 璁剧疆end鐨勪綅缃�
+ double x = topNode.getVnodeCellNumX() * LAYOUT_CELL_SIZE_X + distance - LAYOUT_START_END_SIZE_X;
+ setRbdNodePosition(rbdJsonArray, "20000", x, y);
JSONObject jsonObject = new JSONObject();
jsonObject.put("cells", rbdJsonArray);
modelRbd.setContent(jsonObject.toString());
}
+*/
- // 閫掑綊鍑芥暟
+/*
+ // 閫掑綊鍑芥暟锛堣绠楀悇鑺傜偣鐨剎锛寉鍧愭爣浣嶇疆锛�
private void calcNodeLayoutPosition(JSONArray rbdJsonArray,
List<Algorithm> algorithmList,
List<ModelNode> modelNodeAndVnodeList,
ModelNode node,
- Algorithm algo,
- double x,
- double y) {
+ Algorithm algo) {
+ // 鏈娇鐢ㄨ澶囩殑瀹為檯瀹姐�侀珮
+ double x;
+ double y;
if ("node".equals(node.getNodeType())) {
- //璁剧疆node锛堣澶囪妭鐐癸級甯冨眬淇℃伅
- node.setPositionX(x - node.getCellNumX()*LAYOUT_CELL_SIZE_X/2);
- node.setPositionY(y - node.getCellNumY()*LAYOUT_CELL_SIZE_Y/2);
- setRbdNodePosition(rbdJsonArray, node.getPicId().toString(), node.getPositionX(), node.getPositionY());
+ x = node.getPositionCellX() * LAYOUT_CELL_SIZE_X + (LAYOUT_CELL_SIZE_X - LAYOUT_DEVICE_NODE_SIZE_X) / 2;
+ y = node.getPositionCellY() * LAYOUT_CELL_SIZE_Y + (LAYOUT_CELL_SIZE_Y - LAYOUT_DEVICE_NODE_SIZE_Y) / 2;
+ node.setPositionX(x);
+ node.setPositionY(y);
+ setRbdNodePosition(rbdJsonArray, node.getPicId(), node.getPositionX(), node.getPositionY());
} else if ("vnode".equals(node.getNodeType())) {
String[] computerNodeListStr = algo.getComputerList().split(",");
switch (algo.getAlgorithmType()) {
case OPE_TYPE_SERIES:
- int sumCellNumX = 0;
- for (String nodeStr : computerNodeListStr) {
- ModelNode childNode = modelNodeAndVnodeList.stream().filter(item ->
- nodeStr.equals(item.getId().toString())).collect(Collectors.toList()).get(0);
- sumCellNumX += childNode.getVnodeCellNumX();
- }
- for (int i=0; i<computerNodeListStr.length; i++) {
- int idx = i;
- ModelNode childNode = modelNodeAndVnodeList.stream().filter(item ->
- computerNodeListStr[idx].equals(item.getId().toString())).collect(Collectors.toList()).get(0);
- if (0==i) {
- double childNodeX = x - sumCellNumX * LAYOUT_CELL_SIZE_X / 2;
- double childNodeY = y - childNode.getVnodeCellNumY() * LAYOUT_CELL_SIZE_Y / 2;
- if ("node".equals(childNode.getNodeType())) {
- childNode.setPositionX(childNodeX);
- childNode.setPositionY(childNodeY);
- setRbdNodePosition(rbdJsonArray, childNode.getPicId().toString(), childNode.getPositionX(), childNode.getPositionY());
- } else {
- Algorithm childAlgo = algorithmList.stream().filter(item ->
- childNode.getId().equals(item.getId().toString())).collect(Collectors.toList()).get(0);
- calcNodeLayoutPosition(rbdJsonArray,
- algorithmList,
- modelNodeAndVnodeList,
- childNode,
- childAlgo,
- childNodeX,
- childNodeY);
- }
- } else {
- int idxPre = i - 1;
- ModelNode childNodePre = modelNodeAndVnodeList.stream().filter(item ->
- computerNodeListStr[idxPre].equals(item.getId().toString())).collect(Collectors.toList()).get(0);
- int idxMe = i;
- double childNodeX = childNodePre.getPositionX() + childNodePre.getVnodeCellNumX()*LAYOUT_CELL_SIZE_X;
- double childNodeY = y - childNode.getVnodeCellNumY()*LAYOUT_CELL_SIZE_Y/2;
- if ("node".equals(childNode.getNodeType())) {
- childNode.setPositionX(childNodeX);
- childNode.setPositionY(childNodeY);
- setRbdNodePosition(rbdJsonArray, childNode.getPicId().toString(), childNode.getPositionX(), childNode.getPositionY());
- } else {
- ModelNode childNodeMe = modelNodeAndVnodeList.stream().filter(item ->
- computerNodeListStr[idxMe].equals(item.getId().toString())).collect(Collectors.toList()).get(0);
- Algorithm childAlgoMe = algorithmList.stream().filter(item ->
- childNodeMe.getId().equals(item.getId().toString())).collect(Collectors.toList()).get(0);
- calcNodeLayoutPosition(rbdJsonArray,
- algorithmList,
- modelNodeAndVnodeList,
- childNode,
- childAlgoMe,
- childNodePre.getPositionX() + childNodePre.getVnodeCellNumX() * LAYOUT_CELL_SIZE_X,
- y - childNodeMe.getVnodeCellNumY() * LAYOUT_CELL_SIZE_Y / 2);
- }
- }
- }
- break;
case OPE_TYPE_PARALLEL:
case OPE_TYPE_SWITCH:
case OPE_TYPE_VOTE:
- int sumCellNumY = 0;
for (String nodeStr : computerNodeListStr) {
ModelNode childNode = modelNodeAndVnodeList.stream().filter(item ->
nodeStr.equals(item.getId().toString())).collect(Collectors.toList()).get(0);
- sumCellNumY += childNode.getVnodeCellNumY();
+ List<Algorithm> childAlgos = algorithmList.stream().filter(item ->
+ childNode.getId().equals(item.getId())).collect(Collectors.toList());
+ Algorithm childAlgo = childAlgos.size() > 0 ? childAlgos.get(0) : null;
+ calcNodeLayoutPosition(rbdJsonArray,
+ algorithmList,
+ modelNodeAndVnodeList,
+ childNode,
+ childAlgo);
}
- for (int i=0; i<computerNodeListStr.length; i++) {
- int idx = i;
- ModelNode childNode = modelNodeAndVnodeList.stream().filter(item ->
- computerNodeListStr[idx].equals(item.getId().toString())).collect(Collectors.toList()).get(0);
- if (0==i) {
- double childNodeX = x - childNode.getVnodeCellNumX()*LAYOUT_CELL_SIZE_X/2;
- double childNodeY = y - sumCellNumY*LAYOUT_CELL_SIZE_Y/2;
- if ("node".equals(childNode.getNodeType())) {
- childNode.setPositionX(childNodeX);
- childNode.setPositionY(childNodeY);
- setRbdNodePosition(rbdJsonArray, childNode.getPicId(), childNode.getPositionX(), childNode.getPositionY());
- } else {
- Algorithm childAlgo = algorithmList.stream().filter(item ->
- childNode.getId().equals(item.getId().toString())).collect(Collectors.toList()).get(0);
- calcNodeLayoutPosition(rbdJsonArray,
- algorithmList,
- modelNodeAndVnodeList,
- childNode,
- childAlgo,
- childNodeX,
- childNodeY);
- }
- } else {
- int idxPre = i - 1;
- ModelNode childNodePre = modelNodeAndVnodeList.stream().filter(item ->
- computerNodeListStr[idxPre].equals(item.getId().toString())).collect(Collectors.toList()).get(0);
- int idxMe = i;
- ModelNode childNodeMe = modelNodeAndVnodeList.stream().filter(item ->
- computerNodeListStr[idxMe].equals(item.getId().toString())).collect(Collectors.toList()).get(0);
- double childNodeX = x - childNodeMe.getVnodeCellNumY() * LAYOUT_CELL_SIZE_Y / 2;
- double childNodeY = childNodePre.getPositionY() + childNodePre.getVnodeCellNumY() * LAYOUT_CELL_SIZE_Y;
- if ("node".equals(childNodeMe.getNodeType())) {
- childNodeMe.setPositionX(childNodeX);
- childNodeMe.setPositionY(childNodeY);
- setRbdNodePosition(rbdJsonArray, childNodeMe.getPicId(), childNodeMe.getPositionX(), childNodeMe.getPositionY());
- } else {
- Algorithm childAlgoMe = algorithmList.stream().filter(item ->
- childNodeMe.getId().equals(item.getId().toString())).collect(Collectors.toList()).get(0);
- calcNodeLayoutPosition(rbdJsonArray,
- algorithmList,
- modelNodeAndVnodeList,
- childNodeMe,
- childAlgoMe,
- childNodeX,
- childNodeY);
- }
- }
+ if (OPE_TYPE_PARALLEL.equals(algo.getAlgorithmType())
+ || OPE_TYPE_SWITCH.equals(algo.getAlgorithmType())
+ || OPE_TYPE_VOTE.equals(algo.getAlgorithmType())) {
+ // 璁剧疆connect鐨勪綅缃�
+ x = node.getPositionCellX() * LAYOUT_CELL_SIZE_X + (LAYOUT_CELL_SIZE_X - LAYOUT_CONNECT_SIZE_X) / 2;
+ y = (node.getPositionCellY() + node.getVnodeCellNumY() / 2) * LAYOUT_CELL_SIZE_Y + (LAYOUT_CELL_SIZE_Y - LAYOUT_CONNECT_SIZE_Y) / 2;
+ setRbdNodePosition(rbdJsonArray, node.getPairStartNodeId(), x, y);
+ // 璁剧疆杩愮畻绗︾殑浣嶇疆
+ x = (node.getPositionCellX() + node.getVnodeCellNumX() - 1) * LAYOUT_CELL_SIZE_X + (LAYOUT_CELL_SIZE_X - LAYOUT_OPE_NODE_SIZE_X) / 2;
+ y = (node.getPositionCellY() + node.getVnodeCellNumY() / 2) * LAYOUT_CELL_SIZE_Y + (LAYOUT_CELL_SIZE_Y - LAYOUT_OPE_NODE_SIZE_Y) / 2;
+ setRbdNodePosition(rbdJsonArray, node.getPicId(), x, y);
}
break;
case OPE_TYPE_BRIDGE:
+ break;
+ default:
+ break;
+ }
+ }
+ }
+
+ // 閫掑綊鍑芥暟锛堣绠楀悇鑺傜偣鐨凜ell浣嶇疆锛屼互宸︿笂瑙掍负Cell浣嶇疆0锛�0锛�
+ private void calcNodeLayoutPositionCell(JSONArray rbdJsonArray,
+ List<Algorithm> algorithmList,
+ List<ModelNode> modelNodeAndVnodeList,
+ ModelNode node,
+ Algorithm algo,
+ double originCellX,
+ double originCellY,
+ double maxX,
+ double maxY) {
+ if ("node".equals(node.getNodeType())) {
+ //璁剧疆node锛堣澶囪妭鐐癸級Cell浣嶇疆
+ double width = LAYOUT_DEVICE_NODE_SIZE_X * maxX;
+ double hight = LAYOUT_DEVICE_NODE_SIZE_Y * maxY;
+ double x = originCellX + (width - LAYOUT_DEVICE_NODE_SIZE_X) / 2;
+ double y = originCellY + (hight - LAYOUT_DEVICE_NODE_SIZE_Y) / 2;
+ node.setPositionCellX(x);
+ node.setPositionCellY(y);
+ } else if ("vnode".equals(node.getNodeType())) {
+ String[] computerNodeListStr = algo.getComputerList().split(",");
+ switch (algo.getAlgorithmType()) {
+ case OPE_TYPE_SERIES:
+ case OPE_TYPE_PARALLEL:
+ case OPE_TYPE_SWITCH:
+ case OPE_TYPE_VOTE:
+ double preNodeCellX = 0.0;
+ double preNodeCellY = 0.0;
+ for (String nodeStr : computerNodeListStr) {
+ ModelNode childNode = modelNodeAndVnodeList.stream().filter(item ->
+ nodeStr.equals(item.getId().toString())).collect(Collectors.toList()).get(0);
+ List<Algorithm> childAlgos = algorithmList.stream().filter(item ->
+ childNode.getId().equals(item.getId())).collect(Collectors.toList());
+ Algorithm childAlgo = childAlgos.size() > 0 ? childAlgos.get(0) : null;
+ if (OPE_TYPE_SERIES.equals(algo.getAlgorithmType())) {
+ calcNodeLayoutPositionCell(rbdJsonArray,
+ algorithmList,
+ modelNodeAndVnodeList,
+ childNode,
+ childAlgo,
+ originCellX + preNodeCellX,
+ originCellY, node.getVnodeCellNumX(), node.getVnodeCellNumY()
+ );
+ preNodeCellX += childNode.getVnodeCellNumX();
+ } else {
+ calcNodeLayoutPositionCell(rbdJsonArray,
+ algorithmList,
+ modelNodeAndVnodeList,
+ childNode,
+ childAlgo,
+ originCellX + 1,
+ originCellY + preNodeCellY, node.getVnodeCellNumX(), node.getVnodeCellNumY());
+ preNodeCellY += childNode.getVnodeCellNumY();
+ }
+ }
+*/
+/*
+ // 璁剧疆杩愮畻绗︾殑Cell浣嶇疆
+ if (OPE_TYPE_SERIES.equals(algo.getAlgorithmType())) {
+ node.setPositionCellX(originCellX);
+ } else {
+ node.setPositionCellX(originCellX + node.getVnodeCellNumX() - 1);
+ }
+ node.setPositionCellY(originCellY + node.getVnodeCellNumY()/2);
+*//*
+
+ // 闇�鑺傜偣浠ｈ〃鏁翠釜閫昏緫鍗曞厓锛屽洜姝ゅ叾鍧愭爣涓簅riginCellX鍜宱riginCellX
+ node.setPositionCellX(originCellX);
+ node.setPositionCellY(originCellX);
+ break;
+ case OPE_TYPE_BRIDGE:
+*/
+/*
ModelNode node1 = modelNodeAndVnodeList.stream().filter(item ->
computerNodeListStr[0].equals(item.getId().toString())).collect(Collectors.toList()).get(0);
ModelNode node2 = modelNodeAndVnodeList.stream().filter(item ->
@@ -373,55 +526,58 @@
int secondRowCellNumY = node3.getVnodeCellNumY();
// 1.3 璁＄畻绗笁琛屼袱涓妭鐐圭殑楂樺害
int thirdRowCellNumY = Math.max(node4.getVnodeCellNumY(), node5.getVnodeCellNumY());
- int totalCellNumY = firstRowCellNumY + secondRowCellNumY + thirdRowCellNumY;
+// int totalCellNumY = firstRowCellNumY + secondRowCellNumY + thirdRowCellNumY;
// 2. 璁＄畻涓夎鍚勮妭鐐圭殑鍧愭爣
// 2.1 璁＄畻绗竴琛屼袱涓妭鐐圭殑鍧愭爣
- calcNodeLayoutPosition(rbdJsonArray,
+ calcNodeLayoutPositionCell(rbdJsonArray,
algorithmList,
modelNodeAndVnodeList,
node1,
algo1,
- x - (node1.getVnodeCellNumX() + node2.getVnodeCellNumX())*LAYOUT_CELL_SIZE_X/2,
- y - (totalCellNumY-firstRowCellNumY+node1.getVnodeCellNumY())*LAYOUT_CELL_SIZE_Y/2);
- calcNodeLayoutPosition(rbdJsonArray,
+ originCellX + 1,
+ originCellY);
+ calcNodeLayoutPositionCell(rbdJsonArray,
algorithmList,
modelNodeAndVnodeList,
node2,
algo2,
- x + (node1.getVnodeCellNumX() + node2.getVnodeCellNumX())*LAYOUT_CELL_SIZE_X/2,
- y - (totalCellNumY-firstRowCellNumY+node2.getVnodeCellNumY())*LAYOUT_CELL_SIZE_Y/2);
+ originCellX + 1 + node1.getPositionCellX(),
+ originCellY);
// 2.2 璁＄畻绗簩琛屾ˉ鑱旇妭鐐圭殑鍧愭爣
- calcNodeLayoutPosition(rbdJsonArray,
+ calcNodeLayoutPositionCell(rbdJsonArray,
algorithmList,
modelNodeAndVnodeList,
- node2,
- algo2,
- x - node3.getVnodeCellNumX()*LAYOUT_CELL_SIZE_X/2,
- y - (totalCellNumY/2-firstRowCellNumY)*LAYOUT_CELL_SIZE_Y);
+ node3,
+ algo3,
+ originCellX + 1,
+ originCellY + firstRowCellNumY);
// 2.3 璁＄畻绗笁琛屼袱涓妭鐐圭殑鍧愭爣
- calcNodeLayoutPosition(rbdJsonArray,
+ calcNodeLayoutPositionCell(rbdJsonArray,
algorithmList,
modelNodeAndVnodeList,
- node1,
- algo1,
- x - (node1.getVnodeCellNumX() + node2.getVnodeCellNumX())*LAYOUT_CELL_SIZE_X/2,
- y - (totalCellNumY-firstRowCellNumY+node1.getVnodeCellNumY())*LAYOUT_CELL_SIZE_Y/2);
- calcNodeLayoutPosition(rbdJsonArray,
+ node4,
+ algo4,
+ originCellX + 1,
+ originCellY + firstRowCellNumY + secondRowCellNumY);
+ calcNodeLayoutPositionCell(rbdJsonArray,
algorithmList,
modelNodeAndVnodeList,
- node2,
- algo2,
- x + (node1.getVnodeCellNumX() + node2.getVnodeCellNumX())*LAYOUT_CELL_SIZE_X/2,
- y - (totalCellNumY-firstRowCellNumY+node2.getVnodeCellNumY())*LAYOUT_CELL_SIZE_Y/2);
+ node5,
+ algo5,
+ originCellX + 1 + node4.getPositionCellX(),
+ originCellY + firstRowCellNumY + secondRowCellNumY);
// 2.4 璁＄畻妗ヨ仈杩愮畻绗︾殑鍧愭爣
- // 2.5 璁＄畻宸︿晶閰嶅鐨刢onnect鐨勫潗鏍�
+ node.setPositionCellX(originCellX + 1);
+ node.setPositionCellY(originCellY + node.getVnodeCellNumY()/2);
+*//*
+
break;
default:
break;
}
}
}
-
+*/
private void setRbdNodePosition(JSONArray rbdJsonArray,
String id,
double x,
@@ -435,8 +591,21 @@
}
}
+ private Double getRbdNodeInfo(JSONArray rbdJsonArray,
+ String picId,
+ String path) {
+ for (int i = 0; i < rbdJsonArray.size(); i++) {
+ JSONObject jsonObject = rbdJsonArray.getJSONObject(i);
+ if (picId.equals(jsonObject.get("id").toString())) {
+ return Convert.toDouble(JsonUtils2.getJsonValueByPath(jsonObject, path.split("/")));
+ }
+ }
+ return null;
+ }
+
/**
* 鑷簳鍚戜笂閫掑綊鍚堣鍑烘暣涓猂BD鐨勫ぇ灏忥紙妯悜鍙婄旱鍚戞墍鍗犲崟鍏冩牸鐨勬暟閲忥級
+ *
* @param modelRbd
* @param algorithmList
* @param modelNodeAndVnodeList
@@ -456,21 +625,21 @@
// 閫掑綊鍑芥暟
private void calcNodeLayoutSize(List<Algorithm> algorithmList,
- List<ModelNode> modelNodeAndVnodeList,
- ModelNode node,
- Algorithm algo) {
+ List<ModelNode> modelNodeAndVnodeList,
+ ModelNode node,
+ Algorithm algo) {
if ("node".equals(node.getNodeType())) {
//璁剧疆node锛堣澶囪妭鐐癸級甯冨眬淇℃伅
- node.setWidth(LAYOUT_DEVICE_NODE_SIZE_X);
- node.setHeight(LAYOUT_DEVICE_NODE_SIZE_Y);
+// node.setWidth(LAYOUT_DEVICE_NODE_SIZE_X);
+// node.setHeight(LAYOUT_DEVICE_NODE_SIZE_Y);
node.setCellNumX(LAYOUT_CELL_NUM_NODE_X);
node.setCellNumY(LAYOUT_CELL_NUM_NODE_Y);
node.setVnodeCellNumX(node.getCellNumX());
node.setVnodeCellNumY(node.getCellNumY());
} else if ("vnode".equals(node.getNodeType())) {
- // 1. 璁剧疆vnode锛堣繍绠楄妭鐐癸級甯冨眬淇℃伅锛堝叾瀹炰覆鑱旀病鏈夎繍绠楃锛屼笉闇�瑕佽缃紝浣嗘槸璁剧疆浜嗕篃娌℃湁鍧忓锛屾墍鏈変笉浣滃尯鍒嗭級
- node.setWidth(LAYOUT_OPE_NODE_SIZE_X);
- node.setHeight(LAYOUT_OPE_NODE_SIZE_Y);
+ // 1. 璁剧疆vnode锛堣繍绠楄妭鐐癸級甯冨眬淇℃伅锛堝叾瀹炰覆鑱旀病鏈夎繍绠楃锛屼笉闇�瑕佽缃紝浣嗘槸璁剧疆浜嗕篃娌℃湁鍧忓锛屾墍浠ヤ笉浣滃尯鍒嗭級
+// node.setWidth(LAYOUT_OPE_NODE_SIZE_X);
+// node.setHeight(LAYOUT_OPE_NODE_SIZE_Y);
node.setCellNumX(LAYOUT_CELL_NUM_NODE_X);
node.setCellNumY(LAYOUT_CELL_NUM_NODE_Y);
@@ -480,21 +649,13 @@
for (String nodeStr : computerNodeListStr) {
ModelNode childNode = modelNodeAndVnodeList.stream().filter(item ->
nodeStr.equals(item.getId().toString())).collect(Collectors.toList()).get(0);
- if ("node".equals(childNode.getNodeType())) {
- childNode.setWidth(LAYOUT_DEVICE_NODE_SIZE_X);
- childNode.setHeight(LAYOUT_DEVICE_NODE_SIZE_Y);
- childNode.setCellNumX(LAYOUT_CELL_NUM_NODE_X);
- childNode.setCellNumY(LAYOUT_CELL_NUM_NODE_Y);
- childNode.setVnodeCellNumX(node.getCellNumX());
- childNode.setVnodeCellNumY(node.getCellNumY());
- } else {
- Algorithm childAlgo = algorithmList.stream().filter(item ->
- childNode.getId().equals(item.getId().toString())).collect(Collectors.toList()).get(0);
- calcNodeLayoutSize(algorithmList,
- modelNodeAndVnodeList,
- childNode,
- childAlgo);
- }
+ List<Algorithm> childAlgos = algorithmList.stream().filter(item ->
+ childNode.getId().equals(item.getId())).collect(Collectors.toList());
+ Algorithm childAlgo = childAlgos.size() > 0 ? childAlgos.get(0) : null;
+ calcNodeLayoutSize(algorithmList,
+ modelNodeAndVnodeList,
+ childNode,
+ childAlgo);
}
// 2.2 璁剧疆铏氳妭鐐规�荤殑甯冨眬淇℃伅鍒拌繍绠楄妭鐐逛腑
setVnodeLayoutNum(computerNodeListStr, modelNodeAndVnodeList, node, algo);
@@ -513,30 +674,24 @@
nodeStr.equals(item.getId().toString())).collect(Collectors.toList()).get(0);
switch (algo.getAlgorithmType()) {
case OPE_TYPE_SERIES:
- numX += childNode.getCellNumX();
- numY = childNode.getCellNumY() > numY ? childNode.getCellNumY() : numY;
+ numX += childNode.getVnodeCellNumX();
+ numY = childNode.getVnodeCellNumY() > numY ? childNode.getVnodeCellNumY() : numY;
break;
case OPE_TYPE_PARALLEL:
case OPE_TYPE_SWITCH:
case OPE_TYPE_VOTE:
- numX = childNode.getCellNumX() > numX ? childNode.getCellNumX() : numX;
- numY += childNode.getCellNumY();
+ numX = childNode.getVnodeCellNumX() > numX ? childNode.getVnodeCellNumX() : numX;
+ numY += childNode.getVnodeCellNumY();
break;
default:
break;
}
}
if (OPE_TYPE_PARALLEL.equals(algo.getAlgorithmType())
- || OPE_TYPE_SWITCH.equals(algo.getAlgorithmType())
- || OPE_TYPE_VOTE.equals(algo.getAlgorithmType())) {
- // 璁剧疆connect鐨勫ぇ灏�
- ModelNode connect = modelNodeAndVnodeList.stream().filter(item ->
- vnode.getPairStartNodeId().equals(item.getId().toString())).collect(Collectors.toList()).get(0);
- connect.setWidth(LAYOUT_CONNECT_SIZE_X);
- connect.setHeight(LAYOUT_CONNECT_SIZE_Y);
- connect.setCellNumX(LAYOUT_CELL_NUM_CONNECT_X);
- connect.setCellNumY(LAYOUT_CELL_NUM_CONNECT_Y);
- numX += connect.getCellNumX();
+ || OPE_TYPE_SWITCH.equals(algo.getAlgorithmType())
+ || OPE_TYPE_VOTE.equals(algo.getAlgorithmType())) {
+ // 鍔犱笂connect鐨勫ぇ灏�
+ numX += LAYOUT_CELL_NUM_CONNECT_X;
numX += vnode.getCellNumX();
}
// 2. 璁＄畻妗ヨ仈
@@ -563,14 +718,8 @@
int numY3 = node4.getCellNumY() > node5.getCellNumY() ? node4.getCellNumY() : node5.getCellNumY();
numX = Math.max(Math.max(numX1, numX2), numX3);
numY = numY1 + numY2 + numY3;
- // 2.4 璁剧疆connect鐨勫ぇ灏�
- ModelNode connect = modelNodeAndVnodeList.stream().filter(item ->
- vnode.getPairStartNodeId().equals(item.getId().toString())).collect(Collectors.toList()).get(0);
- connect.setWidth(LAYOUT_CONNECT_SIZE_X);
- connect.setHeight(LAYOUT_CONNECT_SIZE_Y);
- connect.setCellNumX(LAYOUT_CELL_NUM_CONNECT_X);
- connect.setCellNumY(LAYOUT_CELL_NUM_CONNECT_Y);
- numX += connect.getCellNumX();
+ // 2.4 鍔犱笂connect鐨勫ぇ灏�
+ numX += LAYOUT_CELL_NUM_CONNECT_X;
numX += vnode.getCellNumX();
}
vnode.setVnodeCellNumX(numX);
@@ -580,7 +729,7 @@
@Transactional(rollbackFor = Exception.class)
public boolean analyze(ModelRbd modelRbd) {
boolean result = true;
- if (modelRbd==null) return result;
+ if (modelRbd == null) return result;
Long modelId = modelRbd.getId();
result = analyzeRbd(modelRbd, true);
return result;
@@ -627,14 +776,14 @@
List<ModelLine> modelLineList) {
List<ModelNode> nodesToAdd = new ArrayList<>();
List<ModelLine> linesToAdd = new ArrayList<>();
- for (ModelNode node: modelNodeList) {
+ 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();
+ ModelNode nodeNew = new ModelNode();
Long nodeNewId = UUIDUtil.generateId();
nodeNew.setId(nodeNewId);
nodeNew.setPicId(nodeNewId.toString());
@@ -655,7 +804,7 @@
lineNew.setEndCell(node.getPicId());
linesToAdd.add(lineNew);
- for(ModelLine line: inLineList){
+ for (ModelLine line : inLineList) {
line.setEndCell(nodeNewId.toString());
}
}
@@ -705,19 +854,19 @@
List<ModelNode> modelNodeAndVnodeList) {
ModelNode endNode = modelNodeList.stream().filter(item ->
"end".equals(item.getNodeType())).collect(Collectors.toList()).get(0);
- if (endNode.getInLineNum()!=1) return false;
+ 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;
+ 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;
+ if (!"start".equals(startNode.getNodeType()) || startNode.getOutLineNum() != 1) return false;
// 鍒犻櫎鑺傜偣鍙婅繛绾�
modelLineList.remove(lineToEnd);
@@ -737,7 +886,7 @@
algorithm.setAlgorithmType(endNode.getNodeType());
algorithm.setComputerList(node.getId().toString());
algorithm.setObjectList(node.getName());
- algorithm.setStep(algorithmList.size()==0 ? 0 : algorithmList.get(algorithmList.size()-1).getStep()+1);
+ algorithm.setStep(algorithmList.size() == 0 ? 0 : algorithmList.get(algorithmList.size() - 1).getStep() + 1);
algorithmList.add(algorithm);
// 鏂板缁撴潫鐨勮櫄鑺傜偣
@@ -746,7 +895,7 @@
vnode.setPicId(id.toString());
vnode.setModelId(modelId);
vnode.setNodeType("vnode");
- vnode.setName("v"+algorithm.getStep());
+ vnode.setName("v" + algorithm.getStep());
modelNodeAndVnodeList.add(vnode);
return true;
@@ -760,27 +909,27 @@
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;
+ if (startNodes.size() == 0) return hasSimplified;
for (ModelNode startNode : startNodes) {
- if (startNode.getInLineNum()!=1) continue;
+ 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;
+ if (result.size() < 2) continue;
- ModelNode endNode = result.get(result.size()-1);
- if ("start,parallel,switch,vote,bridge".contains(endNode.getNodeType()) || endNode.getOutLineNum()!=1) {
+ ModelNode endNode = result.get(result.size() - 1);
+ if ("start,parallel,switch,vote,bridge".contains(endNode.getNodeType()) || endNode.getOutLineNum() != 1) {
result.remove(endNode);
}
List<ModelNode> realSeriesNodes = result.stream().filter(item ->
!"connect".equals(item.getNodeType())).collect(Collectors.toList());
- if (realSeriesNodes.size()<1) {
+ if (realSeriesNodes.size() < 1) {
if (result.size() < 2) continue;
// 鏇挎崲鎴愯繛绾�
replaceToLineSeries(modelNodeList, modelLineList, result);
- } else if (realSeriesNodes.size()==1) {
+ } else if (realSeriesNodes.size() == 1) {
if (result.size() < 2) continue; // path涓婂彧鏈夎浜у搧鑺傜偣锛坣ode/vnode锛夎嚜宸憋紝鏃犻渶鍋氫粈涔�
// 灏唒ath鏇挎崲鎴愯鑺傜偣
replaceToTheNodeSeries(modelNodeList, modelLineList,
@@ -801,12 +950,12 @@
List<ModelNode> path) {
// 鑾峰彇path鐨勮捣鐐圭殑鍑哄彛绾�
ModelNode finalNodeStart = path.get(0);
- ModelNode finalNodeEnd = path.get(path.size()-1);
+ ModelNode finalNodeEnd = path.get(path.size() - 1);
List<ModelLine> outLines = modelLineList.stream().filter(item ->
item.getBeginCell().equals(finalNodeStart.getPicId())).collect(Collectors.toList());
// 鍒犻櫎path涓婄殑鎵�鏈変腑闂磋繛绾垮強path鐨勭粨鏉熺偣浠ュ鐨勮妭鐐�
- for (int i=0; i<path.size(); i++) {
+ for (int i = 0; i < path.size(); i++) {
ModelNode finalNode = path.get(i);
if (i < path.size() - 1) {
// 灏嗗叆鍙ｇ嚎鍒犻櫎
@@ -829,20 +978,20 @@
}
private void replaceToTheNodeSeries(List<ModelNode> modelNodeList,
- List<ModelLine> modelLineList,
- List<ModelNode> path,
- ModelNode theNode) {
+ List<ModelLine> modelLineList,
+ List<ModelNode> path,
+ ModelNode theNode) {
// 鑾峰彇path鐨勮捣鐐圭殑鍑哄彛绾�
ModelNode finalNodeStart = path.get(0);
List<ModelLine> outLines = modelLineList.stream().filter(item ->
item.getBeginCell().equals(finalNodeStart.getPicId())).collect(Collectors.toList());
// 鑾峰彇path鐨勭粨鏉熺偣鐨勫叆鍙ｇ嚎
- ModelNode finalNodeEnd = path.get(path.size()-1);
+ ModelNode finalNodeEnd = path.get(path.size() - 1);
List<ModelLine> inLines = modelLineList.stream().filter(item ->
item.getEndCell().equals(finalNodeEnd.getPicId())).collect(Collectors.toList());
// 鍒犻櫎path涓婄殑鎵�鏈変腑闂磋繛绾垮強theNode浠ュ鐨勮妭鐐�
- for (int i=0; i<path.size(); i++) {
+ for (int i = 0; i < path.size(); i++) {
ModelNode finalNode = path.get(i);
if (i < path.size() - 1) {
// 灏嗗叆鍙ｇ嚎鍒犻櫎
@@ -888,7 +1037,7 @@
algorithm.setAlgorithmType("series");
algorithm.setComputerList(computerList.get(0));
algorithm.setObjectList(computerList.get(1));
- algorithm.setStep(algorithmList.size()==0 ? 0 : algorithmList.get(algorithmList.size()-1).getStep()+1);
+ algorithm.setStep(algorithmList.size() == 0 ? 0 : algorithmList.get(algorithmList.size() - 1).getStep() + 1);
algorithmList.add(algorithm);
// 鏂板铏氳妭鐐�
@@ -897,16 +1046,16 @@
vnode.setPicId(id.toString());
vnode.setModelId(modelId);
vnode.setNodeType("vnode");
- vnode.setName("v"+algorithm.getStep());
+ vnode.setName("v" + algorithm.getStep());
vnode.setPositionX(path.get(0).getPositionX());
vnode.setPositionY(path.get(0).getPositionY());
modelNodeList.add(vnode);
modelNodeAndVnodeList.add(vnode);
// 灏唒ath鏇挎崲涓鸿铏氳妭鐐�
- for (int i=0; i<path.size(); i++) {
+ for (int i = 0; i < path.size(); i++) {
ModelNode finalNode = path.get(i);
- if (i==0) {
+ if (i == 0) {
// 灏嗚鑺傜偣鐨勫嚭鍙ｇ嚎鏀逛负杩炴帴鍒拌櫄鑺傜偣
List<ModelLine> outLines = modelLineList.stream().filter(item ->
item.getBeginCell().equals(finalNode.getPicId())).collect(Collectors.toList());
@@ -918,7 +1067,7 @@
item.getEndCell().equals(finalNode.getPicId())).collect(Collectors.toList());
modelLineList.removeAll(inLines);
}
- if (i==path.size()-1) {
+ if (i == path.size() - 1) {
// 灏嗚鑺傜偣鐨勫叆鍙ｇ嚎鏀逛负杩炴帴鍒拌櫄鑺傜偣
List<ModelLine> inLines = modelLineList.stream().filter(item ->
item.getEndCell().equals(finalNode.getPicId())).collect(Collectors.toList());
@@ -1038,10 +1187,10 @@
if (isBridgeUpperLine(inLine, modelLineList) || isBridgeLowerLine(inLine, modelLineList)) return;
List<ModelNode> nodes = modelNodeList.stream().filter(item ->
inLine.getBeginCell().equals(item.getPicId())).collect(Collectors.toList());
- if (0==nodes.size()) return; // 鍒版ˉ鑱斾腑闂磋妭鐐圭殑绾跨殑璧风偣涓嶆槸Node锛岃�屾槸Line锛屾墍浠ヨ幏鍙栫殑璧风偣鏁板彲鑳戒负0
+ if (0 == nodes.size()) return; // 鍒版ˉ鑱斾腑闂磋妭鐐圭殑绾跨殑璧风偣涓嶆槸Node锛岃�屾槸Line锛屾墍浠ヨ幏鍙栫殑璧风偣鏁板彲鑳戒负0
ModelNode pathNode = nodes.get(0);
result.add(pathNode);
- if (pathNode.getOutLineNum()!=1 || pathNode.getInLineNum()!=1) return;
+ if (pathNode.getOutLineNum() != 1 || pathNode.getInLineNum() != 1) return;
if ("parallel,switch,vote,bridge".contains(pathNode.getNodeType())) return;
seekPathSeries(modelNodeList, modelLineList, pathNode, result);
}
@@ -1077,10 +1226,10 @@
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;
+ if (startNodes.size() == 0) return hasSimplified;
for (ModelNode startNode : startNodes) {
- if (startNode.getInLineNum()<2) continue;
+ 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,
@@ -1094,12 +1243,12 @@
}
private boolean simplifyParallelGroup(Long modelId,
- List<ModelNode> modelNodeList,
- List<ModelLine> modelLineList,
- List<Algorithm> algorithmList,
- List<ModelNode> modelNodeAndVnodeList,
- ModelNode startNode,
- List<ModelLine> lines) {
+ 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) {
@@ -1109,10 +1258,10 @@
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) {
+ if (pathOneGroup.size() > 1) {
List<ModelNode> branchNodeList = new ArrayList<>();
ModelNode endNode = getBranchNodesOneParallel(pathOneGroup, branchNodeList);
- if ("connect".equals(startNode.getNodeType()) && pathOneGroup.size()==lines.size()) {
+ if ("connect".equals(startNode.getNodeType()) && pathOneGroup.size() == lines.size()) {
// 鏇挎崲鎴愯櫄鑺傜偣
modelNodeAndVnodeList.add(startNode);
replaceToVnode("parallel", modelId, modelNodeList, modelLineList,
@@ -1161,7 +1310,7 @@
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;
+ 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);
@@ -1174,7 +1323,7 @@
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);
+ ModelNode endNode = path.get(path.size() - 1);
if (endNodePathsMap.containsKey(endNode)) {
endNodePathsMap.get(endNode).add(path);
} else {
@@ -1187,11 +1336,11 @@
}
private ModelNode getBranchNodesOneParallel(List<List<ModelNode>> paths,
- List<ModelNode> branchNodeList) {
+ List<ModelNode> branchNodeList) {
ModelNode endNode = null;
for (List<ModelNode> path : paths) {
branchNodeList.add(path.get(0));
- endNode = path.get(path.size()-1);
+ endNode = path.get(path.size() - 1);
}
return endNode;
}
@@ -1205,12 +1354,12 @@
boolean hasSimplifiedMe = false;
List<ModelNode> startNodes = modelNodeList.stream().filter(item ->
"bridge".equals(item.getNodeType())).collect(Collectors.toList());
- if (startNodes.size()==0) return hasSimplified;
+ 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;
+ if (lines.size() < 2) continue;
List<ModelLinePairDto> linePairs = getLinePairs(lines);
for (ModelLinePairDto linePair : linePairs) {
hasSimplifiedMe = simplifyBridgeOneLinePair(modelId, modelNodeList, modelLineList,
@@ -1309,8 +1458,8 @@
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);
- if (nodeTmp1.getInLineNum()!=1 || nodeTmp1.getOutLineNum()!=1) return false;
- if (nodeTmp2.getInLineNum()!=1 || nodeTmp2.getOutLineNum()!=1) return false;
+ if (nodeTmp1.getInLineNum() != 1 || nodeTmp1.getOutLineNum() != 1) return false;
+ if (nodeTmp2.getInLineNum() != 1 || nodeTmp2.getOutLineNum() != 1) return false;
ModelNode finalNode = nodeTmp1;
ModelLine lineToNodeTmp1 = modelLineList.stream().filter(item ->
item.getEndCell().equals(finalNode.getPicId())).collect(Collectors.toList()).get(0);
@@ -1355,15 +1504,15 @@
finalLine3.getBeginCell().equals(item.getPicId())).collect(Collectors.toList()).get(0);
if (!node3Candidate1.getId().equals(node3Candidate2.getId())) return false;
node3 = node3Candidate1;
- if (node3.getInLineNum()!=1 || node3.getOutLineNum()!=1) return false;
+ if (node3.getInLineNum() != 1 || node3.getOutLineNum() != 1) return false;
ModelLine finalLine4 = line1To2;
node1 = modelNodeList.stream().filter(item ->
finalLine4.getBeginCell().equals(item.getPicId())).collect(Collectors.toList()).get(0);
- if (node1.getInLineNum()!=1 || node1.getOutLineNum()!=1) return false;
+ if (node1.getInLineNum() != 1 || node1.getOutLineNum() != 1) return false;
ModelLine finalLine5 = line4To5;
node4 = modelNodeList.stream().filter(item ->
finalLine5.getBeginCell().equals(item.getPicId())).collect(Collectors.toList()).get(0);
- if (node4.getInLineNum()!=1 || node4.getOutLineNum()!=1) return false;
+ if (node4.getInLineNum() != 1 || node4.getOutLineNum() != 1) return false;
ModelNode finalNode3 = node1;
ModelLine lineTo1 = modelLineList.stream().filter(item ->
item.getEndCell().equals(finalNode3.getPicId())).collect(Collectors.toList()).get(0);
@@ -1444,8 +1593,8 @@
// 鎵惧嚭鎵�鏈�2鏍圭嚎鐨勭粍鍚�
private List<ModelLinePairDto> getLinePairs(List<ModelLine> lines) {
List<ModelLinePairDto> linePairs = new ArrayList<>();
- for (int i=0; i<lines.size()-1; i++) {
- for (int j=i+1; j<lines.size(); j++) {
+ for (int i = 0; i < lines.size() - 1; i++) {
+ for (int j = i + 1; j < lines.size(); j++) {
ModelLinePairDto linePair = new ModelLinePairDto();
linePair.setLine1(lines.get(i));
linePair.setLine2(lines.get(j));
@@ -1464,7 +1613,7 @@
boolean hasSimplified) {
List<ModelNode> opNodes = modelNodeList.stream().filter(item ->
operator.equals(item.getNodeType())).collect(Collectors.toList());
- if (opNodes.size()==0) return hasSimplified;
+ if (opNodes.size() == 0) return hasSimplified;
for (ModelNode opNode : opNodes) {
List<ModelLine> lines = modelLineList.stream().filter(item ->
@@ -1519,7 +1668,7 @@
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);
+ algorithm.setStep(algorithmList.size() == 0 ? 0 : algorithmList.get(algorithmList.size() - 1).getStep() + 1);
algorithmList.add(algorithm);
// 鏇挎崲涓鸿櫄鑺傜偣
@@ -1533,7 +1682,7 @@
}
startNode.setId(id);
startNode.setNodeType("vnode");
- startNode.setName("v"+algorithm.getStep());
+ startNode.setName("v" + algorithm.getStep());
ModelLine modelLineNew = new ModelLine();
Long picId2 = UUIDUtil.generateId();
@@ -1552,14 +1701,14 @@
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;
+ 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);
@@ -1585,7 +1734,7 @@
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)){
+ } else if ("image".equals(shape)) {
ModelNode modelNode = new ModelNode();
modelNode.setId(UUIDUtil.generateId());
modelNode.setModelId(modelId);
@@ -1593,16 +1742,18 @@
modelNode.setNodeType(JsonUtils2.getJsonValueByPath(jsonObject, "data/nodeType".split("/")).toString());
modelNode.setPositionX(Double.valueOf(JsonUtils2.getJsonValueByPath(jsonObject, "position/x".split("/")).toString()));
modelNode.setPositionY(Double.valueOf(JsonUtils2.getJsonValueByPath(jsonObject, "position/y".split("/")).toString()));
+ modelNode.setWidth(new Double(JsonUtils2.getJsonValueByPath(jsonObject, "size/width".split("/")).toString()));
+ modelNode.setHeight(new Double(JsonUtils2.getJsonValueByPath(jsonObject, "size/height".split("/")).toString()));
jsonValue = JsonUtils2.getJsonValueByPath(jsonObject, "data/voteNum".split("/"));
- if (jsonValue!=null && StringUtils.isNotBlank(jsonValue.toString())) {
+ if (jsonValue != null && StringUtils.isNotBlank(jsonValue.toString())) {
modelNode.setVoteNum(Integer.valueOf(jsonValue.toString()));
}
jsonValue = JsonUtils2.getJsonValueByPath(jsonObject, "data/startNodeId".split("/"));
- if (jsonValue!=null && StringUtils.isNotBlank(jsonValue.toString())) {
+ if (jsonValue != null && StringUtils.isNotBlank(jsonValue.toString())) {
modelNode.setPairStartNodeId(jsonValue.toString());
}
jsonValue = JsonUtils2.getJsonValueByPath(jsonObject, "data/endNodeId".split("/"));
- if (jsonValue!=null && StringUtils.isNotBlank(jsonValue.toString())) {
+ if (jsonValue != null && StringUtils.isNotBlank(jsonValue.toString())) {
modelNode.setPairEndNodeId(jsonValue.toString());
}
if ("node".equals(modelNode.getNodeType())) {
@@ -1611,7 +1762,7 @@
modelNode.setDataId(Long.valueOf(dataId));
modelNode.setNodeTypeExt(JsonUtils2.getJsonValueByPath(jsonObject, "data/nodeTypeExt".split("/")).toString());
jsonValue = JsonUtils2.getJsonValueByPath(jsonObject, "attrs/text/text".split("/"));
- modelNode.setName(jsonValue==null ? "" : jsonValue.toString());
+ modelNode.setName(jsonValue == null ? "" : jsonValue.toString());
productImg.setDataId(dataId);
String productType = JsonUtils2.getJsonValueByPath(jsonObject, "data/productType".split("/")).toString();
@@ -1620,7 +1771,7 @@
jsonValue = JsonUtils2.getJsonValueByPath(jsonObject, "data/reliabDistribType".split("/"));
if (jsonValue != null && StringUtils.isNotBlank(jsonValue.toString())) {
productImg.setReliabDistribType(Integer.valueOf(jsonValue.toString()));
- if (3==productImg.getReliabDistribType()) {
+ if (3 == productImg.getReliabDistribType()) {
// 浜岄」鍒嗗竷
jsonValue = JsonUtils2.getJsonValueByPath(jsonObject, "data/simulatTimes".split("/"));
if (jsonValue != null && StringUtils.isNotBlank(jsonValue.toString())) {
diff --git a/web/src/views/modules/taskReliability/RBD-edit-img.vue b/web/src/views/modules/taskReliability/RBD-edit-img.vue
index 0deb426..c7f5609 100644
--- a/web/src/views/modules/taskReliability/RBD-edit-img.vue
+++ b/web/src/views/modules/taskReliability/RBD-edit-img.vue
@@ -18,6 +18,7 @@
<el-button type="primary" @click="saveDiagram()">鏆傚瓨</el-button>
<el-button type="primary" @click="analyzeDiagram()">鎻愪氦</el-button>
<el-button type="primary" @click="clearDiagram()">娓呯┖鍥惧舰</el-button>
+ <el-button type="primary" @click="layoutDiagram()">涓�閿帓鐗�</el-button>
<el-button @click="leftAlign()">
<i style="font-size: 1rem;" class="wt-iconfont icon-zuoduiqi"></i>
</el-button>
@@ -1503,6 +1504,28 @@
}
})
},
+ async layoutDiagram() {
+ console.log(JSON.stringify(this.graph.toJSON()), 'graph.toJSON()')
+ this.dataForm.content = JSON.stringify(this.graph.toJSON())
+ this.dataForm.urlPref = window.SITE_CONFIG['apiURL']
+ await this.$http['post'](`/taskReliability/ModelLine/layout`, this.dataForm).then(async res => {
+ if (res.msg === 'success') {
+ // this.$emit('refreshDataList')
+ // this.$alert('瑙ｆ瀽鎴愬姛', '鎻愮ず', {
+ // confirmButtonText: '纭畾'
+ // })
+ console.log(res.data, 'layoutDiagram res.data')
+ this.dataForm.content = res.data.content
+ console.log(this.dataForm.content, 'layoutDiagram dataForm.content')
+ this.diagramJson = JSON.parse(this.dataForm.content)
+ this.graph.fromJSON(this.diagramJson)
+ this.isFirstLoad = false;
+ // console.log(this.diagramJson.cells.length, 'this.diagramJson.cells.length')
+
+ this.graph.positionContent('left')
+ }
+ })
+ },
leftAlign() {
const NODE = this.graph.getSelectedCells()
let leftX = null
--
Gitblit v1.9.1