From ea9b2ddb6c523088b4800337478ffa0bac880766 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 26 十月 2023 15:50:03 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java | 43 +++++++++++++++++++++++++++++++------------
1 files changed, 31 insertions(+), 12 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..bcbc38e 100644
--- a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
@@ -2,6 +2,7 @@
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.BasShuttle;
import com.zy.asrs.entity.BasShuttleErr;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.service.BasDevpService;
@@ -84,7 +85,7 @@
/**
* 鐢垫睜娓╁害
*/
- private Short batteryTemp;
+ private Integer batteryTemp;
/**
* 閿欒缂栧彿
@@ -127,7 +128,7 @@
private Short statusErrorCode;
/**
- * PLC杈撳叆鐘舵��
+ * PLC杈撳叆鐘舵�侊紝鐩墠鍙湁涓�涓姸鎬佹湁鏁堟灉锛屾墭鐩橀浄杈�1鏈夎揣锛�0鏃犺揣
*/
private Short plcInputStatus;
@@ -149,7 +150,7 @@
/**
* 褰撳墠鐨勭數鍘嬪��
*/
- private Short currentVoltage;
+ private Integer currentVoltage;
/**
* 褰撳墠鐨勬ā鎷熼噺鍊�
@@ -183,7 +184,7 @@
public void setBusyStatus(Short status) {
this.busyStatus = status;
- this.busyStatusType = ShuttleStatusType.get(status);
+ this.busyStatusType = ShuttleStatusType.get(status.intValue());
}
public void setBusyStatus(ShuttleStatusType type) {
@@ -239,6 +240,7 @@
&& this.pakMk.equals(true)
&& this.errorCodeType.equals(ShuttleErrorCodeType.NORMAL)
&& this.taskNo == 0
+ && this.protocolStatus.intValue() == ShuttleProtocolStatusType.IDLE.id
;
if (!res) {
return res;
@@ -246,7 +248,10 @@
// 鐢甸噺
try {
Integer chargeLine = SpringUtils.getBean(BasShuttleService.class).selectById(this.shuttleNo).getChargeLine();
- return this.getBatteryPower$() > chargeLine;
+ if (chargeLine == null) {
+ return false;
+ }
+ return this.getBatteryPower$() >= chargeLine;
} catch (Exception e) {
News.error("fail", e);
return false;
@@ -259,7 +264,8 @@
boolean res = this.busyStatusType.equals(ShuttleStatusType.IDLE)
&& this.pakMk.equals(true)
&& this.errorCodeType.equals(ShuttleErrorCodeType.NORMAL)
- && (this.taskNo == 0 || this.taskNo == taskNo)
+ && (this.taskNo == 0 || this.taskNo.intValue() == taskNo.intValue())
+ && this.protocolStatus.intValue() == ShuttleProtocolStatusType.IDLE.id
;
if (!res) {
return res;
@@ -281,18 +287,31 @@
return false;
}
- boolean res = this.busyStatusType.equals(ShuttleStatusType.IDLE)
- && this.pakMk.equals(true)
- && this.errorCodeType.equals(ShuttleErrorCodeType.NORMAL)
+ boolean res = this.busyStatusType.id.intValue() == ShuttleStatusType.IDLE.id.intValue()
+ && this.pakMk
+ && this.errorCodeType.id.intValue() == ShuttleErrorCodeType.NORMAL.id.intValue()
&& this.taskNo == 0
+ && this.protocolStatusType.id == ShuttleProtocolStatusType.IDLE.id
;
if (!res) {
return res;
} else {
// 鐢甸噺灏忎簬闃堝�兼垨鐢靛帇灏忎簬48V锛岄渶瑕佽繘琛屽厖鐢�
try {
- Integer chargeLine = SpringUtils.getBean(BasShuttleService.class).selectById(this.shuttleNo).getChargeLine();
- return this.getBatteryPower$() < chargeLine || this.currentVoltage < 480;
+ 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.getBatteryPower$() < chargeLine || this.currentVoltage < 48000;
} catch (Exception e) {
News.error("fail", e);
return false;
@@ -318,7 +337,7 @@
BasShuttleErrService basShuttleErrService = SpringUtils.getBean(BasShuttleErrService.class);
BasShuttleErr basShuttleErr = basShuttleErrService.queryByCode(this.statusErrorCode.intValue());
if (basShuttleErr == null) {
- return null;
+ return this.statusErrorCode.toString();
}
return basShuttleErr.getErrName();
}
--
Gitblit v1.9.1