From efbd157c0d810c39d04cd86752e769a3f3a1a1fc Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 11 九月 2025 16:57:03 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/NyShuttleThread.java | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java b/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
index 53fbe7f..e124f84 100644
--- a/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
@@ -577,7 +577,7 @@
}
@Override
- public boolean isRequireCharge() {
+ public ShuttleRequireChargeType isRequireCharge() {
if (this.shuttleProtocol.getDeviceStatus() == null
|| this.shuttleProtocol.getPakMk() == null
|| this.shuttleProtocol.getErrorCode() == null
@@ -585,7 +585,7 @@
|| this.shuttleProtocol.getMode() == null
|| this.shuttleProtocol.getExtend() == null
) {
- return false;
+ return ShuttleRequireChargeType.NONE;
}
InnerSuhttleExtend extend = (InnerSuhttleExtend) this.shuttleProtocol.getExtend();
@@ -598,25 +598,43 @@
&& extend.getSuspendState() == 0
;
if (!res) {
- return res;
+ return ShuttleRequireChargeType.NONE;
} else {
// 鐢甸噺灏忎簬闃堝�奸渶瑕佽繘琛屽厖鐢�
try {
BasShuttleService shuttleService = SpringUtils.getBean(BasShuttleService.class);
if (shuttleService == null) {
- return false;
+ return ShuttleRequireChargeType.NONE;
}
+
BasShuttle basShuttle = shuttleService.selectOne(new EntityWrapper<BasShuttle>().eq("shuttle_no", deviceConfig.getDeviceNo()));
if (basShuttle == null) {
- return false;
+ return ShuttleRequireChargeType.NONE;
}
+
Integer chargeLine = basShuttle.getChargeLine();
if (chargeLine == null) {
- return false;
+ return ShuttleRequireChargeType.NONE;
}
- return Integer.valueOf(this.shuttleProtocol.getBatteryPower()) < chargeLine;
+
+ boolean chargeResult = Integer.valueOf(this.shuttleProtocol.getBatteryPower()) < chargeLine;
+ if (chargeResult) {
+ return ShuttleRequireChargeType.FORCE_CHARGE;//闇�瑕佸己鍒跺厖鐢�
+ }
+
+ Integer suggestChargeLine = basShuttle.getSuggestChargeLine();
+ if (suggestChargeLine == null) {
+ return ShuttleRequireChargeType.NONE;
+ }
+
+ boolean suggestChargeResult = Integer.valueOf(this.shuttleProtocol.getBatteryPower()) < suggestChargeLine;
+ if (suggestChargeResult) {
+ return ShuttleRequireChargeType.SUGGEST_CHARGE;//寤鸿鍏呯數
+ }
+
+ return ShuttleRequireChargeType.NONE;
} catch (Exception e) {
- return false;
+ return ShuttleRequireChargeType.NONE;
}
}
}
--
Gitblit v1.9.1