#

zwl

2025-09-12 ac0d8b029f0b51615be54b28d66519594949c3d9

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

@@ -63,32 +63,6 @@
     */
    @GetMapping("/other")
    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;
@@ -129,8 +103,8 @@
        }

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

        return R.ok(
@@ -142,8 +116,8 @@
                .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) // 显示内容
//                .add("isShow", !Cools.isEmpty(ledContent)) // 是否显示内容
//                .add("content", ledContent) // 显示内容
        );
    }