From ef6d6e4abc03b3a34818d1283e27ae9827b57efe Mon Sep 17 00:00:00 2001 From: xyc <jc_xiong@hotmail.com> Date: 星期二, 10 九月 2024 11:35:36 +0800 Subject: [PATCH] 新增可靠性评定后台 --- modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelLineService.java | 491 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 491 insertions(+), 0 deletions(-) diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelLineService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelLineService.java index adc3692..7ad020c 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 @@ -7,11 +7,16 @@ import com.zt.common.utils.UUIDUtil; import com.zt.life.modules.mainPart.basicInfo.dao.ParamDataDao; import com.zt.life.modules.mainPart.basicInfo.dao.XhProductModelDao; +import com.zt.life.modules.mainPart.basicInfo.model.ParamData; import com.zt.life.modules.mainPart.basicInfo.model.ProductImg; +import com.zt.life.modules.mainPart.basicInfo.model.XhProductModel; import com.zt.life.modules.mainPart.taskReliability.dao.*; import com.zt.life.modules.mainPart.taskReliability.dto.ModelLinePairDto; import com.zt.life.modules.mainPart.taskReliability.model.*; import org.apache.commons.lang3.StringUtils; +import org.dom4j.Element; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.zt.common.db.query.QueryFilter; @@ -29,6 +34,42 @@ */ @Service public class ModelLineService extends BaseService<ModelLineDao, ModelLine> { + private static final Logger logger = LoggerFactory.getLogger(ModelLineService.class); + + // 杩愮畻 + public static final String OPE_TYPE_SERIES = "series"; + public static final String OPE_TYPE_PARALLEL = "parallel"; + public static final String OPE_TYPE_SWITCH = "switch"; + public static final String OPE_TYPE_VOTE = "vote"; + public static final String OPE_TYPE_BRIDGE = "bridge"; + + // 鑺傜偣 + /* 鑷姩甯冨眬锛歴tart涓巈nd鐨勫ぇ灏� */ + public static final int LAYOUT_START_END_SIZE_X = 60; + public static final int LAYOUT_START_END_SIZE_Y = 40; + /* 鑷姩甯冨眬锛氳櫄妗嗙殑澶у皬 */ + public static final int LAYOUT_DASHED_BOX_SIZE_X = 60; + public static final int LAYOUT_DASHED_BOX_SIZE_Y = 40; + /* 鑷姩甯冨眬锛氶�昏緫杩愮畻绗︾殑澶у皬 */ + public static final int LAYOUT_OPE_NODE_SIZE_X = 50; + public static final int LAYOUT_OPE_NODE_SIZE_Y = 50; + /* 鑷姩甯冨眬锛氳澶囪妭鐐圭殑澶у皬 */ + public static final int LAYOUT_DEVICE_NODE_SIZE_X = 60; + public static final int LAYOUT_DEVICE_NODE_SIZE_Y = 60; + /* 鑷姩甯冨眬锛歝onnect鐨勫ぇ灏� */ + public static final int LAYOUT_CONNECT_SIZE_X = 10; + public static final int LAYOUT_CONNECT_SIZE_Y = 10; + + // 鍗曞厓鏍硷紙瀛樻斁鑺傜偣锛� + /* 鑷姩甯冨眬锛氬崟鍏冩牸澶у皬 */ + public static final int LAYOUT_CELL_SIZE_X = 120; + public static final int LAYOUT_CELL_SIZE_Y = 120; + /* 鑷姩甯冨眬锛氳妭鐐瑰崰鎹崟鍏冩牸鏁伴噺 */ + public static final int LAYOUT_CELL_NUM_NODE_X = 1; + public static final int LAYOUT_CELL_NUM_NODE_Y = 1; + public static final int LAYOUT_CELL_NUM_CONNECT_X = 1; + public static final int LAYOUT_CELL_NUM_CONNECT_Y = 1; + @Autowired private ModelLineDao modelLineDao; @Autowired @@ -92,6 +133,448 @@ modelRbdDao.deleteByModelId(modelId); modelRbdDao.insert(modelRbd); + } + + // 鑷姩鎺掔増RBD + @Transactional(rollbackFor = Exception.class) + public boolean layout(ModelRbd modelRbd) { + boolean result = true; + if (modelRbd==null) return result; + Long modelId = modelRbd.getId(); + result = layoutRbd(modelRbd); + return result; + } + + private boolean layoutRbd(ModelRbd modelRbd) { + boolean result = true; + String rbdsonStr = modelRbd.getContent(); + + JSONArray rbdJsonArray = new JSONObject(rbdsonStr).getJSONArray("cells"); + if (rbdJsonArray == null) return result; + + // 瑙f瀽缁撴灉瀛樻斁list + List<ModelNode> modelNodeList = new ArrayList<>(); + List<ModelLine> modelLineList = new ArrayList<>(); + List<Algorithm> algorithmList = new ArrayList<>(); + List<ProductImg> productImgList = new ArrayList<>(); // 鏆備笉浣跨敤锛堣�屼娇鐢ㄦ暟鎹簱涓殑鍙潬鎬у弬鏁帮級 + + // 1. 瑙f瀽鍑鸿妭鐐逛笌杈� + getNodeAndLineFromRbd(modelRbd.getId(), rbdJsonArray, modelNodeList, modelLineList, productImgList); + // 2. 瀵逛簬鏈夊鏍瑰叆鍙g嚎鐨勪骇鍝佽妭鐐癸紝灏嗗叾涓婄殑琛ㄥ喅銆佹梺鑱斿叧绯诲墺绂绘垚杩愮畻绗﹁妭鐐癸紝娣诲姞鍒拌鑺傜偣鐨勫墠闈紝骞舵坊鍔犵浉搴旂殑杈� + peelOperationFromProductNode(modelRbd.getId(), modelNodeList, modelLineList); + // 3. 璁$畻鎵�鏈夎妭鐐圭殑鍏ュ彛绾挎暟鍙婂嚭鍙g嚎鏁� + calcInOutLineNumAllNode(modelNodeList, modelLineList); + // 4. 澶嶅埗浜у搧鑺傜偣(node)鍒發ist + List<ModelNode> modelNodeAndVnodeList = modelNodeList.stream().filter(item -> + "node".equals(item.getNodeType())).collect(Collectors.toList()); + // 5. 涓嶆柇灏嗗熀鏈ā鍨嬶紙涓茶仈銆佸苟鑱斻�佹梺鑱斻�佽〃鍐炽�佹ˉ鑱旓級鏇挎崲涓鸿櫄鑺傜偣鑰岀畝鍖栧浘褰紝鐩磋嚦鏃犳硶绠�鍖栦负姝€�� + result = getAlgorithmFromRbd(modelRbd, modelNodeList, modelLineList, algorithmList, modelNodeAndVnodeList); + + // 6. 閫掑綊璁$畻RBD鐨勫竷灞�绌洪棿澶у皬 + calcLayoutSize(modelRbd, algorithmList, modelNodeAndVnodeList); + // 7. 閫掑綊璁$畻RBD鐨勫竷灞�绌洪棿鍙傛暟锛坸銆亂鍧愭爣锛� + calcLayoutPosition(modelRbd, algorithmList, modelNodeAndVnodeList); + + // 8. 淇濆瓨鑷姩甯冨眬妯″瀷 + // 鏇存柊RBD鏁版嵁 +// modelRbd.setAutoLayoutContent("娴嬭瘯鏂囧瓧"); + modelRbdDao.updateById(modelRbd); + + return result; + } + + /** + * 鏍规嵁椤跺眰RBD鐨勪綅缃紙x锛寉锛夛紝鑷《鍚戜笅閫掑綊璁$畻鍚勪釜鑺傜偣鐨勪綅缃紙x锛寉锛� + * @param modelRbd + * @param algorithmList + * @param modelNodeAndVnodeList + */ + private void calcLayoutPosition(ModelRbd modelRbd, + List<Algorithm> algorithmList, + List<ModelNode> modelNodeAndVnodeList) { + String rbdsonStr = modelRbd.getContent(); + JSONArray rbdJsonArray = new JSONObject(rbdsonStr).getJSONArray("cells"); + Algorithm endAlgo = algorithmList.stream().filter(item -> + "end".equals(item.getAlgorithmType())).collect(Collectors.toList()).get(0); + ModelNode topNode = modelNodeAndVnodeList.stream().filter(item -> + 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); + 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) { + 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()); + } 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(); + } + 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); + } + } + } + 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 -> + computerNodeListStr[1].equals(item.getId().toString())).collect(Collectors.toList()).get(0); + ModelNode node3 = modelNodeAndVnodeList.stream().filter(item -> + computerNodeListStr[2].equals(item.getId().toString())).collect(Collectors.toList()).get(0); + ModelNode node4 = modelNodeAndVnodeList.stream().filter(item -> + computerNodeListStr[3].equals(item.getId().toString())).collect(Collectors.toList()).get(0); + ModelNode node5 = modelNodeAndVnodeList.stream().filter(item -> + computerNodeListStr[4].equals(item.getId().toString())).collect(Collectors.toList()).get(0); + Algorithm algo1 = algorithmList.stream().filter(item -> + node1.getId().equals(item.getId().toString())).collect(Collectors.toList()).get(0); + Algorithm algo2 = algorithmList.stream().filter(item -> + node2.getId().equals(item.getId().toString())).collect(Collectors.toList()).get(0); + Algorithm algo3 = algorithmList.stream().filter(item -> + node3.getId().equals(item.getId().toString())).collect(Collectors.toList()).get(0); + Algorithm algo4 = algorithmList.stream().filter(item -> + node4.getId().equals(item.getId().toString())).collect(Collectors.toList()).get(0); + Algorithm algo5 = algorithmList.stream().filter(item -> + node5.getId().equals(item.getId().toString())).collect(Collectors.toList()).get(0); + // 1锛岃绠椾笁琛岀殑鎬婚珮搴� + // 1.1 璁$畻绗竴琛屼袱涓妭鐐圭殑楂樺害 + int firstRowCellNumY = Math.max(node1.getVnodeCellNumY(), node2.getVnodeCellNumY()); + // 1.2 璁$畻绗簩琛屾ˉ鑱旇妭鐐圭殑楂樺害 + int secondRowCellNumY = node3.getVnodeCellNumY(); + // 1.3 璁$畻绗笁琛屼袱涓妭鐐圭殑楂樺害 + int thirdRowCellNumY = Math.max(node4.getVnodeCellNumY(), node5.getVnodeCellNumY()); + int totalCellNumY = firstRowCellNumY + secondRowCellNumY + thirdRowCellNumY; + // 2. 璁$畻涓夎鍚勮妭鐐圭殑鍧愭爣 + // 2.1 璁$畻绗竴琛屼袱涓妭鐐圭殑鍧愭爣 + calcNodeLayoutPosition(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, + algorithmList, + modelNodeAndVnodeList, + node2, + algo2, + x + (node1.getVnodeCellNumX() + node2.getVnodeCellNumX())*LAYOUT_CELL_SIZE_X/2, + y - (totalCellNumY-firstRowCellNumY+node2.getVnodeCellNumY())*LAYOUT_CELL_SIZE_Y/2); + // 2.2 璁$畻绗簩琛屾ˉ鑱旇妭鐐圭殑鍧愭爣 + calcNodeLayoutPosition(rbdJsonArray, + algorithmList, + modelNodeAndVnodeList, + node2, + algo2, + x - node3.getVnodeCellNumX()*LAYOUT_CELL_SIZE_X/2, + y - (totalCellNumY/2-firstRowCellNumY)*LAYOUT_CELL_SIZE_Y); + // 2.3 璁$畻绗笁琛屼袱涓妭鐐圭殑鍧愭爣 + calcNodeLayoutPosition(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, + algorithmList, + modelNodeAndVnodeList, + node2, + algo2, + x + (node1.getVnodeCellNumX() + node2.getVnodeCellNumX())*LAYOUT_CELL_SIZE_X/2, + y - (totalCellNumY-firstRowCellNumY+node2.getVnodeCellNumY())*LAYOUT_CELL_SIZE_Y/2); + // 2.4 璁$畻妗ヨ仈杩愮畻绗︾殑鍧愭爣 + // 2.5 璁$畻宸︿晶閰嶅鐨刢onnect鐨勫潗鏍� + break; + default: + break; + } + } + } + + private void setRbdNodePosition(JSONArray rbdJsonArray, + String id, + double x, + double y) { + for (int i = 0; i < rbdJsonArray.size(); i++) { + JSONObject jsonObject = rbdJsonArray.getJSONObject(i); + if (id.equals(jsonObject.get("id").toString())) { + JsonUtils2.setJsonValueByPath(jsonObject, "position/x".split("/"), x); + JsonUtils2.setJsonValueByPath(jsonObject, "position/y".split("/"), y); + } + } + } + + /** + * 鑷簳鍚戜笂閫掑綊鍚堣鍑烘暣涓猂BD鐨勫ぇ灏忥紙妯悜鍙婄旱鍚戞墍鍗犲崟鍏冩牸鐨勬暟閲忥級 + * @param modelRbd + * @param algorithmList + * @param modelNodeAndVnodeList + */ + private void calcLayoutSize( + ModelRbd modelRbd, + List<Algorithm> algorithmList, + List<ModelNode> modelNodeAndVnodeList) { + Algorithm endAlgo = algorithmList.stream().filter(item -> + "end".equals(item.getAlgorithmType())).collect(Collectors.toList()).get(0); + ModelNode topNode = modelNodeAndVnodeList.stream().filter(item -> + 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); + calcNodeLayoutSize(algorithmList, modelNodeAndVnodeList, topNode, topAlgo); + } + + // 閫掑綊鍑芥暟 + private void calcNodeLayoutSize(List<Algorithm> algorithmList, + 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.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); + node.setCellNumX(LAYOUT_CELL_NUM_NODE_X); + node.setCellNumY(LAYOUT_CELL_NUM_NODE_Y); + + // 2. 璁剧疆铏氳妭鐐瑰竷灞�淇℃伅 + // 2.1 璁剧疆铏氳妭鐐瑰唴鍚勮繍绠楀璞$殑甯冨眬淇℃伅 + String[] computerNodeListStr = algo.getComputerList().split(","); + 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); + } + } + // 2.2 璁剧疆铏氳妭鐐规�荤殑甯冨眬淇℃伅鍒拌繍绠楄妭鐐逛腑 + setVnodeLayoutNum(computerNodeListStr, modelNodeAndVnodeList, node, algo); + } + } + + private void setVnodeLayoutNum(String[] computerNodeListStr, + List<ModelNode> modelNodeAndVnodeList, + ModelNode vnode, + Algorithm algo) { + int numX = 0; + int numY = 0; + // 1. 璁$畻涓层�佸苟銆佹梺鑱斻�佽〃鍐� + for (String nodeStr : computerNodeListStr) { + ModelNode childNode = modelNodeAndVnodeList.stream().filter(item -> + 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; + break; + case OPE_TYPE_PARALLEL: + case OPE_TYPE_SWITCH: + case OPE_TYPE_VOTE: + numX = childNode.getCellNumX() > numX ? childNode.getCellNumX() : numX; + numY += childNode.getCellNumY(); + 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(); + numX += vnode.getCellNumX(); + } + // 2. 璁$畻妗ヨ仈 + if (OPE_TYPE_BRIDGE.equals(algo.getAlgorithmType())) { + // 妗ヨ仈鏀矾绠椾竴琛岋紝鏁翠釜妗ヨ仈鍏�3琛� + // 2.1 璁$畻绗竴琛� + ModelNode node1 = modelNodeAndVnodeList.stream().filter(item -> + computerNodeListStr[0].equals(item.getId().toString())).collect(Collectors.toList()).get(0); + ModelNode node2 = modelNodeAndVnodeList.stream().filter(item -> + computerNodeListStr[1].equals(item.getId().toString())).collect(Collectors.toList()).get(0); + ModelNode node3 = modelNodeAndVnodeList.stream().filter(item -> + computerNodeListStr[2].equals(item.getId().toString())).collect(Collectors.toList()).get(0); + ModelNode node4 = modelNodeAndVnodeList.stream().filter(item -> + computerNodeListStr[3].equals(item.getId().toString())).collect(Collectors.toList()).get(0); + ModelNode node5 = modelNodeAndVnodeList.stream().filter(item -> + computerNodeListStr[4].equals(item.getId().toString())).collect(Collectors.toList()).get(0); + int numX1 = node1.getCellNumX() + node2.getCellNumX(); + int numY1 = node1.getCellNumY() > node2.getCellNumY() ? node1.getCellNumY() : node2.getCellNumY(); + // 2.2 璁$畻绗簩琛岋紙妗ヨ仈鏀矾锛屾í鍚戠敾鍥撅級 + int numX2 = node3.getCellNumX(); + int numY2 = node3.getCellNumY(); + // 2.3 璁$畻绗笁琛� + int numX3 = node4.getCellNumX() + node5.getCellNumX(); + 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(); + numX += vnode.getCellNumX(); + } + vnode.setVnodeCellNumX(numX); + vnode.setVnodeCellNumY(numY); } @Transactional(rollbackFor = Exception.class) @@ -1114,6 +1597,14 @@ 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())) { + modelNode.setPairStartNodeId(jsonValue.toString()); + } + jsonValue = JsonUtils2.getJsonValueByPath(jsonObject, "data/endNodeId".split("/")); + if (jsonValue!=null && StringUtils.isNotBlank(jsonValue.toString())) { + modelNode.setPairEndNodeId(jsonValue.toString()); + } if ("node".equals(modelNode.getNodeType())) { ProductImg productImg = new ProductImg(); String dataId = JsonUtils2.getJsonValueByPath(jsonObject, "data/dataId".split("/")).toString(); -- Gitblit v1.9.1