#

Junjie

2023-09-04 3f48e38eeaf31f85ec8b68489c8079800ca65e0f

 src/main/java/com/zy/core/thread/NyShuttleThread.java

@@ -28,6 +28,8 @@
import lombok.Data;
import lombok.extern.slf4j.Slf4j;

import java.io.IOException;
import java.net.Socket;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -43,6 +45,7 @@
    private ShuttleSlave slave;
    private NyShuttleProtocol shuttleProtocol;
    private RedisUtil redisUtil;
    private Socket socket;

    public NyShuttleThread(ShuttleSlave slave,RedisUtil redisUtil) {
        this.slave = slave;
@@ -84,6 +87,10 @@

    private void read() {
        try {
            if (this.socket == null || !this.socket.isConnected()) {
                //链接断开重新链接
                this.connect();
            }
            readStatus();
            //四向穿梭车空闲、有任务、标记为true、存在任务指令，需要执行任务的下一条指令
            if (shuttleProtocol.getFree() == ShuttleStatusType.IDLE.id
@@ -108,7 +115,7 @@

            //----------读取四向穿梭车状态-----------
            NyShuttleHttpCommand readStatusCommand = NyHttpUtils.getReadStatusCommand(slave.getId());
            JSONObject jsonObject = NyHttpUtils.requestCommand(readStatusCommand);
            JSONObject jsonObject = NyHttpUtils.requestCommand(socket, readStatusCommand);
            if (jsonObject == null) {
                OutputQueue.SHUTTLE.offer(MessageFormat.format("【{0}】四向穿梭车plc状态信息失败 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
            }else {
@@ -159,7 +166,7 @@
                    errCode.add(Integer.parseInt(o.toString()));
                }
                //故障码
                shuttleProtocol.setErrCode(errCode);
                shuttleProtocol.setErrCode(errCode.get(0));
                //总里程数
                shuttleProtocol.setStatusSum(jsonObject.getObject("statusSum", NyShuttleProtocol.StatusSumClass.class));
                //非自动状态时间计时
@@ -242,6 +249,14 @@

    @Override
    public boolean connect() {
        try {
            Socket socket = new Socket(slave.getIp(),slave.getPort());
            socket.setSoTimeout(60000);
            socket.setKeepAlive(true);
            this.socket = socket;
        } catch (IOException e) {
            OutputQueue.SHUTTLE.offer(MessageFormat.format("【{0}】四向穿梭车Socket链接失败 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
        }
        return true;
    }

@@ -268,7 +283,7 @@
        }

        //发出请求
        JSONObject result = NyHttpUtils.requestCommand(command);
        JSONObject result = NyHttpUtils.requestCommand(socket, command);
        if (result == null) {
            return false;//请求失败
        }
@@ -318,62 +333,62 @@
        NavigateMapData navigateMapData = new NavigateMapData(Utils.getLev(shuttleProtocol.getCurrentLocNo()));
        //取出命令
        NyShuttleHttpCommand command = commands.get(commandStep);//当前命令
        if (commandStep != 0) {
            //判断上一条指令是否完成
            NyShuttleHttpCommand lastCommand = commands.get(commandStep - 1);
            String requestType = lastCommand.getRequest().getBody().get("requestType").toString();
            if (requestType.equals("move") || requestType.equals("intoLift") || requestType.equals("outLift")) {
                //移动命令、出入提升机命令
                NyShuttleProtocol.NyShuttlePointClass target = JSON.parseObject(lastCommand.getRequest().getBody().get("target").toString(), NyShuttleProtocol.NyShuttlePointClass.class);
                if (shuttleProtocol.getPoint().equals(target)) {
                    //上一条指令的目标位置和当前小车位置相同，则认定上一条任务完成
                    lastCommand.setComplete(true);
                    //解锁锁定路径，上一条路径和当前路径
                    List<NavigateNode> nodes = lastCommand.getNodes();
                    nodes.addAll(command.getNodes());
                    navigateMapData.writeNavigateNodeToRedisMap(nodes, false);//解锁路径
                }
            }else {
                lastCommand.setComplete(true);//其他命令默认认为完成
            }
            //任务数据保存到redis
            redisUtil.set("shuttle_wrk_no_" + redisCommand.getWrkNo(), JSON.toJSONString(redisCommand));

            if (!lastCommand.getComplete()) {
                //上一条任务未完成，禁止下发命令
                return false;
            }
        }

        List<NavigateNode> nextNodes = null;//下一步命令行走路径
        if (commandStep + 1 < commands.size()) {
            NyShuttleHttpCommand nextCommand = commands.get(commandStep + 1);//下一步命令
            nextNodes = nextCommand.getNodes();//下一步命令行走路径
        }

        if (shuttleProtocol.getFree() == ShuttleStatusType.BUSY.id) {
            return false;//小车状态忙，禁止执行命令
        }

        //检测小车是否要进提升机，如需要进提升机则调度提升机
        if (!checkLiftStation(wrkNo)) {
            return false;
        }

        //检测穿梭车是否在提升机内
        if (!checkShuttleInTheLift(wrkNo)) {
            return false;
        }

        //检测路径是否可行走
        if (!checkPath(command.getNodes(), nextNodes, redisCommand)) {
            return false;
        }

        //锁定路径，锁定当前路径和下一步路径
        List<NavigateNode> nodes = command.getNodes();
        nodes.addAll(nextNodes);
        navigateMapData.writeNavigateNodeToRedisMap(nodes, true);//所使用的路径进行锁定禁用
//        if (commandStep != 0) {
//            //判断上一条指令是否完成
//            NyShuttleHttpCommand lastCommand = commands.get(commandStep - 1);
//            String requestType = lastCommand.getRequest().getBody().get("requestType").toString();
//            if (requestType.equals("move") || requestType.equals("intoLift") || requestType.equals("outLift")) {
//                //移动命令、出入提升机命令
//                NyShuttleProtocol.NyShuttlePointClass target = JSON.parseObject(lastCommand.getRequest().getBody().get("target").toString(), NyShuttleProtocol.NyShuttlePointClass.class);
//                if (shuttleProtocol.getPoint().equals(target)) {
//                    //上一条指令的目标位置和当前小车位置相同，则认定上一条任务完成
//                    lastCommand.setComplete(true);
//                    //解锁锁定路径，上一条路径和当前路径
//                    List<NavigateNode> nodes = lastCommand.getNodes();
//                    nodes.addAll(command.getNodes());
//                    navigateMapData.writeNavigateNodeToRedisMap(nodes, false);//解锁路径
//                }
//            }else {
//                lastCommand.setComplete(true);//其他命令默认认为完成
//            }
//            //任务数据保存到redis
//            redisUtil.set("shuttle_wrk_no_" + redisCommand.getWrkNo(), JSON.toJSONString(redisCommand));
//
//            if (!lastCommand.getComplete()) {
//                //上一条任务未完成，禁止下发命令
//                return false;
//            }
//        }
//
//        List<NavigateNode> nextNodes = null;//下一步命令行走路径
//        if (commandStep + 1 < commands.size()) {
//            NyShuttleHttpCommand nextCommand = commands.get(commandStep + 1);//下一步命令
//            nextNodes = nextCommand.getNodes();//下一步命令行走路径
//        }
//
//        if (shuttleProtocol.getFree() == ShuttleStatusType.BUSY.id) {
//            return false;//小车状态忙，禁止执行命令
//        }
//
//        //检测小车是否要进提升机，如需要进提升机则调度提升机
//        if (!checkLiftStation(wrkNo)) {
//            return false;
//        }
//
//        //检测穿梭车是否在提升机内
//        if (!checkShuttleInTheLift(wrkNo)) {
//            return false;
//        }
//
//        //检测路径是否可行走
//        if (!checkPath(command.getNodes(), nextNodes, redisCommand)) {
//            return false;
//        }
//
//        //锁定路径，锁定当前路径和下一步路径
//        List<NavigateNode> nodes = command.getNodes();
//        nodes.addAll(nextNodes);
//        navigateMapData.writeNavigateNodeToRedisMap(nodes, true);//所使用的路径进行锁定禁用

        //可执行命令
        if (!write(command)) {