From d5d7f24188f19f5d5c50f1d2e5cd6e49ba61edcc Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 10 五月 2023 09:54:51 +0800
Subject: [PATCH] 穿梭车redis存储前缀

---
 src/main/java/com/zy/core/thread/ShuttleThread.java |  280 +++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 215 insertions(+), 65 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/ShuttleThread.java b/src/main/java/com/zy/core/thread/ShuttleThread.java
index a970778..b743dcc 100644
--- a/src/main/java/com/zy/core/thread/ShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/ShuttleThread.java
@@ -8,9 +8,11 @@
 import com.core.common.DateUtils;
 import com.core.common.SpringUtils;
 import com.core.exception.CoolException;
+import com.zy.asrs.entity.BasDevp;
 import com.zy.asrs.entity.BasShuttle;
 import com.zy.asrs.entity.BasShuttleOpt;
 import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.service.BasDevpService;
 import com.zy.asrs.service.BasShuttleOptService;
 import com.zy.asrs.service.BasShuttleService;
 import com.zy.asrs.service.LocMastService;
@@ -27,8 +29,8 @@
 import com.zy.core.enums.*;
 import com.zy.core.model.ShuttleSlave;
 import com.zy.core.model.Task;
-import com.zy.core.model.command.ShuttleAssignCommand;
-import com.zy.core.model.command.ShuttleCommand;
+import com.zy.core.model.command.*;
+import com.zy.core.model.protocol.LiftProtocol;
 import com.zy.core.model.protocol.ShuttleProtocol;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
@@ -36,7 +38,6 @@
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -177,25 +178,36 @@
 
                 if (shuttleProtocol.getErrorCode() != 0 && shuttleProtocol.getProtocolStatusType() == ShuttleProtocolStatusType.WORKING) {
                     //鍑虹幇閿欒
-                    reset(shuttleProtocol.getAssignCommand());
+                    resetAndTryFix(shuttleProtocol.getTaskNo());
                 }
 
                 if(shuttleProtocol.getProtocolStatusType() == ShuttleProtocolStatusType.FIXING
                         && shuttleProtocol.getTaskNo() != 0
-                        && shuttleProtocol.getBusyStatusType() == ShuttleStatusType.IDLE
-                        && shuttleProtocol.getAssignCommand() != null){
+                        && shuttleProtocol.getBusyStatusType() == ShuttleStatusType.IDLE){
                     //澶勪簬鏁呴殰淇鐘舵��
                     //鎵ц涓嬩竴姝ユ寚浠�
-                    executeWork(shuttleProtocol.getAssignCommand());
+                    executeWork(shuttleProtocol.getTaskNo());
                 }
 
                 //鍥涘悜绌挎杞︾┖闂层�佹湁浠诲姟銆佹爣璁颁负true銆佸瓨鍦ㄤ换鍔℃寚浠わ紝闇�瑕佹墽琛屼换鍔$殑涓嬩竴鏉℃寚浠�
                 if (shuttleProtocol.getBusyStatusType() == ShuttleStatusType.IDLE
                         && shuttleProtocol.getTaskNo() != 0
-                        && shuttleProtocol.getPakMk()
-                        && shuttleProtocol.getAssignCommand() != null) {
+                        && shuttleProtocol.getPakMk()) {
                     //鎵ц涓嬩竴姝ユ寚浠�
-                    executeWork(shuttleProtocol.getAssignCommand());
+                    executeWork(shuttleProtocol.getTaskNo());
+                }
+
+                //妫�娴嬫槸鍚︽湁鎻愬崌鏈洪攣瀹氭爣璁帮紝鏈夊垯妫�娴嬫彁鍗囨満鏄惁鍒颁綅锛屾槸鍚﹁兘璧颁笅涓�姝ュ懡浠�
+                if (shuttleProtocol.getBusyStatusType() == ShuttleStatusType.IDLE
+                        && shuttleProtocol.getTaskNo() != 0) {
+                    Object o = redisUtil.get("shuttle_wrk_no_" + shuttleProtocol.getTaskNo());
+                    if (o != null) {
+                        ShuttleRedisCommand redisCommand = JSON.parseObject(o.toString(), ShuttleRedisCommand.class);
+                        if (redisCommand.getLiftSecurityMk()) {
+                            //鎵ц涓嬩竴姝ユ寚浠�
+                            executeWork(shuttleProtocol.getTaskNo());
+                        }
+                    }
                 }
 
                 //灏嗗洓鍚戠┛姊溅鐘舵�佷繚瀛樿嚦鏁版嵁搴�
