From b6428016edf3de843020bc95fd1708d3bb1961e5 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 07 七月 2025 16:41:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java | 50 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 43 insertions(+), 7 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 9f7b0bd..a4bf8e0 100644
--- a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
@@ -164,6 +164,11 @@
private Integer yCurrent = 0;
/**
+ * 婕旂ず妯″紡
+ */
+ private Boolean demo = false;
+
+ /**
* 鏃ュ織閲囬泦鏃堕棿
*/
private Long deviceDataLog = System.currentTimeMillis();
@@ -182,6 +187,11 @@
* 鎵╁睍瀛楁
*/
private Object extend;
+
+ /**
+ * 绯荤粺娑堟伅
+ */
+ private String systemMsg;
public String getProtocolStatus$() {
if (this.protocolStatusType == null) {
@@ -207,7 +217,10 @@
}
public Integer getTaskNo() {
- RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
+ RedisUtil redisUtil = null;
+ try {
+ redisUtil = SpringUtils.getBean(RedisUtil.class);
+ }catch (Exception e) {}
if (null != redisUtil) {
Object o = redisUtil.get(RedisKeyType.SHUTTLE_FLAG.key + this.shuttleNo);
if (!Cools.isEmpty(o)) {
@@ -218,7 +231,10 @@
}
public synchronized void setSyncTaskNo(Integer taskNo) {
- RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
+ RedisUtil redisUtil = null;
+ try {
+ redisUtil = SpringUtils.getBean(RedisUtil.class);
+ }catch (Exception e) {}
if (null != redisUtil) {
redisUtil.set(RedisKeyType.SHUTTLE_FLAG.key + this.shuttleNo, taskNo);
this.taskNo = taskNo;
@@ -237,7 +253,10 @@
//閫氳繃褰撳墠浜岀淮鐮佽幏鍙栧綋鍓嶅簱浣嶅彿
public String getCurrentLocNo() {
- LocMastService locMastService = SpringUtils.getBean(LocMastService.class);
+ LocMastService locMastService = null;
+ try {
+ locMastService = SpringUtils.getBean(LocMastService.class);
+ }catch (Exception e) {}
if (locMastService == null) {
return null;
}
@@ -250,7 +269,13 @@
}
public String getStatusErrorCode$() {
- BasShuttleErrService basShuttleErrService = SpringUtils.getBean(BasShuttleErrService.class);
+ BasShuttleErrService basShuttleErrService = null;
+ try {
+ basShuttleErrService = SpringUtils.getBean(BasShuttleErrService.class);
+ }catch (Exception e) {}
+ if (basShuttleErrService == null) {
+ return "";
+ }
if (this.errorCode == null) {
return "";
}
@@ -319,14 +344,25 @@
return this.pakMk ? "Y" : "N";
}
+ public String getDemo$() {
+ if (this.demo == null) {
+ return "";
+ }
+
+ return this.demo ? "Y" : "N";
+ }
+
public HashMap<String, Object> getPoint() {
HashMap<String, Object> map = new HashMap<>();
- if (this.currentCode == null) {
+ LocMastService locMastService = null;
+ try {
+ locMastService = SpringUtils.getBean(LocMastService.class);
+ }catch (Exception e) {}
+ if (locMastService == null) {
return map;
}
- LocMastService locMastService = SpringUtils.getBean(LocMastService.class);
- if (locMastService == null) {
+ if (this.currentCode == null) {
return map;
}
--
Gitblit v1.9.1