#

whycq

2023-03-29 44f10e71d146093d1a90afb13c0cb1af930349f4

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

@@ -9,9 +9,15 @@
import com.zy.asrs.mapper.ReportQueryMapper;
import com.zy.common.service.CommonService;
import com.zy.core.CrnThread;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.LedSlave;
import com.zy.core.model.Task;
import com.zy.core.model.command.LedCommand;
import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.LedThread;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@@ -27,8 +33,12 @@

    private static final String[] WEEK = {"星期日","星期一","星期二","星期三","星期四","星期五","星期六"};

    private String programMsg;

    @Autowired
    private ReportQueryMapper reportQueryMapper;
    @Autowired
    private SlaveProperties slaveProperties;

    /**
     * 获取当前时间
@@ -53,9 +63,11 @@
     * 获取其他信息
     */
    @GetMapping("/other")
    public R monitorOther(@RequestParam("crnId") Integer crnId) {
    public R monitorOther(@RequestParam("crnId") Integer crnId, @RequestParam("ledId") Integer ledId) {
        Double xSpeed = 0.0D;
        Double ySpeed = 0.0D;
        Double zSpeed = 0.0D;
        Short forkPos = 1;
        Double xDistance = 0.0D;
        Double yDistance = 0.0D;
        Double xDuration = 0.0D;
@@ -68,6 +80,21 @@
                if (crnProtocol != null) {
                    xSpeed = Double.valueOf(crnProtocol.getXSpeed());
                    ySpeed = Double.valueOf(crnProtocol.getYSpeed());
                    zSpeed = Double.valueOf(crnProtocol.getZSpeed());
                    switch (crnProtocol.getForkPos()) {
                        case 0:
                            forkPos = 1;
                            break;
                        case 1:
                            forkPos = 2;
                            break;
                        case 2:
                            forkPos = 0;
                            break;
                        default:
                            forkPos = 1;
                            break;
                    }
                    xDistance = Double.valueOf(crnProtocol.getXDistance());
                    yDistance = Double.valueOf(crnProtocol.getYDistance());
                    xDuration = Double.valueOf(crnProtocol.getXDuration());
@@ -76,21 +103,22 @@
            }
        }

        xSpeed = Double.valueOf(new Random().nextInt(10));
        ySpeed = Double.valueOf(new Random().nextInt(10));

//        int totalWrk = reportQueryMapper.getTotalWrkByCrnId(crnId);
//        int totalLoc = reportQueryMapper.getTotalLocByCrnId();
        // 获取输送线plc线程
        LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, ledId);
        String ledContent = Cools.isEmpty(ledThread) ? "" : ledThread.getWorkNos().toString();
//        ledContent = "ask的模块萨满大算了萨满大了\n 是窘境到埃及嗲家嗲\n 萨达姆打开萨满大凯撒麦当劳萨满大老师";

        return R.ok(
                Cools.add("xSpeed", xSpeed) // 行走速度
                .add("ySpeed", ySpeed)  // 升降速度
//                .add("totalLoc", totalLoc)  // 总库位数
//                .add("totalWrk", totalWrk)    // 总任务数
                .add("xDistance", xDistance)    // 累计走行距离km
                .add("yDistance", yDistance)    // 累计升降距离km
                .add("xDuration", xDuration)    // 累计走行时长h
                .add("yDuration", yDuration)    // 累计升降时长h
                Cools.add("xSpeed", Arith.multiplys(1, Math.abs(xSpeed), 1)) // 行走速度
                .add("ySpeed", Arith.multiplys(1, Math.abs(ySpeed), 1))  // 升降速度
                .add("zSpeed", Arith.multiplys(1, Math.abs(zSpeed), 1))  // 叉牙速度
                .add("forkPos", forkPos)  // 叉牙速度
                .add("xDistance", Arith.multiplys(1, Math.abs(xDistance), 1))    // 累计走行距离km
                .add("yDistance", Arith.multiplys(1, Math.abs(yDistance), 1))   // 累计升降距离km
                .add("xDuration", Arith.multiplys(1, Math.abs(xDuration), 1))    // 累计走行时长h
                .add("yDuration", Arith.multiplys(1, Math.abs(yDuration), 1))    // 累计升降时长h
                .add("isShow", !Cools.isEmpty(ledContent)) // 是否显示内容
                .add("content", ledContent) // 显示内容
        );
    }

@@ -208,9 +236,77 @@
    }


    /**
     * 获取其他信息
     */
    @GetMapping("/led")
    public R monitorLed(@RequestParam("ledId") Integer ledId) {
        String ledContent = "";
        List<LedCommand> commandList = null;
        for (LedSlave slave : slaveProperties.getLed()) {
            if (slave.getStaArr().contains(ledId)) {
                LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, slave.getId());
                if (null != ledThread) {
                    ledContent = ledThread.getStringBuffer().toString();
                    commandList = ledThread.getCommandList();
                }
            }
        }
        return R.ok().add(commandList);
    }

    /**
     * 异常通知
     */
    @GetMapping("/led/error")
    public R monitorLedError(@RequestParam("ledId") Integer ledId) {
        String errorMsg = "";
        for (LedSlave slave : slaveProperties.getLed()) {
            if (slave.getStaArr().contains(ledId)) {
                LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, slave.getId());
                if (null != ledThread) {
                    errorMsg = ledThread.getErrorMsg().toString();
                }
            }
        }
        return R.ok().add(errorMsg);
    }

    /**
     * 节目
     */
    @GetMapping("/led/program")
    public R monitorProgramShow(@RequestParam("ledId") Integer ledId) {
        String program = "";
        for (LedSlave slave : slaveProperties.getLed()) {
            if (slave.getStaArr().contains(ledId)) {
                LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, slave.getId());
                if (null != ledThread) {
                    program = ledThread.getProgram().toString();
                }
            }
        }
        return R.ok().add(program);
    }


    /**
     * 显示节目
     */
    @RequestMapping("/led/add/program")
    public R addProgram(Integer ledId, String msg) {
        MessageQueue.offer(SlaveType.Led, ledId, new Task(5, msg));
        return R.ok();
    }

    /**
     * 移除节目
     */
    @RequestMapping("/led/remove/program")
    public R removeProgram(Integer ledId, String msg) {

        return R.ok();
    }