#

Junjie

2023-09-09 d48f94b29304be6cabbeb6f9e9fe2b25bd7140f9

 src/main/java/com/zy/asrs/controller/ShuttleController.java

@@ -1,6 +1,7 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
@@ -10,14 +11,15 @@
import com.zy.asrs.domain.param.ShuttleOperatorParam;
import com.zy.asrs.domain.vo.*;
import com.zy.asrs.entity.BasShuttle;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.BasShuttleService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.utils.Utils;
import com.zy.common.model.NyShuttleOperaResult;
import com.zy.common.service.CommonService;
import com.zy.common.utils.NavigatePositionConvert;
import com.zy.common.utils.NyHttpUtils;
import com.zy.common.utils.NyShuttleOperaUtils;
import com.zy.common.utils.RedisUtil;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
@@ -25,11 +27,13 @@
import com.zy.core.enums.*;
import com.zy.core.model.ShuttleSlave;
import com.zy.core.model.Task;
import com.zy.core.model.command.NyShuttleHttpCommand;
import com.zy.core.model.command.ShuttleAssignCommand;
import com.zy.core.model.command.ShuttleCommand;
import com.zy.core.model.command.ShuttleRedisCommand;
import com.zy.core.model.protocol.NyShuttleProtocol;
import com.zy.core.model.protocol.ShuttleProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.NyShuttleThread;
import com.zy.core.thread.ShuttleThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -61,73 +65,33 @@

    @PostMapping("/table/shuttle/state")
    @ManagerAuth(memo = "四向穿梭车信息表")
    public R steStateTable(){
        List<ShuttleStateTableVo> list = new ArrayList<>();
    public R shuttleStateTable(){
        ArrayList<JSONObject> list = new ArrayList<>();
        List<BasShuttle> shuttles = basShuttleService.selectList(new EntityWrapper<BasShuttle>().orderBy("shuttle_no"));
        for (BasShuttle basShuttle : shuttles) {
            // 表格行
            ShuttleStateTableVo vo = new ShuttleStateTableVo();
            vo.setShuttleNo(basShuttle.getShuttleNo());   //四向穿梭车号
            list.add(vo);
            // 获取四向穿梭车信息
            ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, basShuttle.getShuttleNo());
            NyShuttleThread shuttleThread = (NyShuttleThread) SlaveConnection.get(SlaveType.Shuttle, basShuttle.getShuttleNo());
            if (shuttleThread == null) {
                vo.setStatus(ShuttleProtocolStatusType.OFFLINE.id);//设备离线
                vo.setBusyStatus(ShuttleProtocolStatusType.OFFLINE.desc);
                continue;
            }
            ShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
            NyShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
            JSONObject shuttleData = JSON.parseObject(JSON.toJSONString(shuttleProtocol));
            if (shuttleProtocol == null || shuttleProtocol.getShuttleNo()==null) {
                list.add(shuttleData);
                continue;
            }
            vo.setTaskNo(shuttleProtocol.getTaskNo().intValue());  //  任务号
            vo.setBusyStatus(shuttleProtocol.getBusyStatusType().desc); //四向穿梭车状态
            vo.setStatus(shuttleProtocol.getProtocolStatusType().id);//当前任务状态
            vo.setCurrentCode(shuttleProtocol.getCurrentCode());//当前二维码
            LocMast currentLocMast = locMastService.queryByQrCode(shuttleProtocol.getCurrentCode().toString());
            if (currentLocMast == null) {
                vo.setLocNo("");//获取当前库位号
                vo.setLocNoX(0);
                vo.setLocNoY(0);
                vo.setLocNoLev(0);//当前库位层高
            }else {
                vo.setLocNo(currentLocMast.getLocNo());//获取当前库位号
                int[] locNoXY = NavigatePositionConvert.positionToXY(currentLocMast.getLocNo());//获取库位号XY坐标
                vo.setLocNoX(locNoXY[0]);
                vo.setLocNoY(locNoXY[1]);
                vo.setLocNoLev(Utils.getLev(currentLocMast.getLocNo()));//当前库位层高

            shuttleData.put("moveAdvancePath", null);//穿梭车预计路径
            if (shuttleProtocol.getTaskNo() != 0) {
                //存在任务，获取指令
                Object object = redisUtil.get("shuttle_wrk_no_" + shuttleProtocol.getTaskNo());
                if (object != null) {
                    ShuttleRedisCommand redisCommand = JSON.parseObject(object.toString(), ShuttleRedisCommand.class);
                    shuttleData.put("moveAdvancePath", redisCommand.getAssignCommand().getNodes());//穿梭车预计路径
                }
            }
            vo.setBatteryPower(shuttleProtocol.getBatteryPower$() == null ? "" : shuttleProtocol.getBatteryPower$() + "%");//电池电量
            vo.setBatteryTemp(shuttleProtocol.getBatteryTemp$() == null ? "" : shuttleProtocol.getBatteryTemp$() + "°");//电池温度
            if (!Cools.isEmpty(shuttleProtocol.getErrorCode())) {
                vo.setErrorCode(shuttleProtocol.getErrorCodeType());//错误编号
            }
            vo.setPlcOutputStatusIO(shuttleProtocol.getPlcOutputStatusIO());//Plc输出状态IO
            if (!Cools.isEmpty(shuttleProtocol.getPlcOutputLift())) {
                vo.setPlcOutputLift(shuttleProtocol.getPlcOutputLift());
            }
            if (!Cools.isEmpty(shuttleProtocol.getPlcOutputTransfer())) {
                vo.setPlcOutputTransfer(shuttleProtocol.getPlcOutputTransfer());
            }
            if (!Cools.isEmpty(shuttleProtocol.getPlcOutputBrake())) {
                vo.setPlcOutputBrake(shuttleProtocol.getPlcOutputBrake());
            }
            if (!Cools.isEmpty(shuttleProtocol.getPlcOutputCharge())) {
                vo.setPlcOutputCharge(shuttleProtocol.getPlcOutputCharge());
            }
            if (!Cools.isEmpty(shuttleProtocol.getStatusErrorCode())) {
                vo.setStatusErrorCode(shuttleProtocol.getStatusErrorCode$());//错误信息码
            }
            vo.setPlcInputStatus(shuttleProtocol.getPlcInputStatus());//PLC输入状态
            vo.setCurrentOrBeforeCode(shuttleProtocol.getCurrentOrBeforeCode());//当前或者之前读到的二维码值
            vo.setCodeOffsetX(shuttleProtocol.getCodeOffsetX());//读到的二维码X方向偏移量
            vo.setCodeOffsetY(shuttleProtocol.getCodeOffsetY());//读到的二维码Y方向偏移量
            vo.setCurrentVoltage(shuttleProtocol.getCurrentVoltage());//当前的电压值
            vo.setCurrentAnalogValue(shuttleProtocol.getCurrentAnalogValue());//当前的模拟量值
            vo.setCurrentLiftServoSpeed(shuttleProtocol.getCurrentLiftServoSpeed());//当前的升降伺服速度
            vo.setCurrentMoveServoSpeed(shuttleProtocol.getCurrentMoveServoSpeed());//当前的行走伺服速度
            vo.setCurrentLiftServoLoad(shuttleProtocol.getCurrentLiftServoLoad());//当前的升降伺服负载率
            vo.setCurrentMoveServoLoad(shuttleProtocol.getCurrentMoveServoLoad());//当前的行走伺服负载率

            list.add(shuttleData);
        }
        return R.ok().add(list);
    }
@@ -177,7 +141,7 @@
            vo.setPakMk(shuttleProtocol.getPakMk()?"Y" : "N");    // 作业标记
            vo.setLocNo(shuttleProtocol.getLocNo());//四向穿梭车当前库位号
            vo.setLev(shuttleProtocol.getLocNo() == null ? 0 : Utils.getLev(shuttleProtocol.getLocNo()));//四向穿梭车当前层高
            vo.setRunSpeed(basShuttle.getRunSpeed());//四向穿梭车运行速度(设置)
//            vo.setRunSpeed(basShuttle.getRunSpeed());//四向穿梭车运行速度(设置)
            vo.setChargeLine(basShuttle.getChargeLine());//充电阈值
        }
        return R.ok().add(list);