@@ -271,6 +283,18 @@
             return false;
         }
 
+        BasShuttleService shuttleService = SpringUtils.getBean(BasShuttleService.class);
+        if (shuttleService == null) {
+            News.error("绯荤粺閿欒");
+            return false;
+        }
+
+        BasShuttle basShuttle = shuttleService.selectById(slave.getId().shortValue());
+        if (basShuttle == null) {
+            News.error("鍥涘悜绌挎杞︿笉瀛樺湪");
+            return false;
+        }
+
         command.setShuttleNo(slave.getId().shortValue());
         // 寮�濮嬩换鍔�
         short[] array = new short[17];
@@ -305,6 +329,7 @@
             array[7] = middleToDistDistances[1];
         }
 
+        array[8] = basShuttle.getRunSpeed().shortValue();//鍥涘悜绌挎杞﹁繍琛岄�熷害锛屼粠绯荤粺鏁版嵁搴撹鍑�
         if (command.getRunDirection() != null) {
             //灏忚溅杩愯鏂瑰悜
             array[8] = command.getRunDirection();
@@ -368,8 +393,6 @@
 
     //鍒嗛厤浠诲姟
     private void assignWork(ShuttleAssignCommand assignCommand) {
-        //灏嗘map瀛樺叆redis涓�
-        HashMap<String, Object> map = new HashMap<>();
         if (!assignCommand.getAuto()) {
             List<ShuttleCommand> commands = new ArrayList<>();
             ShuttleCommand command = new ShuttleCommand();
@@ -605,42 +628,42 @@
             assignCommand.setCommands(commands);
         }
 
-        //鍥涘悜绌挎杞﹀彿
-        map.put("shuttle_no", assignCommand.getShuttleNo());
-        //宸ヤ綔鍙�
-        map.put("wrk_no", assignCommand.getTaskNo());
-        //鍛戒护鎵ц姝ュ簭
-        map.put("commandStep", 0);
-        //鍛戒护
-        map.put("assignCommand", assignCommand);
-        //鍙戠敓閿欒鏃跺皾璇曟墽琛岀殑鎸囦护锛屼紭鍏堢骇鏈�楂�
-        map.put("errorCommands", new ArrayList<ShuttleCommand>());
+        ShuttleRedisCommand redisCommand = new ShuttleRedisCommand();
+        redisCommand.setShuttleNo(assignCommand.getShuttleNo());//鍥涘悜绌挎杞﹀彿
+        redisCommand.setWrkNo(assignCommand.getTaskNo());//宸ヤ綔鍙�
+        redisCommand.setCommandStep(0);//鍛戒护鎵ц姝ュ簭
+        redisCommand.setAssignCommand(assignCommand);//鍛戒护
+        redisCommand.setErrorCommands(new ArrayList<ShuttleCommand>());//鍙戠敓閿欒鏃跺皾璇曟墽琛岀殑鎸囦护锛屼紭鍏堢骇鏈�楂�
         shuttleProtocol.setTaskNo(assignCommand.getTaskNo());
         shuttleProtocol.setAssignCommand(assignCommand);
         shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.WORKING);
         //浠诲姟鏁版嵁淇濆瓨鍒皉edis
-        redisUtil.set("wrk_no_" + assignCommand.getTaskNo(), JSON.toJSONString(map));
+        redisUtil.set("shuttle_wrk_no_" + assignCommand.getTaskNo(), JSON.toJSONString(redisCommand));
         //鎵ц涓嬪彂浠诲姟
-        executeWork(assignCommand);
+        executeWork(assignCommand.getTaskNo());
     }
 
     //鎵ц涓嬪彂鐨勬寚浠�
