From b2e9d1f13a8a88e2963f504926234589fa2d2787 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 11 四月 2025 13:45:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/fyxc_shuttle_wcs' into fyxc_shuttle_wcs

---
 src/main/java/com/zy/core/thread/LiftThread.java |  491 +++--------------------------------------------------
 1 files changed, 34 insertions(+), 457 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/LiftThread.java b/src/main/java/com/zy/core/thread/LiftThread.java
index 1da2b39..cdfb73c 100644
--- a/src/main/java/com/zy/core/thread/LiftThread.java
+++ b/src/main/java/com/zy/core/thread/LiftThread.java
@@ -1,490 +1,67 @@
 package com.zy.core.thread;
 
-import HslCommunication.Core.Transfer.DataFormat;
-import HslCommunication.Core.Types.OperateResult;
-import HslCommunication.Core.Types.OperateResultExOne;
-import HslCommunication.ModBus.ModbusTcpNet;
-import com.alibaba.fastjson.JSON;
-import com.core.common.Cools;
-import com.core.common.DateUtils;
-import com.core.common.SpringUtils;
-import com.core.exception.CoolException;
-import com.zy.asrs.entity.BasLift;
-import com.zy.asrs.entity.BasLiftOpt;
-import com.zy.asrs.entity.BasShuttle;
-import com.zy.asrs.entity.BasShuttleOpt;
-import com.zy.asrs.service.BasLiftOptService;
-import com.zy.asrs.service.BasLiftService;
-import com.zy.asrs.service.BasShuttleOptService;
-import com.zy.asrs.service.BasShuttleService;
-import com.zy.common.utils.CommonUtils;
-import com.zy.common.utils.RedisUtil;
-import com.zy.core.News;
+import com.zy.common.ExecuteSupport;
+import com.zy.common.model.NavigateNode;
 import com.zy.core.ThreadHandler;
