From 2acd428a1254175dbf6f0cdb1bdb9772a4f4f938 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 19 六月 2023 17:33:18 +0800
Subject: [PATCH] 提升机状态6，8迁移小车问题
---
src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
index e736217..d56f972 100644
--- a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
@@ -84,7 +84,7 @@
/**
* 鐢垫睜娓╁害
*/
- private Short batteryTemp;
+ private Integer batteryTemp;
/**
* 閿欒缂栧彿
@@ -149,7 +149,7 @@
/**
* 褰撳墠鐨勭數鍘嬪��
*/
- private Short currentVoltage;
+ private Integer currentVoltage;
/**
* 褰撳墠鐨勬ā鎷熼噺鍊�
@@ -246,6 +246,9 @@
// 鐢甸噺
try {
Integer chargeLine = SpringUtils.getBean(BasShuttleService.class).selectById(this.shuttleNo).getChargeLine();
+ if (chargeLine == null) {
+ return false;
+ }
return this.getBatteryPower$() > chargeLine;
} catch (Exception e) {
News.error("fail", e);
--
Gitblit v1.9.1