-    private boolean executeWork(ShuttleAssignCommand assignCommand) {
+    private boolean executeWork(Short wrkNo) {
         //璇诲彇redis鏁版嵁
-        if (assignCommand == null) {
+        if (wrkNo == null) {
+            return false;
+        }
+
+        Object o = redisUtil.get("shuttle_wrk_no_" + wrkNo);
+        if (o == null) {
+            return false;
+        }
+        ShuttleRedisCommand redisCommand = JSON.parseObject(o.toString(), ShuttleRedisCommand.class);
+
+        if (!checkLiftStation(wrkNo)) {//妫�娴嬫槸鍚︽湁鎻愬崌鏈虹珯鐐癸紝鏈夊垯璋冨害鎻愬崌鏈�
             return false;
         }
 
         //灏嗘爣璁扮疆涓篺alse(闃叉閲嶅彂)
         shuttleProtocol.setPakMk(false);
 
-        Object o = redisUtil.get("wrk_no_" + assignCommand.getTaskNo());
-        if (o == null) {
-            return false;
-        }
-        HashMap map = JSON.parseObject(o.toString(), HashMap.class);
-
-        List<ShuttleCommand> errorCommands =  JSON.parseArray(map.get("errorCommands").toString(),ShuttleCommand.class);
+        List<ShuttleCommand> errorCommands = redisCommand.getErrorCommands();
         if (errorCommands.size() > 0) {
             //浼樺厛鎵ц璇ユ寚浠�
             ShuttleCommand errorCommand = errorCommands.get(0);//鍙栧嚭鎸囦护
@@ -652,15 +675,15 @@
                 if (shuttleProtocol.getCurrentCode().equals(errorCommand.getStartCodeNum())) {
                     //璧风偣鍜岀粓鐐瑰睘浜庡悓涓�搴撲綅锛屾棤闇�鍐嶆墽琛岀Щ鍔ㄦ搷浣�
                     errorCommands.remove(0);//绉婚櫎璇ュ懡浠�
-                    map.put("errorCommands", new ArrayList<ShuttleCommand>());
+                    redisCommand.setErrorCommands(new ArrayList<ShuttleCommand>());
                     shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.WORKING);
                     //褰撳墠姝ュ簭
-                    int commandStep = Integer.parseInt(map.get("commandStep").toString());
+                    int commandStep = redisCommand.getCommandStep();
                     //姝ュ簭鍥為��
                     commandStep--;
-                    map.put("commandStep", commandStep);
+                    redisCommand.setCommandStep(commandStep);
                     //浠诲姟鏁版嵁淇濆瓨鍒皉edis
-                    redisUtil.set("wrk_no_" + assignCommand.getTaskNo(), JSON.toJSONString(map));
+                    redisUtil.set("shuttle_wrk_no_" + wrkNo, JSON.toJSONString(redisCommand));
                     shuttleProtocol.setPakMk(true);
                     return true;
                 }else {
@@ -694,10 +717,10 @@
 
                 shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.WORKING);
                 //褰撳墠姝ュ簭
-                int commandStep = Integer.parseInt(map.get("commandStep").toString());
+                int commandStep = redisCommand.getCommandStep();
                 //姝ュ簭鍥為��
                 commandStep--;
-                map.put("commandStep", commandStep);
+                redisCommand.setCommandStep(commandStep);
             }
 
             if (!write(errorCommand)) {
@@ -706,18 +729,19 @@
             } else {
                 News.info("鍥涘悜绌挎杞﹀懡浠や笅鍙戞垚鍔燂紝绌挎杞﹀彿={}锛屼换鍔℃暟鎹�={}", shuttleProtocol.getShuttleNo(), JSON.toJSON(errorCommand));
                 errorCommands.remove(0);
-                map.put("errorCommands", errorCommands);
+                redisCommand.setErrorCommands(errorCommands);
                 //浠诲姟鏁版嵁淇濆瓨鍒皉edis
-                redisUtil.set("wrk_no_" + assignCommand.getTaskNo(), JSON.toJSONString(map));
+                redisUtil.set("shuttle_wrk_no_" + wrkNo, JSON.toJSONString(redisCommand));
                 return true;
             }
         }
 
-        List<ShuttleCommand> commands = assignCommand.getCommands();
+        List<ShuttleCommand> commands = redisCommand.getAssignCommand().getCommands();
         //褰撳墠姝ュ簭
-        int commandStep = Integer.parseInt(map.get("commandStep").toString());
+        int commandStep = redisCommand.getCommandStep();
         //path璺緞鏁扮洰
         int size = commands.size();
+        ShuttleAssignCommand assignCommand = redisCommand.getAssignCommand();
 
         //鍙栧嚭鍛戒护
         ShuttleCommand command = commands.get(commandStep);
@@ -743,9 +767,9 @@
                 //鏇存柊redis鏁版嵁
                 //姝ュ簭澧炲姞
                 commandStep++;
-                map.put("commandStep", commandStep);
+                redisCommand.setCommandStep(commandStep);
                 //浠诲姟鏁版嵁淇濆瓨鍒皉edis
-                redisUtil.set("wrk_no_" + map.get("wrk_no").toString(), JSON.toJSONString(map));
+                redisUtil.set("shuttle_wrk_no_" + redisCommand.getWrkNo(), JSON.toJSONString(redisCommand));
             }else {
                 //宸叉墽琛屽畬鎴�
                 //淇濆瓨鏁版嵁鍒版暟鎹簱鍋氭祦姘�
@@ -765,21 +789,27 @@
                     );
                     shuttleOptService.insert(opt);
                 }
