#

Junjie

2023-10-13 5f685f89bf6501325b6129ecf709b988369eeedd

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

@@ -11,7 +11,10 @@
import com.zy.core.CrnThread;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.LedSlave;
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.GetMapping;
@@ -33,6 +36,8 @@

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

    /**
     * 获取当前时间
@@ -57,7 +62,17 @@
     * 获取其他信息
     */
    @GetMapping("/other")
    public R monitorOther(@RequestParam("crnId") Integer crnId) {
    public R monitorOther(@RequestParam("crnId") Integer crnId, @RequestParam("ledId") Integer sta) {
        Integer ledId = 0;
        for (LedSlave led : slaveProperties.getLed()) {
            for (Integer staNo : led.getStaArr()) {
                if (staNo.equals(sta)) {
                    ledId = led.getId();
                    break;
                }
            }
        }

        Double xSpeed = 0.0D;
        Double ySpeed = 0.0D;
        Double zSpeed = 0.0D;
@@ -80,10 +95,10 @@
                            forkPos = 1;
                            break;
                        case 1:
                            forkPos = 0;
                            forkPos = 2;
                            break;
                        case 2:
                            forkPos = 2;
                            forkPos = 0;
                            break;
                        default:
                            forkPos = 1;
@@ -98,9 +113,17 @@
        }

        // 获取输送线plc线程
        LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, crnId);
        String ledContent = ledThread.getStringBuffer().toString();
//        ledContent = "ask的模块萨满大算了萨满大了\n 是窘境到埃及嗲家嗲\n 萨达姆打开萨满大凯撒麦当劳萨满大老师";
        LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, ledId);
        String ledContent = ledThread==null?"":ledThread.getWorkNos().toString();
        if (!(xSpeed<127)){
            xSpeed=0.0;
        }
        if (!(ySpeed<127)){
            ySpeed=0.0;
        }
        if (!(zSpeed<127)){
            zSpeed=0.0;
        }

        return R.ok(
                Cools.add("xSpeed", Arith.multiplys(1, Math.abs(xSpeed), 1)) // 行走速度
@@ -235,7 +258,41 @@



    /**
     * 获取其他信息
     */
    @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);
    }