#

野心家

2023-09-05 883195f4d14f24abeb35182dd2af53a8f022a1d0

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

@@ -57,7 +57,7 @@
     * 获取其他信息
     */
    @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;
@@ -80,10 +80,10 @@
                            forkPos = 1;
                            break;
                        case 1:
                            forkPos = 0;
                            forkPos = 2;
                            break;
                        case 2:
                            forkPos = 2;
                            forkPos = 0;
                            break;
                        default:
                            forkPos = 1;
@@ -98,9 +98,9 @@
        }

        // 获取输送线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.getWorkNos().toString();
//        ledContent = "ask的模块萨满大算了萨满大了\n 是窘境到埃及嗲家嗲\n 萨达姆打开萨满大凯撒麦当劳萨满大老师";

        return R.ok(
                Cools.add("xSpeed", Arith.multiplys(1, Math.abs(xSpeed), 1)) // 行走速度