map_1.json

Junjie

2023-07-04 6b9fbba050fcbc7e9478bbd0a008a3b7f08d7a1d

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

@@ -279,7 +279,6 @@
            News.error("四向穿梭车写入命令为空");
            return false;
        }

        BasShuttleService shuttleService = SpringUtils.getBean(BasShuttleService.class);
        if (shuttleService == null) {
            News.error("系统错误");
@@ -291,8 +290,27 @@
            News.error("四向穿梭车不存在");
            return false;
        }

        command.setShuttleNo(slave.getId().shortValue());
        short[] array = getCommandArr(command);//获取命令报文
        OperateResult result = modbusTcpNet.Write("0", array);;
        if (result != null && result.IsSuccess) {
            try {
                Thread.sleep(3000);//命令下发后休眠1s
            } catch (InterruptedException e) {
                throw new RuntimeException(e);
            }
            News.info("四向穿梭车命令下发[id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
            OutputQueue.SHUTTLE.offer(MessageFormat.format("【{0}】[id:{1}] >>>>> 命令下发： {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
            return true;
        } else {
            OutputQueue.SHUTTLE.offer(MessageFormat.format("【{0}】写入四向穿梭车plc数据失败 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
            News.error("写入四向穿梭车plc数据失败 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
            return false;
        }
    }

    //获取命令报文
    private short[] getCommandArr(ShuttleCommand command) {
        // 开始任务
        short[] array = new short[17];
        //控制指令字
@@ -326,7 +344,6 @@
            array[7] = middleToDistDistances[1];
        }

        array[8] = basShuttle.getRunSpeed().shortValue();//四向穿梭车运行速度，从系统数据库读出
        if (command.getRunDirection() != null) {
            //小车运行方向
            array[8] = command.getRunDirection();
@@ -363,31 +380,16 @@
            //小车雷达备用
            array[15] = command.getRadarTmp();
        }

        //指令结束位
        array[16] = command.getCommandEnd();

        OperateResult result = modbusTcpNet.Write("0", array);;
        if (result != null && result.IsSuccess) {
            try {
                Thread.sleep(3000);//命令下发后休眠1s
            } catch (InterruptedException e) {
                throw new RuntimeException(e);
            }
            News.info("四向穿梭车命令下发[id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
            OutputQueue.SHUTTLE.offer(MessageFormat.format("【{0}】[id:{1}] >>>>> 命令下发： {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
            return true;
        } else {
            OutputQueue.SHUTTLE.offer(MessageFormat.format("【{0}】写入四向穿梭车plc数据失败 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
            News.error("写入四向穿梭车plc数据失败 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
            return false;
        }
        return array;
    }

    /**
     * 初始化四向穿梭车
     */
    private void initShuttle() {
        this.connect();
        if (null == shuttleProtocol) {
            shuttleProtocol = new ShuttleProtocol();
        }
@@ -834,6 +836,7 @@
            //保存数据到数据库做流水
            BasShuttleOptService shuttleOptService = SpringUtils.getBean(BasShuttleOptService.class);
            if (shuttleOptService != null) {
                short[] commandArr = getCommandArr(command);//获取命令报文
                BasShuttleOpt opt = new BasShuttleOpt(
                        assignCommand.getTaskNo().intValue(),
                        assignCommand.getShuttleNo().intValue(),
@@ -844,7 +847,8 @@
                        null,
                        null,
                        null,
                        JSON.toJSONString(command)
                        JSON.toJSONString(command),
                        JSON.toJSONString(commandArr)
                );
                shuttleOptService.insert(opt);
            }