1

zhangc

2025-04-11 3cba497c498c3833fdc266d99e07bc3c2d16e658

1

 src/main/java/com/zy/core/MainProcess.java

@@ -43,9 +43,9 @@
                    //zhangc
                    //输送线
                    // 入库
                    mainService.generateInboundWrk();
                   // mainService.generateInboundWrk();
                    // 出库
                    mainService.stnToOutStn();
                  //  mainService.stnToOutStn();

                    //初始化实时地图
                    mainService.initRealtimeBasMap();

 src/main/java/com/zy/core/ServerBootstrap.java

@@ -128,21 +128,15 @@
                throw new CoolException("未知的线程实现");
            }
            new Thread(thread).start();
            SlaveConnection.put(SlaveType.Shuttle, devpSlave.getId(), thread);
            SlaveConnection.put(SlaveType.Devp, devpSlave.getId(), thread);
        }

        // 初始化电视机
        for (LedSlave ledSlave : slaveProperties.getLed()) {
            News.info("初始化电视机......................................................");
            ThreadHandler thread = null;
            if (ledSlave.getThreadImpl().equals("NormalLedThread")) {
                thread = new NormalLedThread(ledSlave);
            } else {
                throw new CoolException("未知的线程实现");
            }

            ThreadHandler thread = new NormalLedThread(ledSlave);
            new Thread(thread).start();
            SlaveConnection.put(SlaveType.Shuttle, ledSlave.getId(), thread);
            SlaveConnection.put(SlaveType.Led, ledSlave.getId(), thread);
        }
    }


 src/main/java/com/zy/core/cache/MessageQueue.java

@@ -93,8 +93,16 @@
            case Lift:
                return LIFT_EXCHANGE.get(id).poll();
            case Devp:
                ConcurrentLinkedQueue<Task> tasks = DEVP_EXCHANGE.get(id);
                if (tasks == null) {
                    return null;
                }
                return DEVP_EXCHANGE.get(id).poll();
            case Led:
                ConcurrentLinkedQueue<Task> task2 = LED_EXCHANGE.get(id);
                if (task2 == null) {
                    return null;
                }
                return LED_EXCHANGE.get(id).poll();
            default:
                return null;

 src/main/java/com/zy/core/thread/impl/FyDevpThread.java

@@ -78,7 +78,7 @@
    @Override
    @SuppressWarnings("InfiniteLoopStatement")
    public void run() {
//        connect();
        connect();
        while (true) {
            try {
                int step = 1;

 src/main/java/com/zy/core/thread/impl/NormalLedThread.java

@@ -38,7 +38,6 @@
    @Override
    @SuppressWarnings({"InfiniteLoopStatement", "unchecked"})
    public void run() {
//        connect();
        while (true) {
            try {
                Task task = MessageQueue.poll(SlaveType.Led, slave.getId());

 src/main/webapp/views/index.html

@@ -19,7 +19,7 @@
    <div class="nav">
        <ul class="cl-effect-4">
            <li><a id="console" onclick="nav(this.id)" class="nav-select" href="#">主控图</a></li>
            <li><a id="pipline" onclick="nav(this.id)" class="nav-select" href="#">输送线</a></li>
            <li><a id="pipeline" onclick="nav(this.id)" class="nav-select" href="#">输送线</a></li>
            <li><a id="lift" onclick="nav(this.id)" class="nav-unselect" href="#">提升机</a></li>
            <li><a id="shuttle" onclick="nav(this.id)" class="nav-unselect" href="#">四向穿梭车</a></li>
            <li><a id="admin" onclick="nav(this.id)" class="nav-unselect" href="#">管理后台</a></li>