*

zwl

2023-02-07 1f87ecc8280b372d8c1b76d66090349651901cab

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

@@ -11,9 +11,16 @@
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.*;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import java.text.SimpleDateFormat;
import java.util.*;
@@ -29,6 +36,8 @@

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

    /**
     * 获取当前时间
@@ -53,7 +62,33 @@
     * 获取其他信息
     */
    @GetMapping("/other")
    public R monitorOther(@RequestParam("crnId") Integer crnId) {
    public R monitorOther(@RequestParam("crnId") Integer crnId, @RequestParam("ledId") Integer ledId) {
        switch (ledId){
            case 100:
                ledId=1;
                break;
            case 102:
                ledId=2;
                break;
            case 104:
                ledId=3;
                break;
            case 106:
                ledId=4;
                break;
            case 101:
                ledId=5;
                break;
            case 103:
                ledId=6;
                break;
            case 105:
                ledId=7;
                break;
            case 107:
                ledId=8;
                break;
        }
        Double xSpeed = 0.0D;
        Double ySpeed = 0.0D;
        Double zSpeed = 0.0D;
@@ -76,10 +111,10 @@
                            forkPos = 1;
                            break;
                        case 1:
                            forkPos = 0;
                            forkPos = 2;
                            break;
                        case 2:
                            forkPos = 2;
                            forkPos = 0;
                            break;
                        default:
                            forkPos = 1;
@@ -93,20 +128,22 @@
            }
        }

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

        return R.ok(
                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("totalLoc", totalLoc)  // 总库位数
//                .add("totalWrk", totalWrk)    // 总任务数
                .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) // 显示内容
        );
    }

@@ -223,46 +260,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);
    }