From de9b877fb32bddd750fff1d7059edc2a81f3f5f2 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 01 八月 2023 16:53:42 +0800
Subject: [PATCH] pak
---
src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java | 62 ++++++++++++++++++++++++++++++
1 files changed, 61 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java b/src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java
index 7169ca8..27cb465 100644
--- a/src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.core.common.SpringUtils;
+import com.zy.asrs.entity.BasShuttle;
import com.zy.asrs.service.BasShuttleService;
import com.zy.common.utils.NavigatePositionConvert;
import com.zy.core.News;
@@ -55,6 +56,11 @@
* 鐩爣搴撲綅
*/
private String locNo;
+
+ /**
+ * 灏忚溅褰撳墠搴撲綅鍙�
+ */
+ private String currentLocNo;
/**
* 浣滀笟鏍囪
@@ -371,7 +377,7 @@
if (this.getPoint() == null) {
return "";
}
- return NavigatePositionConvert.xyzToLocNo(this.getPoint().getX(), this.getPoint().getY(), this.getPoint().getZ());
+ return NavigatePositionConvert.nyXyzToLocNo(this.getPoint().getX(), this.getPoint().getY(), this.getPoint().getZ());
}
public String getCoord$() {
@@ -379,6 +385,12 @@
return "";
}
return JSON.toJSONString(this.getCoord());
+ }
+
+ public void setPoint(NyShuttlePointClass point) {
+ String locNo = NavigatePositionConvert.nyXyzToLocNo(point.getX(), point.getY(), point.getZ());
+ this.point = point;
+ this.currentLocNo = locNo;
}
// 鏄惁澶勪簬绌洪棽寰呭懡鐘舵��
@@ -428,4 +440,52 @@
}
}
+ // 鏄惁澶勪簬绌洪棽寰呭懡鐘舵��
+ public Boolean isIdleNoCharge() {
+ boolean res = this.free == ShuttleStatusType.IDLE.id
+ && this.pakMk.equals(true)
+ && this.errState == 0
+ && this.taskNo == 0
+ && this.protocolStatus == ShuttleProtocolStatusType.IDLE.id
+ ;
+ return res;
+ }
+
+ // 鏄惁婊¤冻鍏呯數鐘舵��
+ public Boolean isRequireCharge() {
+ if (this.free == null || this.pakMk == null || this.errState == null || this.taskNo == null) {
+ return false;
+ }
+
+ boolean res = this.free == ShuttleStatusType.IDLE.id
+ && this.pakMk
+ && this.errState == 0
+ && this.taskNo == 0
+ && this.protocolStatusType.id == ShuttleProtocolStatusType.IDLE.id
+ ;
+ if (!res) {
+ return res;
+ } else {
+ // 鐢甸噺灏忎簬闃堝�兼垨鏈�浣庣數鑺數鍘嬪皬浜�2900mv锛岄渶瑕佽繘琛屽厖鐢�
+ try {
+ BasShuttleService shuttleService = SpringUtils.getBean(BasShuttleService.class);
+ if (shuttleService == null) {
+ return false;
+
+ }
+ BasShuttle basShuttle = shuttleService.selectById(this.shuttleNo);
+ if (basShuttle == null) {
+ return false;
+ }
+ Integer chargeLine = basShuttle.getChargeLine();
+ if (chargeLine == null) {
+ return false;
+ }
+ return this.getPowerPercent() < chargeLine || this.minCellVoltage < 2900;
+ } catch (Exception e) {
+ News.error("fail", e);
+ return false;
+ }
+ }
+ }
}
--
Gitblit v1.9.1