From 23f50c066cce98a8bf9b0d80daf4ec70d6a582d4 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期五, 17 二月 2023 15:23:55 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/SteProtocol.java | 204 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 193 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/SteProtocol.java b/src/main/java/com/zy/core/model/protocol/SteProtocol.java
index cab04bd..10e9009 100644
--- a/src/main/java/com/zy/core/model/protocol/SteProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/SteProtocol.java
@@ -1,15 +1,20 @@
package com.zy.core.model.protocol;
import com.core.common.Cools;
+import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasSte;
+import com.zy.asrs.service.BasSteService;
+import com.zy.core.News;
import com.zy.core.enums.SteHisTaskStatusType;
import com.zy.core.enums.SteLocaType;
import com.zy.core.enums.SteStatusType;
import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
/**
* Created by vincent on 2020/8/7
*/
+@Slf4j
@Data
public class SteProtocol {
@@ -65,6 +70,12 @@
* 鐢垫睜鐢甸噺
*/
public Float charge = 0.0F;
+
+ public void setCharge(Float charge) {
+ if (charge >= 0) {
+ this.charge = charge;
+ }
+ }
/**
* 婊＄數
@@ -181,6 +192,152 @@
*/
public Short crnAllowRun;
+ /**
+ * 鍏呯數鐘舵�� 1锛氬湪鍏呯數锛�0锛氫笉鍦ㄥ厖鐢�
+ */
+ private Short chargeStatus;
+
+ // 鍏ュ簱鍙栫┖
+ private Boolean inEmpty;
+
+ // 鍑哄簱鍙栫┖
+ private Boolean outEmpty;
+
+ // 绌挎杞﹀紓甯� ------------------------------------------------------------------------
+
+ /**
+ * 1.鍗囬檷瓒呮椂鎶ヨ
+ */
+ private boolean liftErr;
+
+ /**
+ * 3.鍏ュ簱鍙栫┖鎶ヨ
+ */
+ private boolean inFetchErr;
+
+ /**
+ * 4.鍑哄簱鍙栫┖鎶ヨ
+ */
+ private boolean outFetchErr;
+
+ /**
+ * 5.闃叉挒淇濇姢
+ */
+ private boolean antiErr;
+
+ /**
+ * 6.鍗囬檷鎺ヨ繎寮�鍏虫晠闅�
+ */
+ private boolean liftSwitchErr;
+
+ /**
+ * 7.杞ㄩ亾妫�娴嬫姤璀�
+ */
+ private boolean trackErr;
+
+ /**
+ * 8.璁惧杩愯瓒呮椂鎶ヨ
+ */
+ private boolean timeoutErr;
+
+ /**
+ * 9.閫氫俊閿欒鎶ヨ
+ */
+ private boolean connectErr;
+
+ /**
+ * 10.璁惧鎬ュ仠
+ */
+ private boolean emergencyErr;
+
+ /**
+ * 11.浠诲姟绫诲瀷缂哄け
+ */
+ private boolean taskTypeErr;
+
+ /**
+ * 12.浠诲姟鍙风己澶�
+ */
+ private boolean taskNoErr;
+
+ /**
+ * 13.杩愯涓湁鏂颁换鍔�
+ */
+ private boolean newTaskErr;
+
+ /**
+ * 14.鏁呴殰涓湁浠诲姟
+ */
+ private boolean errTaskErr;
+
+ /**
+ * 15.杩愯涓仠姝�
+ */
+ private boolean stopErr;
+
+ /**
+ * 16.鑴辨満妯″紡涓嬫湁浠诲姟
+ */
+ private boolean offlineTaskErr;
+
+ /**
+ * 17.鏉′欢鏈弧瓒冲惎鍔ㄤ换鍔�
+ */
+ private boolean startTaskErr;
+
+ /**
+ * 18.浣庣數鍘嬫椂鏈変换鍔�
+ */
+ private boolean voltageTaskErr;
+
+ /**
+ * 64.璁惧鏁呴殰鏍囧織浣�
+ */
+ private boolean devpErr;
+ // 绌挎杞﹀紓甯� ------------------------------------------------------------------------
+
+ // 绌挎杞︽彁绀轰俊鎭� ------------------------------------------------------------------------
+ /**
+ * 65.鑱旀満鐘舵��
+ */
+ private boolean online;
+
+ /**
+ * 66.涓嶅湪杞ㄩ亾涓�
+ */
+ private boolean notOnTrack;
+
+ /**
+ * 67.浣庣數閲忔彁閱�
+ */
+ private boolean lowVoltage;
+
+ /**
+ * 68.浜忕數涓�
+ */
+ private boolean electricityLoss;
+
+ /**
+ * 69.寮哄埗琛岃蛋鍚姩
+ */
+ private boolean forcedTravel;
+
+ /**
+ * 70.婕旂ず妯″紡寮�鍚�
+ */
+ private boolean demoMode;
+
+ /**
+ * 71.鍏呯數鍒峰凡鎺ラ��
+ */
+ private boolean brushConnect;
+
+// /**
+// * 71.鍏呯數鍒峰凡鎺ラ��
+// */
+// private boolean brushConnect;
+
+
public void setStatus(Short status){
this.status = status;
this.statusType = SteStatusType.get(status);
@@ -225,23 +382,41 @@
basSte.setSteErr(alarm.longValue());
}
basSte.setWrkNo(taskNo.intValue());
- if (!Cools.isEmpty(row)) {
- basSte.setRow(row.intValue());
- }
- if (!Cools.isEmpty(bay)) {
- basSte.setBay(bay.intValue());
- }
- if (!Cools.isEmpty(lev)) {
- basSte.setLev(lev.intValue());
- }
+// if (basSte.getPakMk().equals("N")) {
+// if (!Cools.isEmpty(row)) {
+// basSte.setRow(row.intValue());
+// }
+// if (!Cools.isEmpty(bay)) {
+// basSte.setBay(bay.intValue());
+// }
+// if (!Cools.isEmpty(lev)) {
+// basSte.setLev(lev.intValue());
+// }
+// }
return basSte;
}
// 鏄惁澶勪簬绌洪棽寰呭懡鐘舵��
public Boolean isIdle() {
- return this.statusType.equals(SteStatusType.IDLE)
+ boolean res = this.statusType.equals(SteStatusType.IDLE)
+ && this.mode == 1
&& this.pakMk.equals("N")
- && !isAlarm();
+ && !isAlarm()
+ && this.chargeStatus == 0
+ && isEnable()
+ ;
+ if (!res) {
+ return res;
+ } else {
+ // 鐢甸噺
+ try {
+ String chargeLine = SpringUtils.getBean(BasSteService.class).selectById(this.steNo).getChargeLine();
+ return charge > Float.parseFloat(chargeLine);
+ } catch (Exception e) {
+ News.error("fail", e);
+ return false;
+ }
+ }
}
// 鏄惁澶勪簬鎶ヨ鐘舵��
@@ -249,4 +424,11 @@
return this.alarm > 1;
}
+ public Boolean isEnable() {
+ if (Cools.isEmpty(row, bay, lev)) {
+ return false;
+ }
+ return row > 0 && bay > 0 && lev > 0;
+ }
+
}
--
Gitblit v1.9.1