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 |   32 +++++++++++++++++++++++++-------
 src/main/resources/mapper/DeviceConfigMapper.xml              |    1 +
 src/main/webapp/views/admin/deviceConfig/deviceConfig.html    |    6 ++++++
 src/main/java/com/zy/asrs/entity/DeviceConfig.java            |    7 +++++++
 src/main/webapp/static/js/deviceConfig/deviceConfig.js        |    1 +
 5 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/DeviceConfig.java b/src/main/java/com/zy/asrs/entity/DeviceConfig.java
index 2dd2f1e..fe103c6 100644
--- a/src/main/java/com/zy/asrs/entity/DeviceConfig.java
+++ b/src/main/java/com/zy/asrs/entity/DeviceConfig.java
@@ -70,6 +70,13 @@
     @TableField("fake")
     private Integer fake;
 
+    /**
+     * 铏氭嫙璁惧鍒濆鍖栬澶囩姸鎬�
+     */
+    @ApiModelProperty(value= "铏氭嫙璁惧鍒濆鍖栬澶囩姸鎬�")
+    @TableField("fake_init_status")
+    private String fakeInitStatus;
+
     public DeviceConfig() {}
 
     public DeviceConfig(String ip,Integer port,String threadImpl,Date createTime,String deviceType,Integer deviceNo) {
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 b785a03..a4bf8e0 100644
--- a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
@@ -217,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)) {
@@ -228,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;
@@ -247,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;
         }
@@ -260,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 "";
         }
@@ -339,12 +354,15 @@
 
     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;
         }
 
diff --git a/src/main/resources/mapper/DeviceConfigMapper.xml b/src/main/resources/mapper/DeviceConfigMapper.xml
index 4f4e054..a7ca89e 100644
--- a/src/main/resources/mapper/DeviceConfigMapper.xml
+++ b/src/main/resources/mapper/DeviceConfigMapper.xml
@@ -12,6 +12,7 @@
         <result column="device_type" property="deviceType" />
         <result column="device_no" property="deviceNo" />
         <result column="fake" property="fake" />
+        <result column="fake_init_status" property="fakeInitStatus" />
 
     </resultMap>
 
diff --git a/src/main/webapp/static/js/deviceConfig/deviceConfig.js b/src/main/webapp/static/js/deviceConfig/deviceConfig.js
index 3caa19d..e514c91 100644
--- a/src/main/webapp/static/js/deviceConfig/deviceConfig.js
+++ b/src/main/webapp/static/js/deviceConfig/deviceConfig.js
@@ -28,6 +28,7 @@
             ,{field: 'port', align: 'center',title: '璁惧绔彛'}
             ,{field: 'threadImpl', align: 'center',title: '瀹炵幇绫�'}
             ,{field: 'fake$', align: 'center',title: '铏氭嫙璁惧'}
+            ,{field: 'fakeInitStatus', align: 'center',title: '铏氭嫙璁惧鍒濆鍖栬澶囩姸鎬�'}
             ,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿'}
 
             ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
diff --git a/src/main/webapp/views/admin/deviceConfig/deviceConfig.html b/src/main/webapp/views/admin/deviceConfig/deviceConfig.html
index 22e3d2c..e636e18 100644
--- a/src/main/webapp/views/admin/deviceConfig/deviceConfig.html
+++ b/src/main/webapp/views/admin/deviceConfig/deviceConfig.html
@@ -112,6 +112,12 @@
                         </select>
                     </div>
                 </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">铏氭嫙璁惧鍒濆鍖栬澶囩姸鎬�: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="fakeInitStatus" placeholder="璇疯緭鍏ヨ櫄鎷熻澶囧垵濮嬪寲璁惧鐘舵��">
+                    </div>
+                </div>
 
              </div>
         </div>

--
Gitblit v1.9.1