-import com.zy.core.cache.MessageQueue;
-import com.zy.core.cache.OutputQueue;
-import com.zy.core.enums.*;
-import com.zy.core.model.LiftSlave;
-import com.zy.core.model.Task;
-import com.zy.core.model.command.*;
+import com.zy.core.enums.ForkLiftTaskModeType;
+import com.zy.core.enums.LiftCommandModeType;
+import com.zy.core.enums.LiftProtocolStatusType;
+import com.zy.core.model.CommandResponse;
+import com.zy.core.model.command.LiftCommand;
 import com.zy.core.model.protocol.LiftProtocol;
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
+import com.zy.core.model.protocol.LiftStaProtocol;
 
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
-/**
- * 鎻愬崌鏈虹嚎绋�
- */
-@Data
-@Slf4j
-public class LiftThread implements  Runnable, ThreadHandler {
+public interface LiftThread extends ThreadHandler {
 
-    private ModbusTcpNet modbusTcpNet;
-    private LiftSlave slave;
-    private LiftProtocol liftProtocol;
-    private RedisUtil redisUtil;
+    LiftProtocol getStatus();//鑾峰彇鎻愬崌鏈虹姸鎬�
 
-    public LiftThread(LiftSlave slave,RedisUtil redisUtil) {
-        this.slave = slave;
-        this.redisUtil = redisUtil;
-    }
+    LiftProtocol getStatus(boolean clone);//鑾峰彇鎻愬崌鏈虹姸鎬�
 
-    @Override
-    public void run() {
-        this.connect();
-        while (true) {
-            try {
-                int step = 1;
-                Task task = MessageQueue.poll(SlaveType.Lift, slave.getId());
-                if (task != null) {
-                    step = task.getStep();
-                }
-                switch (step) {
-                    // 璇绘暟鎹�
-                    case 1:
-                        readStatus();
-                        break;
-                    // 鍐欏叆鏁版嵁
-                    case 2:
-                        write((LiftCommand) task.getData());
-                        break;
-                    //鍒嗛厤浠诲姟
-                    case 3:
-                        assignWork((LiftAssignCommand) task.getData());
-                        break;
-                    default:
-                        break;
-                }
-                Thread.sleep(500);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
+    List<LiftStaProtocol> getLiftStaProtocols();
 
-    @Override
-    public boolean connect() {
-        boolean result = false;
-        //-------------------------鎻愬崌鏈鸿繛鎺ユ柟娉�------------------------//
-        modbusTcpNet = new ModbusTcpNet(slave.getIp(), slave.getPort(), (byte) 0x02);
-        // 褰撲綘闇�瑕佹寚瀹氭牸寮忕殑鏁版嵁瑙f瀽鏃讹紝灏遍渶瑕佽缃笅闈㈢殑杩欎釜淇℃伅
-        modbusTcpNet.setDataFormat(DataFormat.ABCD);
-        OperateResult connect = modbusTcpNet.ConnectServer();
-        if(connect.IsSuccess){
-            result = true;
-            OutputQueue.CRN.offer(MessageFormat.format( "銆恵0}銆戞彁鍗囨満plc杩炴帴鎴愬姛 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
-            log.info("鎻愬崌鏈簆lc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}] ", slave.getId(), slave.getIp(), slave.getPort());
-        } else {
-            OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戞彁鍗囨満plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
-            log.error("鎻愬崌鏈簆lc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}] ", slave.getId(), slave.getIp(), slave.getPort());
-        }
-        modbusTcpNet.ConnectClose();
-        //-------------------------鎻愬崌鏈鸿繛鎺ユ柟娉�------------------------//
-        return result;
-    }
+    CommandResponse move(LiftCommand command);//鍗囬檷绉诲姩
 
-    @Override
-    public void close() {
-        modbusTcpNet.ConnectClose();
-    }
+    CommandResponse palletInOut(LiftCommand command);//鎵樼洏鍑哄叆
 
-    private void readStatus() {
-        try {
-            OperateResultExOne<byte[]> result = modbusTcpNet.Read("29", (short) 50);
-            if (result.IsSuccess) {
-                if (null == liftProtocol) {
-                    liftProtocol = new LiftProtocol();
-                    liftProtocol.setLiftNo(slave.getId().shortValue());
-                }
+    CommandResponse lock(LiftCommand command);//閿佸畾鎻愬崌鏈�
 
-                //----------璇诲彇鎻愬崌鏈虹姸鎬�-----------
-                //鑾峰彇鏁版嵁
-                byte[] content = result.Content;
-                //鎻愬崌鏈洪攣瀹�
-                liftProtocol.setLiftLock(CommonUtils.shortToBoolean(modbusTcpNet.getByteTransform().TransInt16(content, 0)));
-                //浣嶇疆鍒拌揪鍙嶉
-                liftProtocol.setPositionArrivalFeedback(modbusTcpNet.getByteTransform().TransInt16(content,2));
-                //鍑嗗灏辩华
-                liftProtocol.setReady(CommonUtils.shortToBoolean(modbusTcpNet.getByteTransform().TransInt16(content,4)));
-                //杩愯涓�
-                liftProtocol.setRunning(CommonUtils.shortToBoolean(modbusTcpNet.getByteTransform().TransInt16(content,6)));
-                //鑱旀満/鍗曟満
-                liftProtocol.setMode(CommonUtils.shortToBoolean(modbusTcpNet.getByteTransform().TransInt16(content,8)));
+    CommandResponse unlock(LiftCommand command);//瑙i攣鎻愬崌鏈�
 
-                //浠ヤ笅鍙傛暟骞舵湭杩涜璋冩暣(闇�瑕佸悗缁拡瀵瑰疄鏈鸿繘琛岃幏鍙栧拰璋冭瘯)
-                //杈撻�佺嚎鍓嶇鍏夌數鏈夎揣
-                liftProtocol.setLineFrontHasStock(modbusTcpNet.getByteTransform().TransBool(content,10));
-                //杈撻�佺嚎姝h浆鍙嶉
-                liftProtocol.setForwardRotationFeedback(modbusTcpNet.getByteTransform().TransBool(content,12));
-                //杈撻�佺嚎鍙嶈浆鍙嶉
-                liftProtocol.setReverseFeedback(modbusTcpNet.getByteTransform().TransBool(content,14));
-                //杈撻�佺嚎鐢垫満杩囪浇
-                liftProtocol.setMotorOverload(modbusTcpNet.getByteTransform().TransBool(content,16));
-                //杈撻�佺嚎鏈鍏夌數鏈夎揣
-                liftProtocol.setLineEndHasStock(modbusTcpNet.getByteTransform().TransBool(content,18));
-                //杩涜緭閫佺嚎鍗℃墭鐩樻姤璀�
-                liftProtocol.setInConveyLineCardTrayAlarm(modbusTcpNet.getByteTransform().TransBool(content,20));
-                //鍑鸿緭閫佺嚎鍗℃墭鐩樻姤璀�
-                liftProtocol.setOutConveyLineCardTrayAlarm(modbusTcpNet.getByteTransform().TransBool(content,22));
-                //骞冲彴浣嶇疆鍋忓樊鎶ヨ
-                liftProtocol.setPlatPositionDeviationAlarm(modbusTcpNet.getByteTransform().TransBool(content,24));
-                //骞冲彴鎵煩鍋忓樊鎶ヨ
-                liftProtocol.setPlatTorqueDeviationAlarm(modbusTcpNet.getByteTransform().TransBool(content,26));
-                //骞冲彴鍥涘悜杞︽娴�
-                liftProtocol.setPlatShuttleCheck(modbusTcpNet.getByteTransform().TransBool(content,28));
-                //鏈氨缁姸鎬�
-                liftProtocol.setNotReady(modbusTcpNet.getByteTransform().TransInt16(content,30));
-                //浼烘湇1閿欒
-                liftProtocol.setServoError1(modbusTcpNet.getByteTransform().TransInt16(content,32));
-                //浼烘湇2閿欒
-                liftProtocol.setServoError2(modbusTcpNet.getByteTransform().TransInt16(content,34));
-                //浼烘湇3閿欒
-                liftProtocol.setServoError3(modbusTcpNet.getByteTransform().TransInt16(content,36));
-                //浼烘湇4閿欒
-                liftProtocol.setServoError4(modbusTcpNet.getByteTransform().TransInt16(content,38));
-                //鎻愬崌鏈哄疄闄呴�熷害鍙嶉
-                liftProtocol.setLiftActualSpeed(modbusTcpNet.getByteTransform().TransInt16(content,40));
+    CommandResponse reset(LiftCommand command);//澶嶄綅
 
-                ///璇诲彇鎻愬崌鏈虹姸鎬�-end
+    boolean isIdle();//鏄惁绌洪棽
 
-                //灏忚溅澶勪簬杩愯鐘舵�侊紝灏嗘爣璁扮疆涓簍rue
-                if (liftProtocol.getRunning()) {
-                    liftProtocol.setPakMk(true);
-                }
+    boolean isDeviceIdle();//璁惧鏄惁绌洪棽
 
-                //鎻愬崌鏈哄浜庨攣瀹氥�佹湭杩愯銆佸氨缁�佹爣璁皌rue銆佹湁浠诲姟鍙�
-                if (liftProtocol.getLiftLock()
-                        && !liftProtocol.getRunning()
-                        && liftProtocol.getReady()
-                        && liftProtocol.getPakMk()
-                        && liftProtocol.getTaskNo() != 0) {
-                    //杩樻湁鏈畬鎴愮殑鍛戒护
-                    executeWork(liftProtocol.getTaskNo());
-                }
+    boolean isDeviceIdle(ExecuteSupport support);//璁惧鏄惁绌洪棽
 
-                //灏嗘彁鍗囨満鐘舵�佷繚瀛樿嚦鏁版嵁搴�
-                BasLiftService liftService = SpringUtils.getBean(BasLiftService.class);
-                BasLift basLift = liftService.selectById(liftProtocol.getLiftNo());
-                if (basLift == null) {
-                    basLift = new BasLift();
-                    //鎻愬崌鏈哄彿
-                    basLift.setLiftNo(slave.getId());
-                    liftService.insert(basLift);
-                }
-                basLift.setStatus(liftProtocol.getProtocolStatus());
-                basLift.setWrkNo(liftProtocol.getTaskNo().intValue());
-                basLift.setUpdateTime(new Date());
-                basLift.setPakMk(liftProtocol.getPakMk());
-                basLift.setLiftLock(liftProtocol.getLiftLock());
-                basLift.setPositionArrivalFeedback(liftProtocol.getPositionArrivalFeedback().intValue());
-                basLift.setReady(liftProtocol.getReady());
-                basLift.setRunning(liftProtocol.getRunning());
-                basLift.setMode(liftProtocol.getMode());
-                basLift.setLineFrontHasStock(liftProtocol.getLineFrontHasStock());
-                basLift.setForwardRotationFeedback(liftProtocol.getForwardRotationFeedback());
-                basLift.setReverseFeedback(liftProtocol.getReverseFeedback());
-                basLift.setMotorOverload(liftProtocol.getMotorOverload());
-                basLift.setLineEndHasStock(liftProtocol.getLineEndHasStock());
-                basLift.setInConveyLineCardTrayAlarm(liftProtocol.getInConveyLineCardTrayAlarm());
-                basLift.setOutConveyLineCardTrayAlarm(liftProtocol.getOutConveyLineCardTrayAlarm());
-                basLift.setPlatPositionDeviationAlarm(liftProtocol.getPlatPositionDeviationAlarm());
-                basLift.setPlatTorqueDeviationAlarm(liftProtocol.getPlatTorqueDeviationAlarm());
-                basLift.setPlatShuttleCheck(liftProtocol.getPlatShuttleCheck());
-                basLift.setNotReady(liftProtocol.getNotReady().intValue());
-                basLift.setServoError1(liftProtocol.getServoError1().intValue());
-                basLift.setServoError2(liftProtocol.getServoError2().intValue());
-                basLift.setServoError3(liftProtocol.getServoError3().intValue());
-                basLift.setServoError4(liftProtocol.getServoError4().intValue());
-                basLift.setLiftActualSpeed(liftProtocol.getLiftActualSpeed().intValue());
-                if (liftService.updateById(basLift)) {
-                    OutputQueue.LIFT.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
-//                    log.info(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
-                }
+    boolean setProtocolStatus(LiftProtocolStatusType status);//璁剧疆宸ヤ綔鐘舵��
 
-            }else {
-                OutputQueue.LIFT.offer(MessageFormat.format("銆恵0}銆憑1}鎻愬崌鏈簆lc鐘舵�佷俊鎭け璐�", DateUtils.convert(new Date()), slave.getId()));
-                throw new CoolException(MessageFormat.format( "鎻愬崌鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{0}] [ip:{1}] [port:{2}]", slave.getId(), slave.getIp(), slave.getPort()));
-            }
-        } catch (Exception e) {
-            OutputQueue.LIFT.offer(MessageFormat.format("銆恵0}銆戞彁鍗囨満plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
-            initLift();
-        }
-    }
+    boolean setSyncTaskNo(Integer taskNo);//璁剧疆宸ヤ綔鍙�
 
-    private boolean write(LiftCommand command){
-        if (null == command) {
-            News.error("鎻愬崌鏈哄啓鍏ュ懡浠や负绌�");
-            return false;
-        }
+    boolean isLock(ExecuteSupport support);
 
-        command.setLiftNo(slave.getId().shortValue());
-        // 寮�濮嬩换鍔�
-        short[] array = new short[30];
-        //寮�濮嬭繍琛�
-        array[0] = command.getRun();
-        if (command.getDistPosition() != null) {
-            //鐩爣浣嶇疆
-            array[1] = command.getDistPosition();
-        }
-        if (command.getSpeed() != null) {
-            //杩愯閫熷害
-            array[2] = command.getSpeed();
-        }
-        if (command.getHeight2() != null) {
-            //浜屽眰楂樺害璁惧畾
-            array[3] = command.getHeight2();
-        }
-        if (command.getHeight3() != null) {
-            //涓夊眰楂樺害璁惧畾
-            array[4] = command.getHeight3();
-        }
-        if (command.getHeight4() != null) {
-            //鍥涘眰楂樺害璁惧畾
-            array[5] = command.getHeight4();
-        }
-        if (command.getLiftLockShortValue() != null) {
-            //鎻愬崌鏈洪攣瀹�
-            array[29] = command.getLiftLockShortValue();
-        }
+    int generateDeviceTaskNo(int taskNo, ForkLiftTaskModeType type);//鐢熸垚纭欢璁惧宸ヤ綔鍙�
 
-        OperateResult result = modbusTcpNet.Write("0", array);;
-        if (result != null && result.IsSuccess) {
-            News.info("鎻愬崌鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
-            OutputQueue.LIFT.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
-            return true;
-        } else {
-            OutputQueue.LIFT.offer(MessageFormat.format("銆恵0}銆戝啓鍏ユ彁鍗囨満plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
-            News.error("鍐欏叆鎻愬崌鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
-            return false;
-        }
-    }
+    String getLiftLocNo(int lev);//鑾峰彇鎻愬崌鏈轰綅缃�
 
-    //鍒嗛厤浠诲姟
-    private void assignWork(LiftAssignCommand assignCommand) {
-        //鎵嬪姩妯″紡鎸囦护
-        if (!assignCommand.getAuto()) {
-            LiftCommand command = new LiftCommand();
-            //鎻愬崌鏈哄綋鍓嶆ゼ灞�
-            Short lev = liftProtocol.getLev();
-            List<LiftCommand> commands = assignCommand.getCommands();
-            if (commands == null) {
-                commands = new ArrayList<LiftCommand>();
-            }
-            liftProtocol.setTaskNo(assignCommand.getTaskNo());
-            switch (assignCommand.getTaskMode()) {
-                case 1://涓婂崌涓�灞�
-                    command = getLiftUpDownCommand(++lev);//鑾峰彇鎻愬崌鏈轰笂鍗囦笅闄嶅懡浠�
-                    break;
-                case 2://涓嬮檷涓�灞�
-                    command = getLiftUpDownCommand(--lev);//鑾峰彇鎻愬崌鏈轰笂鍗囦笅闄嶅懡浠�
-                    break;
-                case 3://鏈夎揣姝h浆
-                    command = getLiftTurnCommand(1);//鑾峰彇鎻愬崌鏈鸿浆鍔ㄥ懡浠�
-                    break;
-                case 4://鏈夎揣鍙嶈浆
-                    command = getLiftTurnCommand(2);//鑾峰彇鎻愬崌鏈鸿浆鍔ㄥ懡浠�
-                    break;
-                case 5://澶嶄綅
-                    command = getResetCommand();//鑾峰彇澶嶄綅鍛戒护
-                    break;
-                default:
-            }
-            commands.add(command);
-            assignCommand.setCommands(commands);
-        }
+    String getLiftStandByLocNo(int lev, boolean in);//鑾峰彇鎻愬崌鏈哄緟鏈轰綅
 
-        LiftRedisCommand redisCommand = new LiftRedisCommand();
-        redisCommand.setLiftNo(assignCommand.getLiftNo());//鎻愬崌鏈哄彿
-        redisCommand.setWrkNo(assignCommand.getTaskNo());//宸ヤ綔鍙�
-        redisCommand.setCommandStep(0);//鍛戒护鎵ц姝ュ簭
-        redisCommand.setAssignCommand(assignCommand);//鍛戒护
-        //浠诲姟鏁版嵁淇濆瓨鍒皉edis
-        redisUtil.set("lift_wrk_no_" + assignCommand.getTaskNo(), JSON.toJSONString(redisCommand));
-        liftProtocol.setAssignCommand(assignCommand);
-        liftProtocol.setProtocolStatus(LiftProtocolStatusType.WORKING);
-        //鎵ц涓嬪彂浠诲姟
-        executeWork(assignCommand.getTaskNo());
-    }
+    List<NavigateNode> getLiftStaNodes(int lev);
 
-    //鎵ц浠诲姟
-    private boolean executeWork(Short wrkNo) {
-        //璇诲彇redis鏁版嵁
-        if (wrkNo == null) {
-            return false;
-        }
+    //***************鑾峰彇鍛戒护*****************
+    List<LiftCommand> getMoveCommand(Integer taskNo, Integer sourceLev, Integer targetLev, LiftCommandModeType mode);//鎻愬崌鏈虹Щ鍔�
 
-        //灏嗘爣璁扮疆涓篺alse(闃叉閲嶅彂)
-        liftProtocol.setPakMk(false);
+    List<LiftCommand> getMoveWithShuttleCommand(Integer taskNo, Integer sourceLev, Integer targetLev, LiftCommandModeType mode);//杞借溅绉诲姩
 
-        Object o = redisUtil.get("lift_wrk_no_" + wrkNo);
-        if (o == null) {
-            return false;
-        }
-        LiftRedisCommand redisCommand = JSON.parseObject(o.toString(), LiftRedisCommand.class);
-        List<LiftCommand> commands = redisCommand.getAssignCommand().getCommands();
-        //褰撳墠姝ュ簭
-        int commandStep = redisCommand.getCommandStep();
-        //鎬绘搴�
-        int size = commands.size();
-        LiftAssignCommand assignCommand = redisCommand.getAssignCommand();
+    List<LiftCommand> getPalletInCommand(Integer taskNo, Integer sourceLev, Integer targetLev);//鎵樼洏鍏�
 
-        //鍙栧嚭鍛戒护
-        LiftCommand command = commands.get(commandStep);
-        //涓嬪彂鍛戒护
-        if (!write(command)) {
-            News.error("鎻愬崌鏈哄懡浠や笅鍙戝け璐ワ紝鎻愬崌鏈哄彿={}锛屼换鍔℃暟鎹�={}", command.getLiftNo(), JSON.toJSON(command));
-            return false;
-        }else {
-            News.info("鎻愬崌鏈哄懡浠や笅鍙戞垚鍔燂紝鎻愬崌鏈哄彿={}锛屼换鍔℃暟鎹�={}", command.getLiftNo(), JSON.toJSON(command));
+    List<LiftCommand> getPalletOutCommand(Integer taskNo, Integer sourceLev, Integer targetLev);//鎵樼洏鍑�
 
-            //鍒ゆ柇鏁版嵁鏄惁鎵ц瀹屾垚
-            if (commandStep < size - 1) {
-                //鏇存柊redis鏁版嵁
-                //姝ュ簭澧炲姞
-                commandStep++;
-                redisCommand.setCommandStep(commandStep);
-                //浠诲姟鏁版嵁淇濆瓨鍒皉edis
-                redisUtil.set("lift_wrk_no_" + redisCommand.getWrkNo(), JSON.toJSONString(redisCommand));
-            }else {
-                //宸叉墽琛屽畬鎴�
-                //淇濆瓨鏁版嵁鍒版暟鎹簱鍋氭祦姘�
-                BasLiftOptService liftOptService = SpringUtils.getBean(BasLiftOptService.class);
-                if (liftOptService != null) {
-                    BasLiftOpt opt = new BasLiftOpt(
-                            redisCommand.getWrkNo().intValue(),
-                            redisCommand.getLiftNo().intValue(),
-                            new Date(),
-                            null,
-                            null,
-                            null,
-                            JSON.toJSONString(assignCommand)
-                    );
-                    liftOptService.insert(opt);
-                }
-                //鍒犻櫎redis
-                redisUtil.del("lift_wrk_no_" + redisCommand.getWrkNo());
+    List<LiftCommand> getLockCommand(Integer taskNo, Boolean lock);//閿佸畾/瑙i攣鎻愬崌鏈�
 
-                if (assignCommand.getAuto()) {
-                    //瀵逛富绾跨▼鎶涘嚭绛夊緟纭鐘舵�亀aiting
-                    liftProtocol.setProtocolStatus(LiftProtocolStatusType.WAITING);
-                    News.info("鎻愬崌鏈轰换鍔℃墽琛屽畬鎴愮瓑寰呯‘璁や腑锛屾彁鍗囨満鍙�={}锛屼换鍔℃暟鎹�={}", command.getLiftNo(), JSON.toJSON(command));
-                }else {
-                    //鎵嬪姩妯″紡涓嶆姏鍑虹瓑寰呯姸鎬�
-                    liftProtocol.setTaskNo((short) 0);
-                    liftProtocol.setShuttleNo((short) 0);
-                    liftProtocol.setProtocolStatus(LiftProtocolStatusType.IDLE);
-                    liftProtocol.setPakMk(true);
-                    liftProtocol.setSecurityMk(false);
-                    News.info("鎻愬崌鏈烘墜鍔ㄤ换鍔℃墽琛屽畬鎴愶紝鎻愬崌鏈哄彿={}锛屼换鍔℃暟鎹�={}", command.getLiftNo(), JSON.toJSON(command));
-                }
-
-                //涓嬪彂涓�鏉℃彁鍗囨満瑙i攣鍛戒护
-                LiftCommand unlockCommand = getUnlockCommand(command.getLiftNo());
-                if (write(unlockCommand)) {
-                    News.info("鎻愬崌鏈虹姸鎬佸凡瑙i攣锛屾彁鍗囨満鍙�={}锛屼换鍔℃暟鎹�={}", command.getLiftNo(), JSON.toJSON(command));
-                }
-
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * 鑾峰彇鎻愬崌鏈鸿В閿佸懡浠�
-     */
-    private LiftCommand getUnlockCommand(Short liftNo) {
-        LiftCommand command = new LiftCommand();
-        command.setRun((short) 0);
-        command.setLiftNo(liftNo);
-        command.setLiftLock(false);
-        return command;
-    }
-
-    /**
-     * 鑾峰彇澶嶄綅鍛戒护
-     */
-    private LiftCommand getResetCommand() {
-        LiftCommand command = new LiftCommand();
-        command.setRun((short) 0);
-        command.setLiftLock(false);
-        return command;
-    }
-
-    /**
-     * 鑾峰彇鎻愬崌鏈轰笂鍗囦笅闄嶅懡浠�
-     */
-    private LiftCommand getLiftUpDownCommand(Short lev) {
-        LiftCommand command = new LiftCommand();
-        command.setRun((short) 1);//鍗囬檷
-        command.setDistPosition(lev);
-        return command;
-    }
-
-    /**
-     * 鑾峰彇鎻愬崌鏈鸿浆鍔ㄥ懡浠わ紝direction锛�1=銆嬫湁璐ф杞紝2=銆嬫湁璐у弽杞�
-     */
-    private LiftCommand getLiftTurnCommand(Integer direction) {
-        LiftCommand command = new LiftCommand();
-        command.setRun(direction == 1 ? (short) 6 : (short) 3);
-        return command;
-    }
-
-    /**
-     * 鍒濆鍖栨彁鍗囨満
-     */
-    private void initLift() {
-        if (null == liftProtocol) {
-            liftProtocol = new LiftProtocol();
-        }
-    }
-
-    /******************************************************************************************/
-    /**************************************** 娴嬭瘯涓撶敤 *****************************************/
-    /*****************************************************************************************/
-    public static void main(String[] args) throws InterruptedException {
-        LiftSlave slave = new LiftSlave();
-        slave.setId(1);
-        slave.setIp("192.168.4.24");
-        slave.setPort(502);
-//        LiftThread thread = new LiftThread(slave,);
-//        thread.connect();
-//        thread.readStatus();
-//
-//        LiftCommand command = new LiftCommand();
-//        command.setRun((short) 1);
-//        command.setDistPosition((short) 12);
-//        command.setSpeed((short) 300);
-//        command.setHeight2((short) 100);
-//        command.setHeight3((short) 200);
-//        command.setHeight4((short) 303);
-//        command.setLiftLock(true);
-//        thread.write(command);
-
-    }
+    List<LiftCommand> getShuttleSignalCommand(Integer taskNo, Boolean signal);//灏忚溅宸插埌浣�/宸查┒绂讳俊鍙�
 
 }

--
Gitblit v1.9.1