@@ -200,51 +164,6 @@
            i++;
        }
        return R.ok().add(str.toString());
    }

    @GetMapping("/detl/{shuttleNo}")
    public R steDetl(@PathVariable("shuttleNo") Integer shuttleNo){
        ShuttleDataVo vo = new ShuttleDataVo();
        for (ShuttleSlave shuttleSlave : slaveProperties.getShuttle()) {
            if (shuttleNo.equals(shuttleSlave.getId())) {
                vo.setShuttleNo(shuttleSlave.getId());
                BasShuttle basShuttle = basShuttleService.selectById(shuttleSlave.getId());
                if (!Cools.isEmpty(basShuttle)) {
                    vo.setWorkNo(basShuttle.getWrkNo());
                    vo.setPakMk(basShuttle.getPakMk());
                }
                break;
            }
        }
        return R.ok().add(vo);
    }

    @GetMapping("/sensor/detl/{shuttleNo}")
    public R shuttleSensorDetl(@PathVariable("shuttleNo") Integer shuttleNo){
        ShuttleSensorDataVo vo = new ShuttleSensorDataVo();
        for (ShuttleSlave shuttleSlave : slaveProperties.getShuttle()) {
            if (shuttleNo.equals(shuttleSlave.getId())) {
                vo.setShuttleNo(shuttleSlave.getId());
                // 获取穿梭车信息
                ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttleSlave.getId());
                if (shuttleThread == null) {
                    return R.error("设备不在线");
                }
                ShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
                if (shuttleProtocol == null) {
                    return R.error("设备不在线");
                }

                // 穿梭车异常 -----------

                // 穿梭车提示信息 ----------------------

                // 状态信息 -------------

                break;
            }
        }
        return R.ok().add(vo);
    }

    @RequestMapping(value = "/command/query")
