From 69e1880e5486ebc62da4806642ca817afda9c84c Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 05 十月 2023 14:09:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/NyShuttleThread.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/NyShuttleThread.java b/src/main/java/com/zy/core/thread/NyShuttleThread.java
index 26fb927..1ba299f 100644
--- a/src/main/java/com/zy/core/thread/NyShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/NyShuttleThread.java
@@ -336,6 +336,7 @@
);
opt.setSend(1);//宸蹭笅鍙�
opt.setResponse(JSON.toJSONString(result));//璇锋眰鍝嶅簲
+ opt.setDeviceWrk(command.getWrkNo().toString());//璁惧宸ヤ綔鍙�
shuttleOptService.insert(opt);
}
@@ -446,8 +447,9 @@
}
if (shuttleProtocol.getFree() == ShuttleStatusType.BUSY.id) {
- //鍋滄鍏呯數
- if(!(command.getRequest().getBody().get("requestType").equals("stopCharge") && shuttleProtocol.getChargState() == 1)){
+ String requestType = command.getRequest().getBody().get("requestType").toString();
+ //鍋滄鍏呯數 绠″埗鍛戒护
+ if(!(requestType.equals("stopCharge") && shuttleProtocol.getChargState() == 1) && !requestType.equals("resume")){
return false;//灏忚溅鐘舵�佸繖锛岀姝㈡墽琛屽懡浠�
}
}
--
Gitblit v1.9.1