From 42655cbb3b63d6af964c5350035e6db3ea9fadd5 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期四, 14 三月 2024 08:57:51 +0800
Subject: [PATCH] 优化RBD识别算法：并联、旁联的节点顺序
---
modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/service/ModelLineService.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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 4239686..f6fe271 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
@@ -558,8 +558,11 @@
vnode.setPicId(id.toString());
vnode.setModelId(modelId);
vnode.setNodeType("vnode");
- vnode.setPositionX(startNode.getPositionX());
- vnode.setPositionY(startNode.getPositionY());
+ // 浣嶇疆璁剧疆涓哄苟鑱斾腑绗竴涓妭鐐圭殑浣嶇疆
+ vnode.setPositionX(branchNodeList.get(0).getPositionX());
+ vnode.setPositionY(branchNodeList.get(0).getPositionY());
+// vnode.setPositionX(startNode.getPositionX());
+// vnode.setPositionY(startNode.getPositionY());
modelNodeList.add(vnode);
modelNodeAndVnodeList.add(vnode);
ModelLine modelLineNew = new ModelLine();
@@ -750,8 +753,11 @@
vnode.setPicId(id.toString());
vnode.setModelId(modelId);
vnode.setNodeType("vnode");
- vnode.setPositionX(startNode.getPositionX());
- vnode.setPositionY(startNode.getPositionY());
+ // 灏嗕綅缃缃负绗竴涓垎鏀殑
+ vnode.setPositionX(node2.getPositionX());
+ vnode.setPositionY(node2.getPositionY());
+// vnode.setPositionX(startNode.getPositionX());
+// vnode.setPositionY(startNode.getPositionY());
modelNodeList.add(vnode);
modelNodeAndVnodeList.add(vnode);
ModelLine modelLineNew = new ModelLine();
--
Gitblit v1.9.1