@@ -282,8 +201,8 @@
        }
        ShuttleRedisCommand redisCommand = JSON.parseObject(o.toString(), ShuttleRedisCommand.class);
        ShuttleAssignCommand assignCommand = redisCommand.getAssignCommand();
        List<ShuttleCommand> commands = assignCommand.getCommands();
        ShuttleCommand command = commands.get(commandStep);
        List<NyShuttleHttpCommand> commands = assignCommand.getCommands();
        NyShuttleHttpCommand command = commands.get(commandStep);
        command.setComplete(complete != 0);
        redisUtil.set("shuttle_wrk_no_" + wrkNo, JSON.toJSONString(redisCommand));
        return R.ok();
@@ -298,11 +217,11 @@
        }
        ShuttleRedisCommand redisCommand = JSON.parseObject(o.toString(), ShuttleRedisCommand.class);
        Short shuttleNo = redisCommand.getShuttleNo();
        ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttleNo.intValue());
        NyShuttleThread shuttleThread = (NyShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttleNo.intValue());
        if (shuttleThread == null) {
            return R.error();
        }
        ShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
        NyShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
        if (shuttleProtocol == null) {
            return R.error();
        }
@@ -310,7 +229,7 @@
            return R.error();
        }
        //四向穿梭车处于空闲状态，进行任务的恢复
        shuttleProtocol.setTaskNo(redisCommand.getWrkNo());//将四向穿梭车线程分配任务号
        shuttleProtocol.setTaskNo(redisCommand.getWrkNo().intValue());//将四向穿梭车线程分配任务号
        shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.WORKING);//工作状态
        return R.ok();
    }
