From 69e6f6676387b30a31b8186f55b3e8d921533c18 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 23 九月 2025 09:05:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/NyShuttleThread.java | 40 +++++++++++++++++++++++++++++++---------
1 files changed, 31 insertions(+), 9 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..5e2e26c 100644
--- a/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
@@ -58,6 +58,7 @@
private List<JSONObject> socketReadResults = new ArrayList<>();
private List<DeviceMsgModel> socketResults = new ArrayList<>();
+ private Long requestReadTime = System.currentTimeMillis();
//鍘熷璁惧鏁版嵁
private Object originDeviceData;
@@ -199,7 +200,10 @@
//鎸囦护瓒呰繃2鏉★紝涓嶅啀涓嬪彂浠诲姟鐘舵�佽姹�
TreeSet<String> deviceCommandMsgListKey = deviceMsgUtils.getDeviceCommandMsgListKey(SlaveType.Shuttle, deviceConfig.getDeviceNo());
if (deviceCommandMsgListKey.size() < 2) {
- requestCommand(readStatusCommand);//璇锋眰鐘舵��
+ if ((System.currentTimeMillis() - requestReadTime) > 500) {
+ requestCommand(readStatusCommand);//璇锋眰鐘舵��
+ requestReadTime = System.currentTimeMillis();
+ }
}
if (this.socketReadResults.isEmpty()) {
@@ -577,7 +581,7 @@
}
@Override
- public boolean isRequireCharge() {
+ public ShuttleRequireChargeType isRequireCharge() {
if (this.shuttleProtocol.getDeviceStatus() == null
|| this.shuttleProtocol.getPakMk() == null
|| this.shuttleProtocol.getErrorCode() == null
@@ -585,7 +589,7 @@
|| this.shuttleProtocol.getMode() == null
|| this.shuttleProtocol.getExtend() == null
) {
- return false;
+ return ShuttleRequireChargeType.NONE;
}
InnerSuhttleExtend extend = (InnerSuhttleExtend) this.shuttleProtocol.getExtend();
@@ -598,25 +602,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