+
+                if (redisCommand.getLiftSecurityMk()) {
+                    //鏇鹃攣瀹氳繃鎻愬崌鏈猴紝闇�瑕佽繘琛岃В閿�
+                    LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, 1);
+                    LiftProtocol liftProtocol = liftThread.getLiftProtocol();
+                    if (liftProtocol != null) {
+                        liftProtocol.setSecurityMk(false);
+                    }
+                }
+
                 //鍒犻櫎redis
-                redisUtil.del("wrk_no_" + map.get("wrk_no").toString());
+                redisUtil.del("shuttle_wrk_no_" + redisCommand.getWrkNo());
 
                 if (!assignCommand.getAuto()) {
                     //鎵嬪姩妯″紡涓嶆姏鍑虹瓑寰呯姸鎬侊紝鐩存帴澶嶄綅
-                    if (assignCommand.getTaskMode() == 9) {
-                        //璁剧疆鍥涘悜绌挎杞︿负绌洪棽鐘舵��
-                        shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.IDLE);
-                        //浠诲姟鍙锋竻闆�
-                        shuttleProtocol.setTaskNo((short) 0);
-                        //鏍囪澶嶄綅
-                        shuttleProtocol.setPakMk(true);
-                        //浠诲姟鎸囦护娓呴浂
-                        shuttleProtocol.setAssignCommand(null);
-                    }
+                    //璁剧疆鍥涘悜绌挎杞︿负绌洪棽鐘舵��
+                    shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.IDLE);
+                    //浠诲姟鍙锋竻闆�
+                    shuttleProtocol.setTaskNo((short) 0);
+                    //鏍囪澶嶄綅
+                    shuttleProtocol.setPakMk(true);
                     News.info("鍥涘悜绌挎杞︽墜鍔ㄤ换鍔℃墽琛屽畬鎴愶紝绌挎杞﹀彿={}锛屼换鍔℃暟鎹�={}", shuttleProtocol.getShuttleNo(), JSON.toJSON(command));
                 }else {
                     if (!assignCommand.getCharge()) {
@@ -798,23 +828,143 @@
     }
 
     /**
-     * 澶嶄綅骞跺皾璇曚慨澶嶉敊璇�
+     * 妫�娴嬫槸鍚︽湁鎻愬崌鏈虹珯鐐癸紝鏈夊垯璋冨害鎻愬崌鏈�
      */
-    private boolean reset(ShuttleAssignCommand assignCommand) {
+    private boolean checkLiftStation(Short wrkNo) {
         //璇诲彇redis鏁版嵁
-        if (assignCommand == null) {
+        if (wrkNo == null) {
             return false;
         }
 
-        Object o = redisUtil.get("wrk_no_" + assignCommand.getTaskNo());
+        Object o = redisUtil.get("shuttle_wrk_no_" + wrkNo);
+        if (o == null) {
+            return false;
+        }
+        ShuttleRedisCommand redisCommand = JSON.parseObject(o.toString(), ShuttleRedisCommand.class);
+        //褰撳墠姝ュ簭
+        int commandStep = redisCommand.getCommandStep();
+
+        //妫�娴嬫槸鍚﹀瓨鍦ㄦ彁鍗囨満鍙g殑鎸囦护
+        List<ShuttleCommand> commands = redisCommand.getAssignCommand().getCommands();
+        BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
+        ArrayList<Short> qrCodeValues = new ArrayList<>();
+        for (BasDevp basDevp : basDevpService.selectList(null)) {
+            //灏嗘墍鏈夋彁鍗囨満鍙d簩缁寸爜瀛樺叆list
+            qrCodeValues.add(Short.parseShort(basDevp.getQrCodeValue()));
+        }
+
+        //閬嶅巻鎵�鏈夋寚浠わ紝鍒ゆ柇鏄惁鏈夊埌鎻愬崌鏈哄彛鐨勬寚浠わ紝骞惰幏鍙栧埌杈捐鎻愬崌鏈哄彛鎵�闇�姝ュ簭
+        int step = 0;
+        ShuttleCommand command = null;
+        for (int i = 1; i < commands.size(); i++) {
+            command = commands.get(i);
+            if (qrCodeValues.contains(command.getDistCodeNum())) {
+                //瀛樺湪
+                step = i + 1;
+                break;
+            }
+        }
+
+        if (step == 0) {
+            //鏃犻渶鍚庣画妫�娴嬶紝鐩存帴鏀捐
+            return true;
+        }
+
+        //鍒ゆ柇涓嬩竴姝ユ槸鍚︿负鎻愬崌鏈哄彛
+        if (commandStep + 1 != step) {
+            //涓嬩竴姝ヤ笉鏄彁鍗囨満鍙o紝璺宠繃鍚庣画娴佺▼
+            return true;
+        }
+
+        //鎷垮埌鎻愬崌鏈虹嚎绋�
+        LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, 1);
+        if (liftThread == null) {
+            return false;
+        }
+        LiftProtocol liftProtocol = liftThread.getLiftProtocol();
+        if (liftProtocol == null) {
+            return false;
+        }
+
+        //鑾峰彇鍥涘悜绌挎杞﹀綋鍓嶆ゼ灞�
+        String shuttleLocNo = shuttleProtocol.getCurrentLocNo();//浜岀淮鐮佸搴斿簱浣嶅彿
+        Integer shuttleLocNoLev = Integer.parseInt(shuttleLocNo.substring(shuttleLocNo.length() - 2, shuttleLocNo.length()));//搴撲綅鍙峰搴斿眰楂�
+
+        //绋嬪簭璧板埌杩欙紝琛ㄧず鎻愬崌鏈哄彲鑳戒竴鐩村氨鍦ㄥ綋鍓嶅眰锛屽彲鑳界粡杩囦簡绉诲姩鍒拌揪浜嗚灞�
+        if (liftProtocol.getProtocolStatusType() == LiftProtocolStatusType.WAITING) {
+            //鎻愬崌鏈虹瓑寰呯‘璁�
+            //璁剧疆鎻愬崌鏈轰负绌洪棽鐘舵��
+            liftProtocol.setProtocolStatus(LiftProtocolStatusType.IDLE);
+            //浠诲姟鍙锋竻闆�
+            liftProtocol.setTaskNo((short) 0);
+            //鏍囪澶嶄綅
+            liftProtocol.setPakMk(true);
+            //浠诲姟鎸囦护娓呴浂
+            liftProtocol.setAssignCommand(null);
+            //鎻愬崌鏈鸿В閿�
+            liftProtocol.setLiftLock(false);
+        }
+
+        //鍒ゆ柇鎻愬崌鏈烘槸鍚﹀湪鐩爣妤煎眰
+        if (liftProtocol.getLev().intValue() == shuttleLocNoLev) {
+            //鍚屼竴灞傦紝鐩存帴鏀捐
+            return true;
+        }
+
+        //鎻愬崌鏈哄拰绌挎杞﹀浜庝笉鍚屾ゼ灞傦紝闇�瑕佽繘琛岃皟搴�
+        if (!liftProtocol.isIdle()) {
+            //鎻愬崌鏈轰笉鏄┖闂�
+            return false;
+        }
+
+        //缁欐彁鍗囨満鍒嗛厤浠诲姟
+        liftProtocol.setLiftLock(true);//閿佸畾鎻愬崌鏈�
+        liftProtocol.setTaskNo(shuttleProtocol.getTaskNo());//璁剧疆浠诲姟鍙�
+        liftProtocol.setShuttleNo(shuttleProtocol.getShuttleNo());//璁剧疆鍥涘悜绌挎杞﹀彿
+        liftProtocol.setProtocolStatus(LiftProtocolStatusType.WORKING);//璁剧疆鎻愬崌鏈虹姸鎬佷负宸ヤ綔涓�
+        liftProtocol.setSecurityMk(true);//鏍囪缃负true锛岄槻姝㈠叾浠栦换鍔″崰鐢ㄥ綋鍓嶆彁鍗囨満
+        redisCommand.setLiftSecurityMk(true);//鏍囪缃负true锛岄槻姝㈠叾浠栦换鍔″崰鐢ㄥ綋鍓嶆彁鍗囨満
+        //浠诲姟鏁版嵁淇濆瓨鍒皉edis
+        redisUtil.set("shuttle_wrk_no_" + wrkNo, JSON.toJSONString(redisCommand));
+
+        //鍛戒护list
+        ArrayList<LiftCommand> liftCommands = new ArrayList<>();
+        LiftCommand liftCommand = new LiftCommand();
+        liftCommand.setLiftNo(liftProtocol.getLiftNo());//鎻愬崌鏈哄彿
+        liftCommand.setTaskNo(liftProtocol.getTaskNo());//浠诲姟鍙�
+        liftCommand.setRun((short) 1);//鍗囬檷
+        liftCommand.setDistPosition(shuttleLocNoLev.shortValue());//鐩爣妤煎眰(绌挎杞︽墍鍦ㄦゼ灞�)
+        liftCommand.setLiftLock(true);//閿佸畾鎻愬崌鏈�
+        liftCommands.add(liftCommand);//灏嗗懡浠ゆ坊鍔犺繘list
+
+        LiftAssignCommand liftAssignCommand = new LiftAssignCommand();
+        liftAssignCommand.setCommands(liftCommands);
+        liftAssignCommand.setLiftNo(liftProtocol.getLiftNo());
+        liftAssignCommand.setTaskNo(liftProtocol.getTaskNo());
+        //涓嬪彂浠诲姟
+        MessageQueue.offer(SlaveType.Lift, liftProtocol.getLiftNo().intValue(), new Task(3, liftAssignCommand));
+
+        return false;
+    }
+
+    /**
+     * 澶嶄綅骞跺皾璇曚慨澶嶉敊璇�
+     */
+    private boolean resetAndTryFix(Short wrkNo) {
+        //璇诲彇redis鏁版嵁
+        if (wrkNo == null) {
+            return false;
+        }
+
+        Object o = redisUtil.get("shuttle_wrk_no_" + wrkNo);
         if (o == null) {
             return false;
         }
 
-        HashMap map = JSON.parseObject(o.toString(), HashMap.class);
-        List<ShuttleCommand> commands = assignCommand.getCommands();
+        ShuttleRedisCommand redisCommand = JSON.parseObject(o.toString(), ShuttleRedisCommand.class);
+        List<ShuttleCommand> commands = redisCommand.getAssignCommand().getCommands();
         //褰撳墠姝ュ簭
-        int commandStep = Integer.parseInt(map.get("commandStep").toString());
+        int commandStep = redisCommand.getCommandStep();
         //path璺緞鏁扮洰
         int size = commands.size();
 
@@ -875,9 +1025,9 @@
         moveCommand.setStartCodeNum(command.getStartCodeNum());//瀛樺叆鐩爣搴撲綅鍙�
         list.add(moveCommand);
 
-        map.put("errorCommands", list);
+        redisCommand.setErrorCommands(list);
         //浠诲姟鏁版嵁淇濆瓨鍒皉edis
-        redisUtil.set("wrk_no_" + assignCommand.getTaskNo(), JSON.toJSONString(map));
+        redisUtil.set("shuttle_wrk_no_" + wrkNo, JSON.toJSONString(redisCommand));
         shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.FIXING);
         return true;
     }

--
Gitblit v1.9.1