From 27ad7e7930c7e7d2c785dc321b4a30935442b352 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期二, 17 十二月 2024 17:00:57 +0800 Subject: [PATCH] # --- zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/NavigateNode.java | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/NavigateNode.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/NavigateNode.java index 7f0c943..a27e0d9 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/NavigateNode.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/NavigateNode.java @@ -3,6 +3,7 @@ import lombok.Data; import java.io.Serializable; +import java.util.Objects; import java.util.Optional; /** @@ -26,6 +27,7 @@ private String direction; //琛岃蛋鏂瑰悜 private Integer lastDistance; // 璺濈涓婁釜鑺傜偣璺濈 private Integer moveDistance; // 鎬昏璧拌窛绂� + private Integer weight; // G 鏉冮噸 private String codeData; @@ -46,7 +48,9 @@ this.parent = father; if (this.parent != null) { //璧拌繃鐨勬鏁扮瓑浜庣埗鑺傜偣璧拌繃鐨勬鏁板姞涓� - this.G = father.G + Optional.ofNullable(this.lastDistance).orElse(0); + this.G = father.G + + Optional.ofNullable(this.lastDistance).orElse(0) + + Optional.ofNullable(this.weight).orElse(0); } else { //鐖惰妭鐐逛负绌轰唬琛ㄥ畠鏄涓�涓粨鐐� this.G = 0; } @@ -71,4 +75,18 @@ } return null; } + + @Override + public boolean equals(Object obj) { + if (this == obj) return true; + if (!(obj instanceof NavigateNode)) return false; + NavigateNode that = (NavigateNode) obj; + return this.x == that.x && this.y == that.y; + } + + @Override + public int hashCode() { + return Objects.hash(x, y); + } + } -- Gitblit v1.9.1