@@ -349,11 +268,11 @@

        for (ShuttleSlave shuttleSlave : slaveProperties.getShuttle()) {
            if (param.getShuttleNo().equals(shuttleSlave.getId())) {
                ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttleSlave.getId());
                NyShuttleThread shuttleThread = (NyShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttleSlave.getId());
                if (shuttleThread == null) {
                    throw new CoolException("四向穿梭车不在线");
                }
                ShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
                NyShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
                if (shuttleProtocol == null) {
                    throw new CoolException("四向穿梭车不在线");
                }
@@ -363,6 +282,64 @@
                assignCommand.setTaskMode(shuttleTaskModeType.id.shortValue());
                assignCommand.setTaskNo((short) commonService.getWorkNo(3));//获取任务号
                assignCommand.setAuto(false);//手动模式

                if (shuttleTaskModeType == ShuttleTaskModeType.TRANSPORT) {
                    //搬运货物任务
                    NyShuttleOperaResult result = NyShuttleOperaUtils.getShuttleTransportCommands(shuttleSlave.getId(), assignCommand.getTaskNo().intValue(), shuttleProtocol.getCurrentLocNo(), param.getSourceLocNo(), param.getDistLocNo());
                    if (result == null) {
                        throw new CoolException("路径计算失败");
                    }

                    assignCommand.setCommands(result.getCommands());
                    assignCommand.setNodes(result.getNodes());
                } else if (shuttleTaskModeType == ShuttleTaskModeType.MOVE_LOC_NO) {
                    //移动到目标库位
                    NyShuttleOperaResult result = NyShuttleOperaUtils.getStartToTargetCommands(shuttleSlave.getId(), assignCommand.getTaskNo().intValue(), shuttleProtocol.getCurrentLocNo(), param.getDistLocNo());
                    if (result == null) {
                        throw new CoolException("路径计算失败");
                    }

                    assignCommand.setCommands(result.getCommands());
                    assignCommand.setNodes(result.getNodes());
                } else if (shuttleTaskModeType == ShuttleTaskModeType.PALLET_LIFT) {
                    //托盘顶升
                    NyShuttleHttpCommand command = NyHttpUtils.getPalletLiftCommand(shuttleSlave.getId(), assignCommand.getTaskNo().intValue(), true);
                    ArrayList<NyShuttleHttpCommand> commands = new ArrayList<>();
                    commands.add(command);
                    assignCommand.setCommands(commands);
                } else if (shuttleTaskModeType == ShuttleTaskModeType.PALLET_DOWN) {
                    //托盘下降
                    NyShuttleHttpCommand command = NyHttpUtils.getPalletLiftCommand(shuttleSlave.getId(), assignCommand.getTaskNo().intValue(), false);
                    ArrayList<NyShuttleHttpCommand> commands = new ArrayList<>();
                    commands.add(command);
                    assignCommand.setCommands(commands);
                } else if (shuttleTaskModeType == ShuttleTaskModeType.CHARGE) {
                    //充电开关
                    NyShuttleHttpCommand command = NyHttpUtils.getChargeCommand(shuttleSlave.getId(), assignCommand.getTaskNo().intValue(), true);
                    ArrayList<NyShuttleHttpCommand> commands = new ArrayList<>();
                    commands.add(command);
                    assignCommand.setCommands(commands);
                } else if (shuttleTaskModeType == ShuttleTaskModeType.RESET) {
                    //复位
                    shuttleProtocol.setTaskNo(0);//工作号清空
                    shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.IDLE);//任务状态-空闲
                    shuttleProtocol.setPakMk(false);//作业标记复位
                    return R.ok();
                } else if (shuttleTaskModeType == ShuttleTaskModeType.SHUTTLE_CONTROL) {
                    //小车管制
                    NyShuttleHttpCommand suspendCommand = NyHttpUtils.getSuspendCommand(shuttleSlave.getId(), assignCommand.getTaskNo().intValue(), true);
                    ArrayList<NyShuttleHttpCommand> commands = new ArrayList<>();
                    commands.add(suspendCommand);
                    assignCommand.setCommands(commands);
                } else if (shuttleTaskModeType == ShuttleTaskModeType.SHUTTLE_CANCEL_CONTROL) {
                    //小车取消管制
                    NyShuttleHttpCommand suspendCommand = NyHttpUtils.getSuspendCommand(shuttleSlave.getId(), assignCommand.getTaskNo().intValue(), false);
                    ArrayList<NyShuttleHttpCommand> commands = new ArrayList<>();
                    commands.add(suspendCommand);
                    assignCommand.setCommands(commands);
                } else {
                    throw new CoolException("未知命令");
                }

                if (MessageQueue.offer(SlaveType.Shuttle, shuttleSlave.getId(), new Task(3, assignCommand))) {
                    return R.ok();
@@ -377,13 +354,14 @@
    @PostMapping("/detl/update")
    @ManagerAuth(memo = "修改数据")
    public R shuttleUpdate(@RequestParam Integer shuttleNo,
                        @RequestParam Short workNo,
                        @RequestParam String pakMk){
        ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttleNo);
                           @RequestParam Integer workNo,
                           @RequestParam String pakMk,
                           @RequestParam Integer token) {
        NyShuttleThread shuttleThread = (NyShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttleNo);
        if (shuttleThread == null) {
            return R.error("plc已掉线");
        }
        ShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
        NyShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
        if (shuttleProtocol == null) {
            return R.error("plc已掉线");
        }
@@ -393,18 +371,20 @@
        if (pakMk != null) {
            shuttleProtocol.setPakMk(pakMk.equals("Y"));
        }
        if (token != null) {
            shuttleProtocol.setToken(token);
        }
        return R.ok();
    }

    @PostMapping("/runSpeed/{shuttleNo}")
    @ManagerAuth
    public R setRunSpeed(@PathVariable("shuttleNo") String shuttleNo, @RequestParam("runSpeed") Integer runSpeed, @RequestParam("chargeLine") Integer chargeLine) {

        BasShuttle basShuttle = basShuttleService.selectById(shuttleNo);
        if (basShuttle == null) {
            return R.error("四向穿梭车不存在");
        }
        basShuttle.setRunSpeed(runSpeed);
//        basShuttle.setRunSpeed(runSpeed);
        basShuttle.setChargeLine(chargeLine);
        if (!basShuttleService.updateById(basShuttle)) {
            return R.error();